From d9dd304b2610ddc0646dd0b20dca7e48ebd876c0 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 29 Apr 2018 12:54:20 +0300 Subject: [PATCH] Send notification and leave when non-whitelisted user invites bridge bot. Fixes #122 --- mautrix_telegram/matrix.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index e4c147dd..f96fb0db 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -90,10 +90,16 @@ class MatrixHandler: async def handle_invite(self, room, user, inviter): self.log.debug(f"{inviter} invited {user} to {room}") inviter = await User.get_by_mxid(inviter).ensure_started() - if not inviter.whitelisted: - return - elif user == self.az.bot_mxid: + if user == self.az.bot_mxid: await self.az.intent.join_room(room) + if not inviter.whitelisted: + await self.az.intent.send_notice(room, text=None, + html="You are not whitelisted to use this bridge.

" + "If you are the owner of this bridge, see the " + "bridge.permissions section in your config file.") + await self.az.intent.leave_room(room) + return + elif not inviter.whitelisted: return puppet = Puppet.get_by_mxid(user)