diff --git a/mautrix_telegram/commands/telegram/misc.py b/mautrix_telegram/commands/telegram/misc.py index a058c79a..4d615587 100644 --- a/mautrix_telegram/commands/telegram/misc.py +++ b/mautrix_telegram/commands/telegram/misc.py @@ -116,8 +116,8 @@ async def pm(evt: CommandEvent) -> EventID: return await evt.reply("That doesn't seem to be a user.") portal = po.Portal.get_by_entity(user, evt.sender.tgid) await portal.create_matrix_room(evt.sender, user, [evt.sender.mxid]) - return await evt.reply("Created private chat room with " - f"{pu.Puppet.get_displayname(user, False)}") + displayname, _ = 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 diff --git a/mautrix_telegram/formatter/from_telegram.py b/mautrix_telegram/formatter/from_telegram.py index ef869d06..3539e8e5 100644 --- a/mautrix_telegram/formatter/from_telegram.py +++ b/mautrix_telegram/formatter/from_telegram.py @@ -79,7 +79,7 @@ async def _add_forward_header(source: 'AbstractUser', content: TextMessageEventC try: user = await source.client.get_entity(fwd_from.from_id) if user: - fwd_from_text = pu.Puppet.get_displayname(user, False) + fwd_from_text, _ = pu.Puppet.get_displayname(user, False) fwd_from_html = f"{escape(fwd_from_text)}" except (ValueError, RPCError): fwd_from_text = fwd_from_html = "unknown user" diff --git a/mautrix_telegram/puppet.py b/mautrix_telegram/puppet.py index 01cbb781..d164079f 100644 --- a/mautrix_telegram/puppet.py +++ b/mautrix_telegram/puppet.py @@ -240,7 +240,7 @@ class Puppet(BasePuppet): name = str(info.id) 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: try: