Bump version to 0.7.1

Fix mautrix-python import error.

ROADMAP.md

@@ -6,9 +6,9 @@
   * [x] Message edits
   * [ ] ‡ Message history
   * [x] Presence
-  * [x] Typing notifications
-  * [x] Read receipts
-  * [x] Pinning messages
+  * [x] Typing notifications*
+  * [x] Read receipts*
+  * [x] Pinning messages*
   * [x] Power level
     * [x] Normal chats
       * [ ] Non-hardcoded PL requirements
@@ -56,5 +56,6 @@
   * [ ] ‡ Secret chats (not yet supported by Telethon)
   * [ ] ‡ E2EE in Matrix rooms (not yet supported 
 
+\* Requires [double puppeting](https://github.com/tulir/mautrix-telegram/wiki/Authentication#replacing-telegram-accounts-matrix-puppet-with-matrix-account) to be enabled  
 † Information not automatically sent from source, i.e. implementation may not be possible  
 ‡ Maybe, i.e. this feature may or may not be implemented at some point

mautrix_telegram/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.7.0rc3"
+__version__ = "0.7.1"
 __author__ = "Tulir Asokan <tulir@maunium.net>"

mautrix_telegram/abstract_user.py

@@ -97,7 +97,6 @@ class AbstractUser(ABC):
         self.client = None
         self.is_relaybot = False
         self.is_bot = False
-        self.relaybot = None
 
     @property
     def connected(self) -> bool:
@@ -423,7 +422,7 @@ class AbstractUser(ABC):
                 return
 
         if self.ignore_incoming_bot_events and self.relaybot and sender.id == self.relaybot.tgid:
-            self.log.debug(f"Ignoring relaybot-sent message %s to %s", update, portal.tgid_log)
+            self.log.debug(f"Ignoring relaybot-sent message %s to %s", update.id, portal.tgid_log)
             return
 
         if isinstance(update, MessageService):

mautrix_telegram/bot.py

@@ -108,9 +108,9 @@ class Bot(AbstractUser):
             if isinstance(chat, ChatForbidden) or chat.left or chat.deactivated:
                 self.remove_chat(TelegramID(chat.id))
 
-        channel_ids = (InputChannel(chat_id, 0)
+        channel_ids = [InputChannel(chat_id, 0)
                        for chat_id, chat_type in self.chats.items()
-                       if chat_type == "channel")
+                       if chat_type == "channel"]
         for channel_id in channel_ids:
             try:
                 await self.client(GetChannelsRequest([channel_id]))

mautrix_telegram/portal/base.py

@@ -222,7 +222,7 @@ class BasePortal(ABC):
             return False
         evt_type = EventType.find(f"net.maunium.telegram.{event}")
         evt_type.t_class = EventType.Class.STATE
-        return self.main_intent.state_store.has_power_level(self.mxid, user.mxid, event=evt_type)
+        return self.main_intent.state_store.has_power_level(self.mxid, user.mxid, evt_type)
 
     def get_input_entity(self, user: 'AbstractUser'
                          ) -> Awaitable[Union[TypeInputPeer, TypeInputChannel]]:

mautrix_telegram/portal/matrix.py

@@ -367,7 +367,7 @@ class PortalMatrix(BasePortal, MautrixBasePortal, ABC):
             if not bridge_notices and not excepted:
                 return
 
-        if content.msgtype in (MessageType.TEXT, MessageType.NOTICE):
+        if content.msgtype in (MessageType.TEXT, MessageType.EMOTE, MessageType.NOTICE):
             await self._pre_process_matrix_message(sender, not logged_in, content)
             await self._handle_matrix_text(sender_id, event_id, space, client, content, reply_to)
         elif content.msgtype == MessageType.LOCATION:

mautrix_telegram/scripts/dbms_migrate/__main__.py

@@ -24,7 +24,8 @@ def log(message, end="\n"):
 
 
 def connect(to):
-    from mautrix.bridge.db import Base, RoomState, UserProfile
+    from mautrix.util.db import Base
+    from mautrix.bridge.db import RoomState, UserProfile
     from mautrix_telegram.db import (Portal, Message, UserPortal, User, Contact, Puppet, BotChat,
                                      TelegramFile)
 

mautrix_telegram/web/provisioning/__init__.py

@@ -355,6 +355,7 @@ class ProvisioningAPI(AuthAPI):
         if err is not None:
             return err
         await user.log_out()
+        return web.json_response({}, status=200)
 
     async def bridge_info(self, request: web.Request) -> web.Response:
         return web.json_response({

setup.py

@@ -42,7 +42,7 @@ setuptools.setup(
 
     install_requires=[
         "aiohttp>=3.0.1,<4",
-        "mautrix>=0.4.0rc5,<0.5",
+        "mautrix>=0.4.0,<0.5",
         "SQLAlchemy>=1.2.3,<2",
         "alembic>=1.0.0,<2",
         "commonmark>=0.8.1,<0.10",

tests/commands/test_handler.py

@@ -26,7 +26,7 @@ def context(request: FixtureRequest) -> Context:
     """
     # Config(path, registration_path, base_path)
     config = getattr(request.cls, 'config', Config("", "", ""))
-    return Context(az=Mock(), config=config, loop=Mock(), session_container=Mock(), bot=Mock())
+    return Context(az=Mock(), config=config, loop=Mock(), session_container=Mock(), bridge=Mock(), bot=Mock())
 
 
 @pytest.fixture
@@ -52,6 +52,7 @@ class TestCommandEvent:
             sender=u.User(UserID("@sender:example.org")),
             command="help",
             args=[],
+            content=Mock(),
             is_management=True,
             is_portal=False,
         )
@@ -107,6 +108,7 @@ class TestCommandEvent:
             sender=u.User(UserID("@sender:example.org")),
             command="help",
             args=[],
+            content=Mock(),
             is_management=False,
             is_portal=False,
         )
@@ -133,6 +135,7 @@ class TestCommandEvent:
             sender=u.User(UserID("@sender:example.org")),
             command="help",
             args=[],
+            content=Mock(),
             is_management=True,
             is_portal=False,
         )
@@ -209,6 +212,7 @@ class TestCommandHandler:
             sender=sender,
             command=command,
             args=[],
+            content=Mock(),
             is_management=False,
             is_portal=boolean,
         )
@@ -271,6 +275,7 @@ class TestCommandHandler:
             sender=sender,
             command=command,
             args=[],
+            content=Mock(),
             is_management=is_management,
             is_portal=boolean,
         )
@@ -307,6 +312,7 @@ class TestCommandProcessor:
             sender=sender,
             command="hElp",
             args=[],
+            content=Mock(),
             is_management=boolean2[0],
             is_portal=boolean2[1])
 
@@ -333,6 +339,7 @@ class TestCommandProcessor:
             sender=sender,
             command="foo",
             args=[],
+            content=Mock(),
             is_management=boolean2[0],
             is_portal=boolean2[1],
         )
@@ -361,6 +368,7 @@ class TestCommandProcessor:
             sender=sender,  # u.User
             command="foo",
             args=[],
+            content=Mock(),
             is_management=boolean2[0],
             is_portal=boolean2[1]
         )