Disallow ignoring hungryserv bridge bots as well

Author: bradtgmurray

synapse/storage/databases/main/account_data.py

@@ -55,7 +55,8 @@
 logger = logging.getLogger(__name__)
 
 # Regex pattern for detecting a bridge bot (cached here for performance)
-BOT_PATTERN = re.compile(r"^@_.*_bot\:.*")
+SYNAPSE_BOT_PATTERN = re.compile(r"^@_.*_bot\:*")
+HUNGRYSERV_BOT_PATTERN = re.compile(r"^@[a-z]+bot\:beeper.local")
 
 
 class AccountDataWorkerStore(PushRulesWorkerStore, CacheInvalidationWorkerStore):
@@ -619,7 +620,11 @@ def _add_account_data_for_user(
             ignored_users = content.get("ignored_users", {})
             if isinstance(ignored_users, dict):
                 content["ignored_users"] = {
-                    u: v for u, v in ignored_users.items() if not BOT_PATTERN.match(u)
+                    u: v
+                    for u, v in ignored_users.items()
+                    if not (
+                        SYNAPSE_BOT_PATTERN.match(u) or HUNGRYSERV_BOT_PATTERN.match(u)
+                    )
                 }
 
         # no need to lock here as account_data has a unique constraint on

tests/storage/test_account_data.py

@@ -93,7 +93,13 @@ def test_ignoring_bot_users(self) -> None:
         self._update_ignore_list("@other:test", "@another:remote", "@_other_bot:test")
         self.assert_ignored(self.user, {"@other:test", "@another:remote"})
 
-        self._update_ignore_list("@_other_bot:test")
+        self._update_ignore_list("@iamnotabot:beeper.com")
+        self.assert_ignored(self.user, {"@iamnotabot:beeper.com"})
+
+        self._update_ignore_list("@_other_bot:beeper.com")
+        self.assert_ignored(self.user, set())
+
+        self._update_ignore_list("@whatsappbot:beeper.local")
         self.assert_ignored(self.user, set())
 
     def test_caching(self) -> None: