Browse Source

Update mautrix-python

Tulir Asokan 2 years ago
parent
commit
36e73e6f39
3 changed files with 6 additions and 10 deletions
  1. 0 8
      mautrix_instagram/config.py
  2. 5 1
      mautrix_instagram/example-config.yaml
  3. 1 1
      requirements.txt

+ 0 - 8
mautrix_instagram/config.py

@@ -27,12 +27,6 @@ Permissions = NamedTuple("Permissions", relay=bool, user=bool, admin=bool, level
 
 
 class Config(BaseBridgeConfig):
-    def __getitem__(self, key: str) -> Any:
-        try:
-            return os.environ[f"MAUTRIX_INSTAGRAM_{key.replace('.', '_').upper()}"]
-        except KeyError:
-            return super().__getitem__(key)
-
     @property
     def forbidden_defaults(self) -> list[ForbiddenDefault]:
         return [
@@ -45,8 +39,6 @@ class Config(BaseBridgeConfig):
         super().do_update(helper)
         copy, copy_dict, base = helper
 
-        copy("homeserver.asmux")
-
         copy("metrics.enabled")
         copy("metrics.listen_port")
 

+ 5 - 1
mautrix_instagram/example-config.yaml

@@ -7,7 +7,9 @@ homeserver:
     # Whether or not to verify the SSL certificate of the homeserver.
     # Only applies if address starts with https://
     verify_ssl: true
-    asmux: false
+    # What software is the homeserver running?
+    # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here.
+    software: standard
     # Number of retries for all HTTP requests if the homeserver isn't reachable.
     http_retry_count: 4
     # The URL to push real-time bridge status to.
@@ -174,6 +176,8 @@ bridge:
         # Default to encryption, force-enable encryption in all portals the bridge creates
         # This will cause the bridge bot to be in private chats for the encryption to work properly.
         default: false
+        # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.
+        appservice: false
         # Require encryption, drop any unencrypted messages.
         require: false
         # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.

+ 1 - 1
requirements.txt

@@ -4,7 +4,7 @@ commonmark>=0.8,<0.10
 aiohttp>=3,<4
 yarl>=1,<2
 attrs>=20.1
-mautrix>=0.17.8,<0.18
+mautrix>=0.18.0,<0.19
 asyncpg>=0.20,<0.27
 pycryptodome>=3,<4
 paho-mqtt>=1.5,<2