Replace service/network name with properties

Author: tulir

mautrix/bridge/bridge.py

@@ -59,6 +59,8 @@ class Bridge(Program, ABC):
     markdown_version: str
     manhole: br.commands.manhole.ManholeState | None
     homeserver_software: HomeserverSoftware
+    beeper_network_name: str | None = None
+    beeper_service_name: str | None = None
 
     def __init__(
         self,
@@ -315,16 +317,6 @@ def is_bridge_ghost(self, user_id: UserID) -> bool:
     async def count_logged_in_users(self) -> int:
         return 0
 
-    @staticmethod
-    @abstractmethod
-    def get_beeper_service_name() -> str:
-        pass
-
-    @staticmethod
-    @abstractmethod
-    def get_beeper_network_name() -> str:
-        pass
-
     async def manhole_global_namespace(self, user_id: UserID) -> dict[str, Any]:
         own_user = await self.get_user(user_id, create=False)
         try:

mautrix/bridge/matrix.py

@@ -272,12 +272,12 @@ async def init_as_bot(self) -> None:
             except Exception:
                 self.log.exception("Failed to set bot avatar")
 
-        if self.bridge.homeserver_software.is_hungry:
+        if self.bridge.homeserver_software.is_hungry and self.bridge.beeper_network_name:
             self.log.debug("Setting contact info on the appservice bot")
             await self.az.intent.beeper_update_profile(
                 {
-                    "com.beeper.bridge.service": self.bridge.get_beeper_service_name(),
-                    "com.beeper.bridge.network": self.bridge.get_beeper_network_name(),
+                    "com.beeper.bridge.service": self.bridge.beeper_service_name,
+                    "com.beeper.bridge.network": self.bridge.beeper_network_name,
                     "com.beeper.bridge.is_bridge_bot": True,
                     "com.beeper.bridge.is_bot": True,
                 }