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

Fix lint warnings and properly handle ShortMessages

Browse Source
This commit is contained in:
Tulir Asokan
2018-02-15 14:01:14 +02:00
parent 6615a68cee
commit 44fea38231
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/formatter.py
+5 -4
View File
@@ -242,8 +242,9 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
+ f"<blockquote>{html}</blockquote>") + f"<blockquote>{html}</blockquote>")
if evt.reply_to_msg_id: if evt.reply_to_msg_id:
space = evt.to_id.channel_id if isinstance(evt, Message) and isinstance(evt.to_id, space = (evt.to_id.channel_id
PeerChannel) else source.tgid if isinstance(evt, Message) and isinstance(evt.to_id, PeerChannel)
else source.tgid)
msg = DBMessage.query.get((evt.reply_to_msg_id, space)) msg = DBMessage.query.get((evt.reply_to_msg_id, space))
if msg: if msg:
if native_replies: if native_replies:
@@ -260,7 +261,7 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
sender = event['sender'] sender = event['sender']
puppet = p.Puppet.get_by_mxid(sender, create=False) puppet = p.Puppet.get_by_mxid(sender, create=False)
displayname = puppet.displayname if puppet else sender displayname = puppet.displayname if puppet else sender
reply_to_user = (f"<a href='https://matrix.to/#/{sender}'>{displayname}</a>") reply_to_user = f"<a href='https://matrix.to/#/{sender}'>{displayname}</a>"
reply_to_msg = (("<a href='https://matrix.to/#/" reply_to_msg = (("<a href='https://matrix.to/#/"
+ f"{msg.mx_room}/{msg.mxid}'>{reply_text}</a>") + f"{msg.mx_room}/{msg.mxid}'>{reply_text}</a>")
if message_link_in_reply else "Reply") if message_link_in_reply else "Reply")
@@ -272,7 +273,7 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
else: else:
html = quote + escape(text) html = quote + escape(text)
if evt.post and evt.post_author: if isinstance(evt, Message) and evt.post and evt.post_author:
if not html: if not html:
html = escape(text) html = escape(text)
text += f"\n- {evt.post_author}" text += f"\n- {evt.post_author}"