From b6312f306ac24756a5e7924bf7d94196ef744adf Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 17 Jul 2022 16:09:02 +0300 Subject: [PATCH] Move config check when handling ghost invites --- mautrix_telegram/matrix.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index b1eceacd..682badd8 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -71,13 +71,12 @@ class MatrixHandler(BaseMatrixHandler): evt: StateEvent, members: list[UserID], ) -> None: - if not invited_by.is_logged_in: - await puppet.default_mxid_intent.leave_room( - room_id, reason="You are not logged into this Telegram bridge" - ) - return double_puppet = await pu.Puppet.get_by_custom_mxid(invited_by.mxid) - if not double_puppet or self.az.bot_mxid in members: + if ( + not double_puppet + or self.az.bot_mxid in members + or not not self.config["bridge.create_group_on_invite"] + ): if self.az.bot_mxid not in members: await puppet.default_mxid_intent.leave_room( room_id, @@ -89,7 +88,6 @@ class MatrixHandler(BaseMatrixHandler): "This ghost will remain inactive until a Telegram chat is created for this room.", ) return - elif not await user_has_power_level( evt.room_id, double_puppet.intent, invited_by, "bridge" ): @@ -97,8 +95,6 @@ class MatrixHandler(BaseMatrixHandler): room_id, reason="You do not have the permissions to bridge this room." ) return - elif not self.config["bridge.create_group_on_invite"]: - return await double_puppet.intent.invite_user(room_id, self.az.bot_mxid)