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

Fix public channel mentions always using user instead of portal mxid

Browse Source
This commit is contained in:
Tulir Asokan
2022-03-15 16:32:20 +02:00
parent 9e73324a20
commit e9dc76a860
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/formatter/from_telegram.py
+13 -1
View File
@@ -332,12 +332,24 @@ def _parse_pre(html: list[str], entity_text: str, language: str) -> bool:
async def _parse_mention(html: list[str], entity_text: str) -> bool: async def _parse_mention(html: list[str], entity_text: str) -> bool:
username = entity_text[1:] username = entity_text[1:]
mxid = None
portal = None
# This is a bit complicated because public channels have both Puppet and Portal instances.
# Basically the currently intended output is:
# User/bot mention (bridge user) -> real user mention
# User/bot mention (normal Telegram user) -> ghost user mention
# Public channel with existing portal -> room mention
# Public channel without portal -> ghost user mention
# Other chat -> room mention
user = await u.User.find_by_username(username) or await pu.Puppet.find_by_username(username) user = await u.User.find_by_username(username) or await pu.Puppet.find_by_username(username)
if user: if user:
if isinstance(user, pu.Puppet) and user.is_channel:
portal = await po.Portal.get_by_tgid(user.tgid)
mxid = user.mxid mxid = user.mxid
else: else:
portal = await po.Portal.find_by_username(username) portal = await po.Portal.find_by_username(username)
mxid = portal.alias or portal.mxid if portal else None if portal and (portal.mxid or not user):
mxid = portal.alias or portal.mxid
if mxid: if mxid:
html.append(f"<a href='https://matrix.to/#/{mxid}'>{entity_text}</a>") html.append(f"<a href='https://matrix.to/#/{mxid}'>{entity_text}</a>")