Bump version to 0.6.0rc1

mautrix_telegram/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1rc1"
 __author__ = "Tulir Asokan <tulir@maunium.net>"

mautrix_telegram/formatter/from_matrix/parser.py

@@ -170,7 +170,9 @@ class MatrixParser:
 
     @classmethod
     def node_to_tmessage(cls, node: HTMLNode, ctx: RecursionContext) -> TelegramMessage:
-        if node.tag == "ol":
+        if node.tag == "mx-reply":
+            return TelegramMessage("")
+        elif node.tag == "ol":
             return cls.list_to_tmessage(node, ctx)
         elif node.tag == "ul":
             return cls.list_to_tmessage(node, ctx.enter_list())

mautrix_telegram/portal.py

@@ -346,7 +346,10 @@ class Portal:
                 await self.invite_to_matrix(invites or [])
             return self.mxid
         async with self._room_create_lock:
-            return await self._create_matrix_room(user, entity, invites)
+            try:
+                return await self._create_matrix_room(user, entity, invites)
+            except Exception:
+                self.log.exception("Fatal error creating Matrix room")
 
     async def _create_matrix_room(self, user: 'AbstractUser', entity: TypeChat, invites: InviteList
                                   ) -> Optional[MatrixRoomID]:
@@ -996,9 +999,10 @@ class Portal:
             relates_to = message.get("m.relates_to", None) or {}
             if relates_to.get("rel_type", None) == "m.replace":
                 orig_msg = DBMessage.get_by_mxid(relates_to.get("event_id", ""), self.mxid, space)
-                if orig_msg:
-                    response = await client.edit_message(self.peer, orig_msg.tgid,
-                                                         message.get("m.new_content", message),
+                if orig_msg and "m.new_content" in message:
+                    message = message["m.new_content"]
+                    formatter.matrix_reply_to_telegram(message, space, room_id=self.mxid)
+                    response = await client.edit_message(self.peer, orig_msg.tgid, message,
                                                          parse_mode=self._matrix_event_to_entities,
                                                          link_preview=lp)
                     self._add_telegram_message_to_db(event_id, space, -1, response)
@@ -1699,8 +1703,7 @@ class Portal:
                           edit_index=prev_edit_msg.edit_index + 1).insert()
             return
 
-        text, html, _ = await formatter.telegram_to_matrix(evt, source, self.main_intent,
-                                                           no_reply_fallback=True)
+        text, html, _ = await formatter.telegram_to_matrix(evt, source, self.main_intent)
         editing_msg = DBMessage.get_one_by_tgid(TelegramID(evt.id), tg_space)
         if not editing_msg:
             self.log.info(f"Didn't find edited message {evt.id}@{tg_space} (src {source.tgid}) "

mautrix_telegram/puppet.py

@@ -379,7 +379,7 @@ class Puppet:
             self.displayname = displayname
             self.displayname_source = source.tgid
             try:
-                await self.default_mxid_intent.set_display_name(displayname)
+                await self.default_mxid_intent.set_display_name(displayname[:100])
             except MatrixRequestError:
                 self.log.exception("Failed to set displayname")
                 self.displayname = ""

mautrix_telegram/user.py

@@ -161,6 +161,12 @@ class User(AbstractUser):
     # endregion
     # region Telegram connection management
 
+    async def try_ensure_started(self) -> None:
+        try:
+            await self.ensure_started()
+        except Exception:
+            self.log.exception("Exception in ensure_started")
+
     def ensure_started(self, even_if_no_session=False) -> Awaitable['User']:
         return super().ensure_started(even_if_no_session)
 
@@ -400,9 +406,9 @@ class User(AbstractUser):
     # endregion
 
 
-def init(context: 'Context') -> List[Awaitable['User']]:
+def init(context: 'Context') -> List[Awaitable[None]]:
     global config
     config = context.config
 
     users = [User.from_db(user) for user in DBUser.all()]
-    return [user.ensure_started() for user in users if user.tgid]
+    return [user.try_ensure_started() for user in users if user.tgid]