From 1f5b91cbec7866663d8dd8f4c9a62115e2905552 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 9 Apr 2022 20:52:45 +0300 Subject: [PATCH] Update mautrix-python --- mautrix_telegram/formatter/from_telegram.py | 7 +++---- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mautrix_telegram/formatter/from_telegram.py b/mautrix_telegram/formatter/from_telegram.py index e730f3b3..9e777429 100644 --- a/mautrix_telegram/formatter/from_telegram.py +++ b/mautrix_telegram/formatter/from_telegram.py @@ -52,9 +52,9 @@ from mautrix.appservice import IntentAPI from mautrix.types import ( EventType, Format, + InReplyTo, MessageType, RelatesTo, - RelationType, TextMessageEventContent, ) @@ -74,7 +74,7 @@ async def telegram_reply_to_matrix(evt: Message, source: au.AbstractUser) -> Rel ) msg = await DBMessage.get_one_by_tgid(TelegramID(evt.reply_to.reply_to_msg_id), space) if msg: - return RelatesTo(rel_type=RelationType.REPLY, event_id=msg.mxid) + return RelatesTo(in_reply_to=InReplyTo(event_id=msg.mxid)) return None @@ -158,8 +158,6 @@ async def _add_reply_header( if not msg: return - content.relates_to = RelatesTo(rel_type=RelationType.REPLY, event_id=msg.mxid) - try: event = await main_intent.get_event(msg.mx_room, msg.mxid) if event.type == EventType.ROOM_ENCRYPTED and source.bridge.matrix.e2ee: @@ -170,6 +168,7 @@ async def _add_reply_header( content.set_reply(event, displayname=puppet.displayname if puppet else event.sender) except Exception: log.exception("Failed to get event to add reply fallback") + content.set_reply(msg.mxid) async def telegram_to_matrix( diff --git a/requirements.txt b/requirements.txt index 0a3386f4..1fe6e98a 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.15.8,<0.16 +mautrix>=0.16.0,<0.17 #telethon>=1.24,<1.25 # Fork to make session storage async and update to layer 138 tulir-telethon==1.25.0a7