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

Fix potential errors generating forward headers

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-07 18:41:54 +03:00
parent 75fc5c6e1e
commit 4f740fc9f8
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/formatter/from_telegram.py
+26 -20
View File
@@ -22,9 +22,10 @@ from telethon.tl.types import (MessageEntityMention, MessageEntityMentionName, M
MessageEntityEmail, MessageEntityTextUrl, MessageEntityBold, MessageEntityEmail, MessageEntityTextUrl, MessageEntityBold,
MessageEntityItalic, MessageEntityCode, MessageEntityPre, MessageEntityItalic, MessageEntityCode, MessageEntityPre,
MessageEntityBotCommand, MessageEntityHashtag, MessageEntityCashtag, MessageEntityBotCommand, MessageEntityHashtag, MessageEntityCashtag,
MessageEntityPhone, TypeMessageEntity, Message, PeerChannel, MessageEntityPhone, TypeMessageEntity, PeerChannel,
MessageEntityBlockquote, MessageEntityStrike, MessageFwdHeader, MessageEntityBlockquote, MessageEntityStrike, MessageFwdHeader,
MessageEntityUnderline, PeerUser) MessageEntityUnderline, PeerUser)
from telethon.tl.custom import Message
from telethon.helpers import add_surrogate, del_surrogate from telethon.helpers import add_surrogate, del_surrogate
from mautrix.errors import MatrixRequestError from mautrix.errors import MatrixRequestError
@@ -47,7 +48,7 @@ def telegram_reply_to_matrix(evt: Message, source: 'AbstractUser') -> Optional[R
space = (evt.to_id.channel_id space = (evt.to_id.channel_id
if isinstance(evt, Message) and isinstance(evt.to_id, PeerChannel) if isinstance(evt, Message) and isinstance(evt.to_id, PeerChannel)
else source.tgid) else source.tgid)
msg = DBMessage.get_one_by_tgid(evt.reply_to_msg_id, space) msg = DBMessage.get_one_by_tgid(TelegramID(evt.reply_to_msg_id), space)
if msg: if msg:
return RelatesTo(rel_type=RelationType.REFERENCE, event_id=msg.mxid) return RelatesTo(rel_type=RelationType.REFERENCE, event_id=msg.mxid)
return None return None
@@ -74,11 +75,14 @@ async def _add_forward_header(source: 'AbstractUser', content: TextMessageEventC
f"{escape(fwd_from_text)}</a>") f"{escape(fwd_from_text)}</a>")
if not fwd_from_text: if not fwd_from_text:
user = await source.client.get_entity(PeerUser(fwd_from.from_id)) try:
if user: user = await source.client.get_entity(PeerUser(fwd_from.from_id))
fwd_from_text = pu.Puppet.get_displayname(user, False) if user:
fwd_from_html = f"<b>{escape(fwd_from_text)}</b>" fwd_from_text = pu.Puppet.get_displayname(user, False)
else: fwd_from_html = f"<b>{escape(fwd_from_text)}</b>"
except ValueError:
fwd_from_text = fwd_from_html = "unknown user"
elif fwd_from.channel_id:
portal = po.Portal.get_by_tgid(TelegramID(fwd_from.channel_id)) portal = po.Portal.get_by_tgid(TelegramID(fwd_from.channel_id))
if portal: if portal:
fwd_from_text = portal.title fwd_from_text = portal.title
@@ -86,19 +90,21 @@ async def _add_forward_header(source: 'AbstractUser', content: TextMessageEventC
fwd_from_html = (f"<a href='https://matrix.to/#/{portal.alias}'>" fwd_from_html = (f"<a href='https://matrix.to/#/{portal.alias}'>"
f"{escape(fwd_from_text)}</a>") f"{escape(fwd_from_text)}</a>")
else: else:
fwd_from_html = f"<b>{escape(fwd_from_text)}</b>" fwd_from_html = f"channel <b>{escape(fwd_from_text)}</b>"
else: else:
channel = await source.client.get_entity(PeerChannel(fwd_from.channel_id)) try:
if channel: channel = await source.client.get_entity(PeerChannel(fwd_from.channel_id))
fwd_from_text = channel.title if channel:
fwd_from_html = f"<b>{fwd_from_text}</b>" fwd_from_text = f"channel {channel.title}"
fwd_from_html = f"channel <b>{escape(channel.title)}</b>"
if not fwd_from_text: except ValueError:
if fwd_from.from_id: fwd_from_text = fwd_from_html = "unknown channel"
fwd_from_text = "Unknown user" elif fwd_from.from_name:
else: fwd_from_text = fwd_from.from_name
fwd_from_text = "Unknown source" fwd_from_html = f"<b>{escape(fwd_from.from_name)}</b>"
fwd_from_html = f"<b>{fwd_from_text}</b>" else:
fwd_from_text = "unknown source"
fwd_from_html = f"unknown source"
content.body = "\n".join([f"> {line}" for line in content.body.split("\n")]) content.body = "\n".join([f"> {line}" for line in content.body.split("\n")])
content.body = f"Forwarded from {fwd_from_text}:\n{content.body}" content.body = f"Forwarded from {fwd_from_text}:\n{content.body}"
@@ -113,7 +119,7 @@ async def _add_reply_header(source: 'AbstractUser', content: TextMessageEventCon
if isinstance(evt, Message) and isinstance(evt.to_id, PeerChannel) if isinstance(evt, Message) and isinstance(evt.to_id, PeerChannel)
else source.tgid) else source.tgid)
msg = DBMessage.get_one_by_tgid(evt.reply_to_msg_id, space) msg = DBMessage.get_one_by_tgid(TelegramID(evt.reply_to_msg_id), space)
if not msg: if not msg:
return return