iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Restore better reply fallback behavior to avoid mentions

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-22 22:08:03 +03:00
parent cdee0df5ab
commit 13fd8db0b7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/formatter/from_telegram.py
+3 -2
View File
@@ -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) event: MessageEvent = await main_intent.get_event(msg.mx_room, msg.mxid)
if isinstance(event.content, TextMessageEventContent): if isinstance(event.content, TextMessageEventContent):
event.content.trim_reply_fallback() 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: except MatrixRequestError:
pass log.exception("Failed to get event to add reply fallback")
async def telegram_to_matrix(evt: Message, source: "AbstractUser", async def telegram_to_matrix(evt: Message, source: "AbstractUser",
setup.py
+1 -1
View File
@@ -32,7 +32,7 @@ setuptools.setup(
install_requires=[ install_requires=[
"aiohttp>=3.0.1,<4", "aiohttp>=3.0.1,<4",
"mautrix>=0.4.0.dev62,<0.5", "mautrix>=0.4.0.dev65,<0.5",
"SQLAlchemy>=1.2.3,<2", "SQLAlchemy>=1.2.3,<2",
"alembic>=1.0.0,<2", "alembic>=1.0.0,<2",
"commonmark>=0.8.1,<0.10", "commonmark>=0.8.1,<0.10",