Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Add `?subscription_status=none` param support to subscriber query to filter out orphans.

Kailash Nadh3dd8a6cc4790
diff --git a/internal/core/subscribers.go b/internal/core/subscribers.go
index 66852c2e..12a246df 100644
--- a/internal/core/subscribers.go
+++ b/internal/core/subscribers.go
@@ -123,6 +123,9 @@ func (c *Core) QuerySubscribers(searchStr, queryExp string, listIDs []int, subSt
cond = queryExp
}
+ // Handle the special "none" subscription status for orphan subscribers.
+ cond, subStatus = applyOrphanFilter(cond, subStatus)
+
// stmt is the raw SQL query.
stmt := strings.ReplaceAll(c.q.QuerySubscribers, "%query%", cond)
stmt = strings.ReplaceAll(stmt, "%order%", orderBy+" "+order)
@@ -246,6 +249,9 @@ func (c *Core) ExportSubscribers(searchStr, query string, subIDs, listIDs []int,
cond = query
}
+ // Handle the special "none" subscription status for orphan subscribers.
+ cond, subStatus = applyOrphanFilter(cond, subStatus)
+
stmt := strings.ReplaceAll(c.q.QuerySubscribersForExport, "%query%", cond)
// Validate the tables used in the query.
@@ -671,3 +677,14 @@ func traverseQueryPlan(node map[string]any, tables map[string]struct{}) {
}
}
}
+
+// applyOrphanFilter handles the special subscription_status value "none", which
+// filters orphan subscribers (no list subscriptions).
+func applyOrphanFilter(cond, subStatus string) (string, string) {
+ const orphanSubCond = "NOT EXISTS (SELECT 1 FROM subscriber_lists WHERE subscriber_id = subscribers.id)"
+ if subStatus == "none" {
+ return "(" + cond + ") AND " + orphanSubCond, ""
+ }
+
+ return cond, subStatus
+}
diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.html
index 49962da5..55a332ef 100644
--- a/static/admin/views/dashboard.html
+++ b/static/admin/views/dashboard.html
@@ -30,7 +30,7 @@
<small class="text-light">{{ Icon "at-sign" }} {{ .L.T "globals.terms.subscribers" }}</small>
<div class="stat-value"><a href="{{ URI "/admin/subscribers" }}" class="unstyled">{{ FormatNumber $c.Subscribers.Total }}</a></div>
<div class="mt-2 hstack gap-2">
- <a href="{{ URI "/admin/subscribers" }}">{{ Badge (printf "%s %s" (FormatNumber $c.Subscribers.Orphans) (.L.T "dashboard.orphanSubs")) "outline" }}</a>
+ <a href="{{ URI "/admin/subscribers" }}?subscription_status=none">{{ Badge (printf "%s %s" (FormatNumber $c.Subscribers.Orphans) (.L.T "dashboard.orphanSubs")) "outline" }}</a>
<a href="{{ URI "/admin/subscribers" }}?status=blocklisted">{{ Badge (printf "%s %s" (FormatNumber $c.Subscribers.Blocklisted) (.L.T "subscribers.status.blocklisted")) "status-blocklisted" }}</a>
</div>
</article>
diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.html
index a1bd122b..6c8fdbad 100644
--- a/static/admin/views/subscribers.html
+++ b/static/admin/views/subscribers.html
@@ -23,7 +23,8 @@
{{ .L.T "globals.terms.subscribers" }}
<span>({{ $d.Page.Total }})</span>
{{- if $d.CurrentList }} {{ template "filter-badge" dict "Label" $d.CurrentList.Name "Class" "outline" "URL" (URI "/admin/subscribers") }}{{ end }}
- {{- if $subStatus }} {{ template "filter-badge" dict "Label" (.L.T (printf "subscribers.status.%s" $subStatus)) "Class" (printf "status-%s" $subStatus) "URL" ($d.Page.FilterURL $base "subscription_status") }}{{ end }}
+ {{- if eq $subStatus "none" }} {{ template "filter-badge" dict "Label" (.L.T "dashboard.orphanSubs") "Class" "outline" "URL" ($d.Page.FilterURL $base "subscription_status") }}
+ {{- else if $subStatus }} {{ template "filter-badge" dict "Label" (.L.T (printf "subscribers.status.%s" $subStatus)) "Class" (printf "status-%s" $subStatus) "URL" ($d.Page.FilterURL $base "subscription_status") }}{{ end }}
{{- if $status }} {{ template "filter-badge" dict "Label" (.L.T (printf "subscribers.status.%s" $status)) "Class" (printf "status-%s" $status) "URL" ($d.Page.FilterURL $base "status") }}{{ end }}
</h1>
</div>