From 56fb88b75ef39fe82c415001a3bb9ea3e75cad9c Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 29 Sep 2018 00:59:02 +0300 Subject: [PATCH] Use mxids instead of localparts as default displaynames and fix name add/remove message. Fixes #228 --- mautrix_telegram/matrix.py | 6 +++--- mautrix_telegram/portal.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index c78f18f2..3d04e531 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -385,9 +385,9 @@ class MatrixHandler: prev_membership = prev_content.get("membership", "leave") # type: str if membership == prev_membership: match = re.compile("@(.+):(.+)").match(state_key) # type: Match - localpart = match.group(1) # type: str - displayname = content.get("displayname", localpart) # type: str - prev_displayname = prev_content.get("displayname", localpart) # type: str + mxid = match.group(0) # type: str + displayname = content.get("displayname", None) or mxid # type: str + prev_displayname = prev_content.get("displayname", None) or mxid # type: str if displayname != prev_displayname: await self.handle_name_change(room_id, state_key, displayname, prev_displayname, event_id) diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index 789104f2..f55b8b90 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -758,7 +758,7 @@ class Portal: async def get_displayname(self, user: 'u.User') -> str: return (await self.main_intent.get_displayname(self.mxid, user.mxid) - or user.mxid_localpart) + or user.mxid) def set_typing(self, user: 'u.User', typing: bool = True, action: type = SendMessageTypingAction) -> Awaitable[bool]: