Parse homeserver.software into enum

Author: tulir

mautrix/bridge/__init__.py

@@ -1,5 +1,5 @@
 from ..util.async_getter_lock import async_getter_lock
-from .bridge import Bridge
+from .bridge import Bridge, HomeserverSoftware
 from .config import BaseBridgeConfig
 from .custom_puppet import (
     AutologinError,
@@ -21,6 +21,7 @@
 __all__ = [
     "async_getter_lock",
     "Bridge",
+    "HomeserverSoftware",
     "BaseBridgeConfig",
     "AutologinError",
     "CustomPuppetError",

mautrix/bridge/bridge.py

@@ -7,6 +7,7 @@
 
 from typing import Any
 from abc import ABC, abstractmethod
+from enum import Enum
 import sys
 
 from aiohttp import web
@@ -30,6 +31,20 @@
     uvloop = None
 
 
+class HomeserverSoftware(Enum):
+    STANDARD = "standard"
+    ASMUX = "asmux"
+    HUNGRY = "hungry"
+
+    @property
+    def is_hungry(self) -> bool:
+        return self == self.HUNGRY
+
+    @property
+    def is_asmux(self) -> bool:
+        return self == self.ASMUX
+
+
 class Bridge(Program, ABC):
     db: Database
     az: AppService
@@ -43,6 +58,7 @@ class Bridge(Program, ABC):
     repo_url: str
     markdown_version: str
     manhole: br.commands.manhole.ManholeState | None
+    homeserver_software: HomeserverSoftware
 
     def __init__(
         self,
@@ -104,6 +120,11 @@ def prepare(self) -> None:
                 "Loaded config overrides from environment: %s", list(self.config.env.keys())
             )
         super().prepare()
+        try:
+            self.homeserver_software = HomeserverSoftware(self.config["homeserver.software"])
+        except Exception:
+            self.log.fatal("Invalid value for homeserver.software in config")
+            sys.exit(11)
         self.prepare_db()
         self.prepare_appservice()
         self.prepare_bridge()

mautrix/bridge/matrix.py

@@ -207,6 +207,14 @@ async def check_versions(self) -> None:
                 self.minimum_spec_version,
             )
             sys.exit(18)
+        if self.bridge.homeserver_software.is_hungry and not self.versions.supports(
+            "com.beeper.hungry"
+        ):
+            self.log.fatal(
+                "The config claims the homeserver is hungryserv, "
+                "but the /versions response didn't confirm it"
+            )
+            sys.exit(18)
 
     async def wait_for_connection(self) -> None:
         self.log.info("Ensuring connectivity to homeserver")

mautrix/bridge/user.py

@@ -128,7 +128,7 @@ async def update_direct_chats(self, dms: dict[UserID, list[RoomID]] | None = Non
         self.log.debug("Updating m.direct list on homeserver")
         replace = dms is None
         dms = dms or await self.get_direct_chats()
-        if self.bridge.config.get("homeserver.software", "standard") == "asmux":
+        if self.bridge.homeserver_software.is_asmux:
             # This uses a secret endpoint for atomically updating the DM list
             await puppet.intent.api.request(
                 Method.PUT if replace else Method.PATCH,