Improves subscriber list add/remove logic

happycog · Mar 30, 2024 · 9e1be9f · 9e1be9f
1 parent 95bb363
commit 9e1be9f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG/CHANGELOG-MAILER.md b/CHANGELOG/CHANGELOG-MAILER.md
@@ -8,7 +8,9 @@
 
 ### Fixed
 
-- Improves native field logic so layouts aren’t initialized before subclass is checked
+- Improved behavior when adding and removing non-credentialed users from Subscriber List Audience Types
+- Improved native field logic so layouts aren’t initialized before subclass is checked
+- Fixed logic when checking if a subscriber is subscribed by email
 
 ## 4.1.8 - 2024-03-09
 

diff --git a/src/mailer/components/elements/audience/AudienceElement.php b/src/mailer/components/elements/audience/AudienceElement.php
@@ -369,7 +369,7 @@ public function isSubscribed(mixed $identifier): bool
             $criteria['userId'] = $identifier->id;
         } elseif (is_numeric($identifier)) {
             $criteria['userId'] = $identifier;
-        } elseif (!filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
+        } elseif (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
             $user = User::find()
                 ->email($identifier)
                 ->one();

diff --git a/src/mailer/controllers/SubscriberListsController.php b/src/mailer/controllers/SubscriberListsController.php
@@ -10,6 +10,11 @@
 
 class SubscriberListsController extends Controller
 {
+    protected array|bool|int $allowAnonymous = [
+        'add',
+        'remove'
+    ];
+
     /**
      * Adds a User to a Subscriber List
      */

diff --git a/src/mailer/subscriberlists/SubscriberLists.php b/src/mailer/subscriberlists/SubscriberLists.php
@@ -16,6 +16,7 @@ public function add(SubscriptionRecord $subscription): bool
         $transaction = Craft::$app->getDb()->beginTransaction();
 
         try {
+            $user = null;
 
             // Prefer User ID over email
             if ($subscription->userId) {
@@ -34,7 +35,7 @@ public function add(SubscriptionRecord $subscription): bool
                 }
             }
 
-            if (!$subscription->validate()) {
+            if (!$user || !$subscription->validate()) {
                 return false;
             }
 
@@ -45,6 +46,9 @@ public function add(SubscriptionRecord $subscription): bool
 
             if (!$subscriptionExists) {
                 $subscription->save();
+
+                // Resave user to ensure Element Indexes are updated when refreshed
+                Craft::$app->elements->saveElement($user, false);
             }
 
             $transaction->commit();
@@ -59,6 +63,8 @@ public function add(SubscriptionRecord $subscription): bool
 
     public function remove(SubscriptionRecord $subscription): bool
     {
+        $user = null;
+
         if ($subscription->userId) {
             $user = Craft::$app->getUsers()->getUserById($subscription->userId);
             if (!$user) {
@@ -85,6 +91,11 @@ public function remove(SubscriptionRecord $subscription): bool
             'userId' => $subscription->userId,
         ])?->delete();
 
+        if ($user) {
+            // Resave user to ensure Element Indexes are updated when refreshed
+            Craft::$app->elements->saveElement($user, false);
+        }
+
         return true;
     }