From 9092e68ed4a7317a18d0fdec89c893f5d55626a8 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 22 Sep 2021 16:56:56 +0200 Subject: [PATCH] changed .format to f-strings --- myTS3.py | 116 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 55 deletions(-) diff --git a/myTS3.py b/myTS3.py index 1ad5954..527dfe8 100644 --- a/myTS3.py +++ b/myTS3.py @@ -24,21 +24,27 @@ class MyTeamspeakBot: """ + self.host = conf["host"] + self.port = conf["port"] + self.user = conf["user"] + self.pwd = conf["pwd"] + self.sid = conf["sid"] self.nickname = conf["name"] + self.myid = None self.running = True - self.intro = "__ Keep this Chat open to Use Admin Commands __" + self.intro = "< Keep this chat open to use commands. >" - print("Trying to connect to: {0}:{1}".format(conf["host"], conf["port"])) + print(f"* Trying to connect to: {self.host}:{self.port}") - with ts3.query.TS3Connection(conf["host"], conf["port"]) as self.con: - self.con.login(client_login_name=conf["user"], client_login_password=conf["pwd"]) - self.con.use(sid=conf["sid"]) + with ts3.query.TS3Connection(self.host, self.port) as self.bot: + self.bot.login(client_login_name=self.user, client_login_password=self.pwd) + self.bot.use(sid=self.sid) try: - self.con.clientupdate(client_nickname=self.nickname) + self.bot.clientupdate(client_nickname=self.nickname) except ts3.query.TS3QueryError: pass - print("Successfully connected as: {0}\n\n".format(self.nickname)) + print(f"* Successfully connected as: {self.nickname}") # Start the Bot self.loop() @@ -48,53 +54,55 @@ class MyTeamspeakBot: """ - # Finding myself - me = self.con.clientfind(pattern=self.nickname) - meid = [client["clid"] for client in me] - self.myid = meid[0] - # info = printable_clientinfo(self.myid) + # Find my client id + me = self.bot.clientfind(pattern=self.nickname) + if len(me) == 1: + self.myid = me["clid"][0] + else: + raise ValueError("x Can't find my own client id.") - # Positioning myself - '''ist standardmäßig im default channel (für meine Zwecke Richtig)''' + ''' if you want to move the Bot to a certain channel (instead of the defualt channel, you can do: ''' # ts3conn.clientmove(clid=selfid,cid=129) - # Subscribe myself to channel - self.con.servernotifyregister(event="server") - # Subscribe myself to privat chat messages - self.con.servernotifyregister(event="textprivate") - # Subscribe myself to channel movement events + # Subscribe to a certain channel + self.bot.servernotifyregister(event="server") + + # Subscribe to privat chat messages + self.bot.servernotifyregister(event="textprivate") + + # Subscribe to channel movement events # ts3conn.servernotifyregister(event="channel",id_=0) - # Notify every admin of my existance + # Notify connected admins self.notifyAdmin() # ----------- LOOP HERE ------------- while self.running: # ts3conn.send_keepalive() - print("Waiting for a new Event...") - self.con.version() + print("* Waiting for a new Event...") + self.bot.version() try: # This method blocks, but we must sent the keepalive message at # least once in 5 minutes to avoid the sever side idle client # disconnect. So we set the timeout parameter simply to 1 minute. - event = self.con.wait_for_event(timeout=60) + event = self.bot.wait_for_event(timeout=60) except ts3.query.TS3TimeoutError: pass else: - print(100 * " " + "\nGot Event | length={0}".format(len(event[0]))) + print(f"* Got Event | length={len(event[0])}") if len(event[0]) > 15: if event[0]["reasonid"] == "0": - print("Client '{}' connected.".format(event[0]["client_nickname"])) + print(f"* Client [{event[0]['client_nickname']}] connected.") # Check if the connector is a ServerQuery or not if not self.isqueryclient(event[0]["client_unique_identifier"]): - print(event[0]) + print(f"* {event[0]}") # Check if the connector is an Admin if self.isadmin(event[0]["client_database_id"]): - self.con.sendtextmessage(targetmode=1, target=event[0]["clid"], msg=self.intro) + self.bot.sendtextmessage(targetmode=1, target=event[0]["clid"], msg=self.intro) else: pass else: @@ -104,39 +112,37 @@ class MyTeamspeakBot: elif len(event[0]) == 6: msg = event[0]["msg"] invkr = event[0]["invokername"] - print('From: "{1}"\nMessage: "{0}"'.format(msg, invkr)) + print(f'* From: "{invkr}"\nMessage: "{msg}"') self.lookupcommand(msg, invkr) - print((100 * " ") + "\n") - def stop(self, invkr): """ """ msg = "I'm out, bye bye!" - self.con.sendtextmessage(targetmode=1, target=invkr, msg=msg) + self.bot.sendtextmessage(targetmode=1, target=invkr, msg=msg) self.running = False def notifyAdmin(self): - clients = self.con.clientlist() + clients = self.bot.clientlist() clients = [client for client in clients if client["client_type"] != "1"] for client in clients: cldbid = client["client_database_id"] clid = client["clid"] if self.isadmin(cldbid): - self.con.sendtextmessage(targetmode=1, target=clid, msg=self.intro) - sleep(1) + self.bot.sendtextmessage(targetmode=1, target=clid, msg=self.intro) + sleep(1) # This can be removed if the Query Client is Whitelisted def kickall(self, msg): """ """ - clients = self.con.clientlist() + clients = self.bot.clientlist() clients = [client["clid"] for client in clients if client["client_type"] != "1"] for clid in clients: try: - self.con.clientpoke(msg=msg, clid=clid) + self.bot.clientpoke(msg=msg, clid=clid) except: pass @@ -150,10 +156,10 @@ class MyTeamspeakBot: # Get the client ids if usr == 'all': - clients = self.con.clientlist() + clients = self.bot.clientlist() clients = [client["clid"] for client in clients if client["client_type"] != "1"] else: - clients = self.con.clientfind(pattern=usr) + clients = self.bot.clientfind(pattern=usr) clients = [client["clid"] for client in clients] # Break, if there's no client. @@ -162,7 +168,7 @@ class MyTeamspeakBot: else: for client in clients: data = self.printable_clientinfo(client) - print(data) + print(f"* {data}") # Nopokeatm # return @@ -171,9 +177,9 @@ class MyTeamspeakBot: i = 0 while num == -1 or i < num: for clid in clients: - print(clid) + print(f"* {clid}") try: - self.con.clientpoke(msg=msg, clid=clid) + self.bot.clientpoke(msg=msg, clid=clid) except: pass sleep(delay) @@ -194,10 +200,10 @@ class MyTeamspeakBot: # print(client[0]) # if client[0]["client_type"] == "1": if cluid == "ServerQuery": - print("ISQUERY: True") + print("* ISQUERY: True") return True else: - print("ISQUERY: False") + print("* ISQUERY: False") return False def isadmin(self, cldbid): @@ -205,18 +211,18 @@ class MyTeamspeakBot: Check if the given client-databaseid is an admin """ - groups = self.con.servergroupsbyclientid(cldbid=cldbid) + groups = self.bot.servergroupsbyclientid(cldbid=cldbid) # [print(group["sgid"]) for group in groups] for group in groups: # 6 Server Admin/ 13 Operator / 15 Root # if (group["sgid"] == "6") or (group["sgid"] == "13") or (group["sgid"] == "15"): if group["sgid"] == "15": - print("ISADMIN: True") + print("* ISADMIN: True") return True else: continue - print("ISADMIN: False") + print("* ISADMIN: False") return False def lookupcommand(self, msg, invkr): @@ -228,8 +234,8 @@ class MyTeamspeakBot: commandstring = msg.split(" ") command = commandstring[0] parameter = commandstring[1:] - print(command) - print(parameter) + print(f"* {command}") + print(f"* {parameter}") if command == "!annoy": try: @@ -238,7 +244,7 @@ class MyTeamspeakBot: self.poke(msg=msg, usr=target) except IndexError: err = "Please use the command like this: !annoy TARGET MESSAGE" - self.con.sendtextmessage(targetmode=1, target=invkr, msg=err) + self.bot.sendtextmessage(targetmode=1, target=invkr, msg=err) pass elif command == "!kickall": @@ -253,12 +259,12 @@ class MyTeamspeakBot: self.poke(msg=msg) except IndexError: err = "Please use the command like this: !pingall MESSAGE" - self.con.sendtextmessage(targetmode=1, target=invkr, msg=err) + self.bot.sendtextmessage(targetmode=1, target=invkr, msg=err) pass else: err = "Unknown Command:[{0}]".format(command) - self.con.sendtextmessage(targetmode=1, target=invkr, msg=err) + self.bot.sendtextmessage(targetmode=1, target=invkr, msg=err) def printable_clientinfo(self, client): """ @@ -266,7 +272,7 @@ class MyTeamspeakBot: """ usrd = {} - info = self.con.clientinfo(clid=client) + info = self.bot.clientinfo(clid=client) temp = info._data[0].split() for t1 in temp: t2 = t1.decode("utf-8") @@ -286,12 +292,12 @@ class MyTeamspeakBot: """ - clients = self.con.clientlist() + clients = self.bot.clientlist() clients_cldbid = [client["client_database_id"] for client in clients if client["client_type"] != "1"] - clients = self.con.clientlist(groups=True) + clients = self.bot.clientlist(groups=True) clients_groups = [client["client_servergroups"] for client in clients if client["client_type"] != "1"] - print(clients_groups) + print(f"* {clients_groups}") # ----------------------------------------------------------------------------------------------------------------------