From c126e8b615f0e30faa19e5399f7a69a15fb632df Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 20 May 2020 22:45:22 +0300 Subject: [PATCH] Actually ignore ChatForbidden when syncing. Fixes #446 --- mautrix_telegram/user.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py index a43961c7..4d9f6ead 100644 --- a/mautrix_telegram/user.py +++ b/mautrix_telegram/user.py @@ -29,6 +29,7 @@ from mautrix.client import Client from mautrix.errors import MatrixRequestError from mautrix.types import UserID from mautrix.bridge import BaseUser +from mautrix.util.logging import TraceLogger from .types import TelegramID from .db import User as DBUser @@ -45,7 +46,7 @@ SearchResult = NewType('SearchResult', Tuple['pu.Puppet', int]) class User(AbstractUser, BaseUser): - log: logging.Logger = logging.getLogger("mau.user") + log: TraceLogger = logging.getLogger("mau.user") by_mxid: Dict[str, 'User'] = {} by_tgid: Dict[int, 'User'] = {} @@ -343,10 +344,12 @@ class User(AbstractUser, BaseUser): entity = dialog.entity if isinstance(entity, ChatForbidden): self.log.warning(f"Ignoring forbidden chat {entity} while syncing") + continue elif isinstance(entity, Chat) and (entity.deactivated or entity.left): self.log.warning(f"Ignoring deactivated or left chat {entity} while syncing") continue elif isinstance(entity, TLUser) and not config["bridge.sync_direct_chats"]: + self.log.trace(f"Ignoring user {entity.id} while syncing") continue portal = po.Portal.get_by_entity(entity, receiver_id=self.tgid) self.portals[portal.tgid_full] = portal