Restore better reply fallback behavior to avoid mentions

2019-08-22 22:08:03 +03:00
parent cdee0df5ab
commit 13fd8db0b7
2 changed files with 4 additions and 3 deletions
@@ -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",