From 1c662c55cc4b7695cec76c1ed800781627a904e2 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 28 Oct 2019 01:21:36 +0200 Subject: [PATCH] Ignore telegram updates in blacklisted chats --- mautrix_telegram/abstract_user.py | 5 +++-- mautrix_telegram/portal/base.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mautrix_telegram/abstract_user.py b/mautrix_telegram/abstract_user.py index 2554bdd9..72fb69d1 100644 --- a/mautrix_telegram/abstract_user.py +++ b/mautrix_telegram/abstract_user.py @@ -404,6 +404,9 @@ class AbstractUser(ABC): async def update_message(self, original_update: UpdateMessage) -> None: update, sender, portal = self.get_message_details(original_update) + if portal and not portal.allow_bridging: + self.log.debug(f"Ignoring message in portal {portal.tgid_log} (bridging disallowed)") + return if self.is_bot: if update.is_private: @@ -430,10 +433,8 @@ class AbstractUser(ABC): sender.id) return await portal.handle_telegram_action(self, sender, update) - user = sender.tgid if sender else "admin" if isinstance(original_update, (UpdateEditMessage, UpdateEditChannelMessage)): return await portal.handle_telegram_edit(self, sender, update) - return await portal.handle_telegram_message(self, sender, update) # endregion diff --git a/mautrix_telegram/portal/base.py b/mautrix_telegram/portal/base.py index 7690b49a..bbea89a1 100644 --- a/mautrix_telegram/portal/base.py +++ b/mautrix_telegram/portal/base.py @@ -446,12 +446,13 @@ class BasePortal(ABC): pass @abstractmethod - async def _update_title(self, title: str, save: bool = False) -> bool: + async def _update_title(self, title: str, sender: Optional['p.Puppet'] = None, + save: bool = False) -> bool: pass @abstractmethod async def _update_avatar(self, user: 'AbstractUser', photo: Union[TypeChatPhoto], - save: bool = False) -> bool: + sender: Optional['p.Puppet'] = None, save: bool = False) -> bool: pass @abstractmethod