From 70a6b847e2047dffc8dc1319fb0923f96a503cf1 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 24 Oct 2020 21:13:57 +0300 Subject: [PATCH] Fix random bugs and update mautrix-python --- mautrix_telegram/portal/telegram.py | 7 +++++-- mautrix_telegram/puppet.py | 2 +- requirements.txt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mautrix_telegram/portal/telegram.py b/mautrix_telegram/portal/telegram.py index a504878c..f74eb52e 100644 --- a/mautrix_telegram/portal/telegram.py +++ b/mautrix_telegram/portal/telegram.py @@ -455,8 +455,11 @@ class PortalTelegram(BasePortal, ABC): else self.tgid)) min_id = last.tgid if last else 0 if last_id is None: - message = (await source.client.get_messages(self.peer, limit=1))[0] - last_id = message.id + messages = await source.client.get_messages(self.peer, limit=1) + if not messages: + # The chat seems empty + return + last_id = messages[0].id if last_id <= min_id: # Nothing to backfill return diff --git a/mautrix_telegram/puppet.py b/mautrix_telegram/puppet.py index 449e3ff9..0205ec72 100644 --- a/mautrix_telegram/puppet.py +++ b/mautrix_telegram/puppet.py @@ -262,7 +262,7 @@ class Puppet(BasePuppet): allow_because = "user is bot" elif self.displayname_source == source.tgid: allow_because = "user is the primary source" - elif not info.contact: + elif not isinstance(info, UpdateUserName) and not info.contact: allow_because = "user is not a contact" elif self.displayname_source is None: allow_because = "no primary source set" diff --git a/requirements.txt b/requirements.txt index d9c76231..9b0d4fa6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ python-magic>=0.4,<0.5 commonmark>=0.8,<0.10 aiohttp>=3,<3.7 yarl<1.6 -mautrix==0.8.0.beta10 +mautrix==0.8.0rc1 telethon>=1.17,<1.18 telethon-session-sqlalchemy>=0.2.14,<0.3