payload-plugin-newsletter 0.24.0 → 0.25.1

package/dist/server.js

@@ -575,7 +575,7 @@ var createSubscribersCollection = (pluginConfig) => {
             } else {
               console.warn("[Newsletter Plugin] No email service configured for subscriber creation");
             }
-            if (doc.subscriptionStatus === "active" && emailService) {
+            if (doc.subscriptionStatus === "active" && emailService && !doc.importedFromProvider) {
               try {
                 const settings = await req.payload.findGlobal({
                   slug: pluginConfig.settingsSlug || "newsletter-settings"
@@ -621,6 +621,30 @@ var createSubscribersCollection = (pluginConfig) => {
                 console.warn("[Newsletter Plugin] No email service configured");
               }
             }
+            if (doc.subscriptionStatus === "active" && previousDoc.subscriptionStatus === "unsubscribed" && !doc.importedFromProvider && emailService) {
+              try {
+                const settings = await req.payload.findGlobal({
+                  slug: pluginConfig.settingsSlug || "newsletter-settings"
+                });
+                const serverURL = req.payload.config.serverURL || process.env.PAYLOAD_PUBLIC_SERVER_URL || "";
+                const html = await renderEmail("welcome", {
+                  email: doc.email,
+                  siteName: settings?.brandSettings?.siteName || "Newsletter",
+                  preferencesUrl: `${serverURL}/account/preferences`
+                }, pluginConfig);
+                await emailService.send({
+                  to: doc.email,
+                  subject: settings?.brandSettings?.siteName ? `Welcome back to ${settings.brandSettings.siteName}!` : "Welcome back!",
+                  html
+                });
+                console.warn(`Welcome email sent to resubscribed user: ${doc.email}`);
+              } catch (error) {
+                console.error("Failed to send resubscription welcome email:", error);
+              }
+              if (pluginConfig.hooks?.afterSubscribe) {
+                await pluginConfig.hooks.afterSubscribe({ doc, req });
+              }
+            }
             if (doc.subscriptionStatus === "unsubscribed" && previousDoc.subscriptionStatus !== "unsubscribed") {
               doc.unsubscribedAt = (/* @__PURE__ */ new Date()).toISOString();
               if (pluginConfig.hooks?.afterUnsubscribe) {
@@ -2613,8 +2637,8 @@ async function handleSubscriberCreated(event, payload, subscribersSlug) {
         data: {
           email: data.email,
           name: data.name,
-          subscriptionStatus: "pending",
-          // New subscribers start as pending
+          subscriptionStatus: "active",
+          // Match Broadcast's active status
           externalId: data.id,
           source: data.source,
           importedFromProvider: true,
@@ -2883,16 +2907,6 @@ var createBroadcastWebhookEndpoint = (config) => {
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
         await routeWebhookEvent(data, req, config);
-        await req.payload.updateGlobal({
-          slug: config.settingsSlug || "newsletter-settings",
-          data: {
-            broadcastSettings: {
-              ...settings?.broadcastSettings || {},
-              lastWebhookReceived: (/* @__PURE__ */ new Date()).toISOString(),
-              webhookStatus: "verified"
-            }
-          }
-        });
         return Response.json({ success: true }, { status: 200 });
       } catch (error) {
         console.error("[Broadcast Webhook] Error processing webhook:", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-plugin-newsletter",
-  "version": "0.24.0",
+  "version": "0.25.1",
   "description": "Complete newsletter management plugin for Payload CMS with subscriber management, magic link authentication, and email service integration",
   "type": "module",
   "main": "./dist/index.js",