From 71a6aa71cac01de5a515721702b4f538aed33d36 Mon Sep 17 00:00:00 2001
From: Lukas <m@hler.eu>
Date: Mon, 27 Sep 2021 14:09:11 +0200
Subject: [PATCH] fix isqueryclient function

---
 myTS3.py    | 16 +++++++---------
 src/util.py |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/myTS3.py b/myTS3.py
index 0f4d552..2b50132 100644
--- a/myTS3.py
+++ b/myTS3.py
@@ -66,8 +66,8 @@ class TSbot:
                 # Start the Bot
                 self.loop()
 
-        except ts3.query.TS3QueryError:
-            self.pipeOut("Connection can't be established, check your '.toml' file.", lvl="CRITICAL")
+        except ts3.query.TS3QueryError as e:
+            self.pipeOut(e, lvl="CRITICAL")
 
     def loop(self):
         """
@@ -331,19 +331,17 @@ class TSbot:
 
         self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=msg)
 
-    def isqueryclient(self, cluid):
+    def isqueryclient(self, clid):
         """
         Check if the given client-uid is a query client.
         """
 
-        # client = self.bot.clientlist(uid=uid)
-        # print(client[0])
-        # if client[0]["client_type"] == "1":
-        if cluid == "ServerQuery":
-            self.pipeOut(f"[{cluid}] ISQUERY: True")
+        client = self.bot.clientinfo(clid=clid)
+        if client["client_type"] == "1":
+            self.pipeOut(f"[{clid}] ISQUERY: True")
             return True
         else:
-            self.pipeOut(f"[{cluid}] ISQUERY: False")
+            self.pipeOut(f"[{clid}] ISQUERY: False")
             return False
 
     def isadmin(self, cldbid):
diff --git a/src/util.py b/src/util.py
index b20f9af..150a979 100644
--- a/src/util.py
+++ b/src/util.py
@@ -67,7 +67,7 @@ def setupLogger(logpath, lvl="DEBUG"):
     if not os.path.exists(logpath):
         os.makedirs(logpath)
     handler = RotatingFileHandler(logpath + r"/myTS3.log", encoding='utf-8', maxBytes=5*1024*1024, backupCount=10)
-    logformat = logging.Formatter("%(asctime)s %(levelname)7s %(message)s", "%Y-%m-%d %H:%M:%S")
+    logformat = logging.Formatter("%(asctime)s %(levelname)8s %(message)s", "%Y-%m-%d %H:%M:%S")
     handler.setFormatter(logformat)
     log.addHandler(handler)
     log.setLevel(lvl)