High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Fix broken public re-resubscription (regression). Closes #2976.
Kailash Nadhb0da6bddfee6
diff --git a/cmd/public.go b/cmd/public.goindex a4bad50d..2e4ffc47 100644--- a/cmd/public.go+++ b/cmd/public.go@@ -773,7 +773,7 @@ func (a *App) processSubForm(c echo.Context) (bool, error) {}// Update the subscriber's subscriptions in the DB.- _, hasOptin, err := a.core.UpdateSubscriberWithLists(sub.ID, sub, nil, listUUIDs, false, false, true, nil)+ _, hasOptin, err := a.core.UpdateSubscriberWithLists(sub.ID, sub, nil, listUUIDs, false, false, true, nil, true)if err == nil {return hasOptin, nil}diff --git a/cmd/subscribers.go b/cmd/subscribers.goindex 13a1272a..34bc7810 100644--- a/cmd/subscribers.go+++ b/cmd/subscribers.go@@ -299,7 +299,7 @@ func (a *App) UpdateSubscriber(c echo.Context) error {permittedLists = []int{}}- out, _, err := a.core.UpdateSubscriberWithLists(id, req.Subscriber, listIDs, nil, req.PreconfirmSubs, true, false, permittedLists)+ out, _, err := a.core.UpdateSubscriberWithLists(id, req.Subscriber, listIDs, nil, req.PreconfirmSubs, true, false, permittedLists, false)if err != nil {return err}@@ -362,7 +362,7 @@ func (a *App) PatchSubscriber(c echo.Context) error {permittedLists = []int{}}- out, _, err := a.core.UpdateSubscriberWithLists(id, req.Subscriber, listIDs, nil, req.PreconfirmSubs, overwriteSubs, false, permittedLists)+ out, _, err := a.core.UpdateSubscriberWithLists(id, req.Subscriber, listIDs, nil, req.PreconfirmSubs, overwriteSubs, false, permittedLists, false)if err != nil {return err}diff --git a/internal/core/subscribers.go b/internal/core/subscribers.goindex ed08c52b..ea452b09 100644--- a/internal/core/subscribers.go+++ b/internal/core/subscribers.go@@ -385,7 +385,7 @@ func (c *Core) UpdateSubscriber(id int, sub models.Subscriber) (models.Subscribe// UpdateSubscriberWithLists updates a subscriber's properties.// If deleteLists is set to true, all existing subscriptions are deleted and only// the ones provided are added or retained.-func (c *Core) UpdateSubscriberWithLists(id int, sub models.Subscriber, listIDs []int, listUUIDs []string, preconfirm, deleteLists, assertOptin bool, permittedListIDs []int) (models.Subscriber, bool, error) {+func (c *Core) UpdateSubscriberWithLists(id int, sub models.Subscriber, listIDs []int, listUUIDs []string, preconfirm, deleteLists, assertOptin bool, permittedListIDs []int, allowResubscribe bool) (models.Subscriber, bool, error) {subStatus := models.SubscriptionStatusUnconfirmedif preconfirm {subStatus = models.SubscriptionStatusConfirmed@@ -412,7 +412,8 @@ func (c *Core) UpdateSubscriberWithLists(id int, sub models.Subscriber, listIDspq.Array(listUUIDs),subStatus,deleteLists,- pq.Array(permittedListIDs))+ pq.Array(permittedListIDs),+ allowResubscribe)if err != nil {c.log.Printf("error updating subscriber: %v", err)return models.Subscriber{}, false, echo.NewHTTPError(http.StatusInternalServerError,diff --git a/queries/subscribers.sql b/queries/subscribers.sqlindex a439d113..d99cbc1e 100644--- a/queries/subscribers.sql+++ b/queries/subscribers.sql@@ -189,6 +189,8 @@ INSERT INTO subscriber_lists (subscriber_id, list_id, status)SET status = (CASEWHEN $4='blocklisted' THEN 'unsubscribed'::subscription_status+ -- When $11 (allow resubscribe) is true, override existing statuses (used by public subscription form).+ WHEN $11 = TRUE THEN $8::subscription_status-- When subscriber is edited from the admin form, retain the status. Otherwise, a blocklisted-- subscriber when being re-enabled, their subscription statuses change.WHEN subscriber_lists.status = 'confirmed' THEN 'confirmed'