From 279da9097ca9e1b1f460af8ce3fab130681cecc2 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Sep 2022 21:23:54 +0300 Subject: [PATCH] Update mautrix-python --- mautrix_telegram/config.py | 2 -- mautrix_telegram/example-config.yaml | 7 ++++++- requirements.txt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mautrix_telegram/config.py b/mautrix_telegram/config.py index 8a6a9149..1bf13909 100644 --- a/mautrix_telegram/config.py +++ b/mautrix_telegram/config.py @@ -57,8 +57,6 @@ class Config(BaseBridgeConfig): super().do_update(helper) copy, copy_dict, base = helper - copy("homeserver.asmux") - if "appservice.protocol" in self and "appservice.address" not in self: protocol, hostname, port = ( self["appservice.protocol"], diff --git a/mautrix_telegram/example-config.yaml b/mautrix_telegram/example-config.yaml index 8f45f400..e7a4ad3e 100644 --- a/mautrix_telegram/example-config.yaml +++ b/mautrix_telegram/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. @@ -45,6 +47,7 @@ appservice: # https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool # https://docs.python.org/3/library/sqlite3.html#sqlite3.connect # For sqlite, min_size is used as the connection thread pool size and max_size is ignored. + # Additionally, SQLite supports init_commands as an array of SQL queries to run on connect (e.g. to set PRAGMAs). database_opts: min_size: 1 max_size: 10 @@ -255,6 +258,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. diff --git a/requirements.txt b/requirements.txt index 45e42252..1b85455c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ python-magic>=0.4,<0.5 commonmark>=0.8,<0.10 aiohttp>=3,<4 yarl>=1,<2 -mautrix>=0.17.8,<0.18 +mautrix>=0.18.0,<0.19 #telethon>=1.24,<1.25 tulir-telethon==1.25.0a20 asyncpg>=0.20,<0.27