Fixes for Discourse listeners

TheRestartProject · Nov 18, 2024 · 5222a4c · 5222a4c
1 parent 3c952a4
commit 5222a4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/Listeners/AddUserToDiscourseGroup.php b/app/Listeners/AddUserToDiscourseGroup.php
@@ -31,14 +31,15 @@ public function handle(UserFollowedGroup $event)
             return;
         }
 
-        if ($event->theGroup->archived_at) {
+        $repairGroup = $event->group;
+        $user = $event->user;
+
+        if ($repairGroup->archived_at) {
             // Suppress notifications for archived groups.
             return;
         }
 
         // add user to the network groups for the group the user followed.
-        $repairGroup = $event->group;
-        $user = $event->user;
 
         if (!$user->username) {
             $user->generateAndSetUsername();

diff --git a/app/Listeners/RemoveUserFromDiscourseThreadForEvent.php b/app/Listeners/RemoveUserFromDiscourseThreadForEvent.php
@@ -32,7 +32,7 @@ public function handle(UserLeftEvent $e) {
             $event = Party::find($e->idevents);
             $user = User::find($e->iduser);
 
-            if ($event->theGroup->archived_at) {
+            if ($event && $event->theGroup->archived_at) {
                 // Suppress notifications for archived groups.
                 return;
             }
@@ -52,4 +52,4 @@ public function handle(UserLeftEvent $e) {
             }
         }
     }
-}
+}