From ed90c2667ad6481518dfe4c2754a54dc16feda7c Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 8 Nov 2019 20:06:57 +0200 Subject: [PATCH] Only apply relaybot.group_chat_invite to chats with relaybot --- mautrix_telegram/portal/metadata.py | 9 +++++---- mautrix_telegram/portal/telegram.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mautrix_telegram/portal/metadata.py b/mautrix_telegram/portal/metadata.py index 31f2049d..12e366c0 100644 --- a/mautrix_telegram/portal/metadata.py +++ b/mautrix_telegram/portal/metadata.py @@ -293,10 +293,11 @@ class PortalMetadata(BasePortal, ABC): users = participants = None if not direct: users, participants = await self._get_users(user, entity) - extra_invites = config["bridge.relaybot.group_chat_invite"] - invites += extra_invites - for invite in extra_invites: - power_levels.users.setdefault(invite, 100) + if self.has_bot: + extra_invites = config["bridge.relaybot.group_chat_invite"] + invites += extra_invites + for invite in extra_invites: + power_levels.users.setdefault(invite, 100) self._participants_to_power_levels(participants, power_levels) elif self.bot and self.tg_receiver == self.bot.tgid: invites = config["bridge.relaybot.private_chat.invite"] diff --git a/mautrix_telegram/portal/telegram.py b/mautrix_telegram/portal/telegram.py index 4e7207e8..a37be65b 100644 --- a/mautrix_telegram/portal/telegram.py +++ b/mautrix_telegram/portal/telegram.py @@ -448,7 +448,7 @@ class PortalTelegram(BasePortal, ABC): async def _create_room_on_action(self, source: 'AbstractUser', action: TypeMessageAction) -> bool: - if source.is_relaybot: + if source.is_relaybot and config["bridge.ignore_unbridged_group_chat"]: return False create_and_exit = (MessageActionChatCreate, MessageActionChannelCreate) create_and_continue = (MessageActionChatAddUser, MessageActionChatJoinedByLink)