Only apply relaybot.group_chat_invite to chats with relaybot

This commit is contained in:
Tulir Asokan
2019-11-08 20:06:57 +02:00
parent 87d9477bc7
commit ed90c2667a
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -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"]
+1 -1
View File
@@ -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)