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

Fix potential errors caused by deleted portals when logging out (ref #286)

Browse Source
This commit is contained in:
Tulir Asokan
2019-03-02 04:09:39 +02:00
parent 9eda525d2a
commit 7d5e946067
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/user.py
+2 -2
View File
@@ -239,7 +239,7 @@ class User(AbstractUser):
if puppet.is_real_user: if puppet.is_real_user:
await puppet.switch_mxid(None, None) await puppet.switch_mxid(None, None)
for _, portal in self.portals.items(): for _, portal in self.portals.items():
if not portal.mxid or portal.has_bot: if not portal or portal.deleted or not portal.mxid or portal.has_bot:
continue continue
try: try:
await portal.main_intent.kick(portal.mxid, self.mxid, "Logged out of Telegram.") await portal.main_intent.kick(portal.mxid, self.mxid, "Logged out of Telegram.")
@@ -317,7 +317,7 @@ class User(AbstractUser):
def unregister_portal(self, portal: po.Portal) -> None: def unregister_portal(self, portal: po.Portal) -> None:
try: try:
del self.portals[portal.tgid_full] del self.portals[portal.tgid_full]
self.save_portals() self.save(portals=True)
except KeyError: except KeyError:
pass pass