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 -7
View File
@@ -50,13 +50,9 @@ class User(AbstractUser):
self.command_status = None
self.is_admin = self.mxid in config.get("bridge.admins", [])
whitelist = config.get("bridge.whitelist", None) or [self.mxid]
self.whitelisted = not whitelist or self.mxid in whitelist
if not self.whitelisted:
homeserver = self.mxid[self.mxid.index(":") + 1:]
self.whitelisted = homeserver in whitelist
(self.relaybot_whitelisted,
self.whitelisted,
self.is_admin) = config.get_permissions(self.mxid)
self.by_mxid[mxid] = self
if tgid: