Move all permissions to single object in config

This commit is contained in:
Tulir Asokan
2018-02-23 12:07:42 +02:00
parent fb37af12b4
commit 2d2fe86757
6 changed files with 88 additions and 21 deletions
+3 -3
View File
@@ -119,7 +119,7 @@ class MatrixHandler:
if not portal:
return
if not user.whitelisted:
if not user.relaybot_whitelisted:
await portal.main_intent.kick(room, user.mxid,
"You are not whitelisted on this Telegram bridge.")
return
@@ -169,7 +169,7 @@ class MatrixHandler:
is_command, text = self.is_command(message)
sender = await User.get_by_mxid(sender).ensure_started()
if not sender.whitelisted:
if not sender.relaybot_whitelisted:
return
portal = Portal.get_by_mxid(room)
@@ -177,7 +177,7 @@ class MatrixHandler:
await portal.handle_matrix_message(sender, message, event_id)
return
if message["msgtype"] != "m.text":
if not sender.whitelisted or message["msgtype"] != "m.text":
return
try: