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

Fix other usages of Puppet.get_displayname

Browse Source
This commit is contained in:
Tulir Asokan
2021-03-23 20:21:46 +02:00
parent abfefab545
commit f9a6e9c4fb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/commands/telegram/misc.py
+2 -2
View File
@@ -116,8 +116,8 @@ async def pm(evt: CommandEvent) -> EventID:
return await evt.reply("That doesn't seem to be a user.") return await evt.reply("That doesn't seem to be a user.")
portal = po.Portal.get_by_entity(user, evt.sender.tgid) portal = po.Portal.get_by_entity(user, evt.sender.tgid)
await portal.create_matrix_room(evt.sender, user, [evt.sender.mxid]) await portal.create_matrix_room(evt.sender, user, [evt.sender.mxid])
return await evt.reply("Created private chat room with " displayname, _ = pu.Puppet.get_displayname(user, False)
f"{pu.Puppet.get_displayname(user, False)}") return await evt.reply(f"Created private chat room with {displayname}")
async def _join(evt: CommandEvent, identifier: str, link_type: str async def _join(evt: CommandEvent, identifier: str, link_type: str
mautrix_telegram/formatter/from_telegram.py
+1 -1
View File
@@ -79,7 +79,7 @@ async def _add_forward_header(source: 'AbstractUser', content: TextMessageEventC
try: try:
user = await source.client.get_entity(fwd_from.from_id) user = await source.client.get_entity(fwd_from.from_id)
if user: if user:
fwd_from_text = pu.Puppet.get_displayname(user, False) fwd_from_text, _ = pu.Puppet.get_displayname(user, False)
fwd_from_html = f"<b>{escape(fwd_from_text)}</b>" fwd_from_html = f"<b>{escape(fwd_from_text)}</b>"
except (ValueError, RPCError): except (ValueError, RPCError):
fwd_from_text = fwd_from_html = "unknown user" fwd_from_text = fwd_from_html = "unknown user"
mautrix_telegram/puppet.py
+1 -1
View File
@@ -240,7 +240,7 @@ class Puppet(BasePuppet):
name = str(info.id) name = str(info.id)
quality = 0 quality = 0
return cls.displayname_template.format_full(name) if enable_format else name, quality return (cls.displayname_template.format_full(name) if enable_format else name), quality
async def try_update_info(self, source: 'AbstractUser', info: User) -> None: async def try_update_info(self, source: 'AbstractUser', info: User) -> None:
try: try: