lm
/
myTS3
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix isadmin function using any()

This commit is contained in:
Lukas 2021-10-06 18:20:23 +02:00
parent 31b745d048
commit 55665db5bb
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
myTS3.py
View File

@ -4,7 +4,7 @@ TBD
__author__ = "Lukas Mahler" __author__ = "Lukas Mahler"
__version__ = "0.0.0" __version__ = "0.0.0"
__date__ = "30.09.2021" __date__ = "06.10.2021"
__email__ = "m@hler.eu" __email__ = "m@hler.eu"
__status__ = "Development" __status__ = "Development"
@ -360,7 +360,10 @@ class TSbot:
def isadmin(self, cldbid): def isadmin(self, cldbid):
""" """
Check if the given client-databaseid is an admin. 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: try:
groups = self.bot.servergroupsbyclientid(cldbid=cldbid) groups = self.bot.servergroupsbyclientid(cldbid=cldbid)
except ts3.query.TS3QueryError as e: except ts3.query.TS3QueryError as e:
@ -369,12 +372,13 @@ class TSbot:
self.pipeOut(str(groups.__dict__), lvl="DEBUG") # DEBUG self.pipeOut(str(groups.__dict__), lvl="DEBUG") # DEBUG
if self.allowed_sgids in groups: for group in groups:
self.pipeOut(f"[{cldbid}] ISADMIN: True") if any(sgid == group['sgid'] for sgid in self.allowed_sgids):
return True self.pipeOut(f"[{cldbid}] ISADMIN: True")
else: return True
self.pipeOut(f"[{cldbid}] ISADMIN: False")
return False self.pipeOut(f"[{cldbid}] ISADMIN: False")
return False
def lookupcommand(self, msg, invkr_id): def lookupcommand(self, msg, invkr_id):
""" """
@ -396,7 +400,6 @@ class TSbot:
.roll .roll
.stop / .quit / .q .stop / .quit / .q
.test .test
""" """
commandstring = msg.split(" ") commandstring = msg.split(" ")