From 13fd8db0b798e211dca8cf14c7f35ff5cbec80b9 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 22 Aug 2019 22:08:03 +0300 Subject: [PATCH] Restore better reply fallback behavior to avoid mentions --- mautrix_telegram/formatter/from_telegram.py | 5 +++-- setup.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mautrix_telegram/formatter/from_telegram.py b/mautrix_telegram/formatter/from_telegram.py index 04164f0d..bd6bea0f 100644 --- a/mautrix_telegram/formatter/from_telegram.py +++ b/mautrix_telegram/formatter/from_telegram.py @@ -130,9 +130,10 @@ async def _add_reply_header(source: 'AbstractUser', content: TextMessageEventCon event: MessageEvent = await main_intent.get_event(msg.mx_room, msg.mxid) if isinstance(event.content, TextMessageEventContent): event.content.trim_reply_fallback() - content.set_reply(event) + puppet = pu.Puppet.get_by_mxid(event.sender, create=False) + content.set_reply(event, displayname=puppet.displayname if puppet else event.sender) except MatrixRequestError: - pass + log.exception("Failed to get event to add reply fallback") async def telegram_to_matrix(evt: Message, source: "AbstractUser", diff --git a/setup.py b/setup.py index d0629474..7cb750e9 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ setuptools.setup( install_requires=[ "aiohttp>=3.0.1,<4", - "mautrix>=0.4.0.dev62,<0.5", + "mautrix>=0.4.0.dev65,<0.5", "SQLAlchemy>=1.2.3,<2", "alembic>=1.0.0,<2", "commonmark>=0.8.1,<0.10",