Merge pull request #8 from theriddleofenigma/notify_user_id

Bug fix - Empty user tags are being displayed in logs when no user notification is configured.
theriddleofenigma · Feb 25, 2022 · 07fed8a · 07fed8a
2 parents cb393b8 + 7689b72
commit 07fed8a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/GoogleChatHandler.php b/src/GoogleChatHandler.php
@@ -105,11 +105,12 @@ protected function getNotifiableText($level): string
                 Logger::DEBUG => config('logging.channels.google-chat.notify_users.debug'),
             ][$level] ?? '';
 
+        $levelBasedUserIds = trim($levelBasedUserIds);
         if (($userIds = config('logging.channels.google-chat.notify_users.default')) && $levelBasedUserIds) {
             $levelBasedUserIds = ",$levelBasedUserIds";
         }
 
-        return $this->constructNotifiableText($userIds . $levelBasedUserIds);
+        return $this->constructNotifiableText(trim($userIds) . $levelBasedUserIds);
     }
 
     /**
@@ -120,7 +121,6 @@ protected function getNotifiableText($level): string
      */
     protected function constructNotifiableText($userIds): string
     {
-        $userIds = explode(',', $userIds);
         if (!$userIds) {
             return '';
         }
@@ -133,7 +133,9 @@ protected function constructNotifiableText($userIds): string
             }
 
             return "<users/$userId> ";
-        }, array_unique($userIds)));
+        }, array_unique(
+            explode(',', $userIds))
+        ));
 
         return $allUsers . $otherIds;
     }