Pin setuptools version

.github/ISSUE_TEMPLATE/bug.md

@@ -1,7 +1,16 @@
 ---
 name: Bug report
 about: If something is definitely wrong in the bridge (rather than just a setup issue),
-  file a bug report. Remember to include relevant logs.
+  file a bug report. Remember to include relevant logs. Asking in the Matrix room first
-labels: bug
+  is strongly recommended.
+type: Bug
 
 ---
+
+<!--
+Remember to include relevant logs, the bridge version and any other details.
+
+It's always best to ask in the Matrix room first, especially if you aren't sure
+what details are needed. Issues with insufficient detail will likely just be
+ignored or closed immediately.
+-->

.github/ISSUE_TEMPLATE/enhancement.md

@@ -1,6 +1,6 @@
 ---
 name: Enhancement request
 about: Submit a feature request or other suggestion
-labels: enhancement
+type: Feature
 
 ---

Dockerfile

@@ -1,4 +1,4 @@
-FROM dock.mau.dev/tulir/lottieconverter:alpine-3.19
+FROM dock.mau.dev/tulir/lottieconverter:alpine-3.22
 
 RUN apk add --no-cache \
       python3 py3-pip py3-setuptools py3-wheel \

mautrix_telegram/example-config.yaml

@@ -280,6 +280,10 @@ bridge:
         # Only relevant when using end-to-bridge encryption, required when using encryption with next-gen auth (MSC3861).
         # Changing this option requires updating the appservice registration file.
         msc4190: false
+        # Should the bridge bot generate a recovery key and cross-signing keys and verify itself?
+        # Note that without the latest version of MSC4190, this will fail if you reset the bridge database.
+        # The generated recovery key will be printed in logs.
+        self_sign: 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.

mautrix_telegram/matrix.py

@@ -155,14 +155,6 @@ class MatrixHandler(BaseMatrixHandler):
                 room_id, user.mxid, "You are not whitelisted on this Telegram bridge."
             )
             return
-        elif not await user.is_logged_in() and not portal.has_bot:
-            await portal.main_intent.kick_user(
-                room_id,
-                user.mxid,
-                "This chat does not have a bot on the Telegram side for relaying messages sent by"
-                " unauthenticated Matrix users.",
-            )
-            return
 
         self.log.debug(f"{user.mxid} joined {room_id}")
         if await user.is_logged_in() or portal.has_bot:

optional-requirements.txt

@@ -20,6 +20,7 @@ prometheus_client>=0.6,<0.23
 python-olm>=3,<4
 pycryptodome>=3,<4
 unpaddedbase64>=1,<3
+base58>=2,<3
 
 #/sqlite
 aiosqlite>=0.16,<0.22

requirements.txt

@@ -3,8 +3,8 @@ python-magic>=0.4,<0.5
 commonmark>=0.8,<0.10
 aiohttp>=3,<4
 yarl>=1,<2
-mautrix>=0.20.8,<0.21
+mautrix>=0.21.0b5,<0.22
 tulir-telethon==1.99.0a6
 asyncpg>=0.20,<1
 mako>=1,<2
-setuptools
+setuptools<82