From 55665db5bb9520719aab094a03b91e66e8cb2848 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 6 Oct 2021 18:20:23 +0200 Subject: [PATCH] fix isadmin function using any() --- myTS3.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/myTS3.py b/myTS3.py index 5739de2..0012fc6 100644 --- a/myTS3.py +++ b/myTS3.py @@ -4,7 +4,7 @@ TBD __author__ = "Lukas Mahler" __version__ = "0.0.0" -__date__ = "30.09.2021" +__date__ = "06.10.2021" __email__ = "m@hler.eu" __status__ = "Development" @@ -360,7 +360,10 @@ class TSbot: def isadmin(self, cldbid): """ Check if the given client-databaseid is an admin. + This is done by resolving the clients groups and check + if any of the groups sgid match a sgid from the sgids from the '.toml' config. """ + try: groups = self.bot.servergroupsbyclientid(cldbid=cldbid) except ts3.query.TS3QueryError as e: @@ -369,12 +372,13 @@ class TSbot: self.pipeOut(str(groups.__dict__), lvl="DEBUG") # DEBUG - if self.allowed_sgids in groups: - self.pipeOut(f"[{cldbid}] ISADMIN: True") - return True - else: - self.pipeOut(f"[{cldbid}] ISADMIN: False") - return False + for group in groups: + if any(sgid == group['sgid'] for sgid in self.allowed_sgids): + self.pipeOut(f"[{cldbid}] ISADMIN: True") + return True + + self.pipeOut(f"[{cldbid}] ISADMIN: False") + return False def lookupcommand(self, msg, invkr_id): """ @@ -396,7 +400,6 @@ class TSbot: .roll .stop / .quit / .q .test - """ commandstring = msg.split(" ")