From 17622573e4d8c5237576857867a62f3f80ce28d9 Mon Sep 17 00:00:00 2001 From: Adam Roe Date: Wed, 19 Jul 2023 17:43:27 +1000 Subject: [PATCH] 80-column oopsie --- mssql.py | 117 ++++++++++++++++--------------------------------------- 1 file changed, 33 insertions(+), 84 deletions(-) diff --git a/mssql.py b/mssql.py index 6a6ccd0..dd163f8 100644 --- a/mssql.py +++ b/mssql.py @@ -8,8 +8,7 @@ from contextlib import closing class mssql(znc.Module): module_types = [znc.CModInfo.GlobalModule] - description = "Log all channels to a Microsoft SQL Server -database" + description = "Log all channels to a Microsoft SQL Server database" has_args = False sql_server = "db.spd.internal" @@ -22,33 +21,23 @@ database" # return True def OnOp(self, user, target_user, channel, noChange): - self.insert("OP", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), -target_user.GetNick(), None, str(self.GetNetwork())) + self.insert("OP", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), target_user.GetNick(), None, str(self.GetNetwork())) return True def OnPrivNotice(self, user, message): - self.insert("NOTICE", None, user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), None, message.s, -str(self.GetNetwork())) + self.insert("NOTICE", None, user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), None, message.s, str(self.GetNetwork())) return True def OnDeop(self, user, target_user, channel, noChange): - self.insert("DEOP", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), -target_user.GetNick(), None, str(self.GetNetwork())) + self.insert("DEOP", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), target_user.GetNick(), None, str(self.GetNetwork())) return True def OnVoice(self, user, target_user, channel, noChange): - self.insert("VOICE", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), -target_user.GetNick(), None, str(self.GetNetwork())) + self.insert("VOICE", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), target_user.GetNick(), None, str(self.GetNetwork())) return True def OnDevoice(self, user, target_user, channel, noChange): - self.insert("DEVOICE", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), -target_user.GetNick(), None, str(self.GetNetwork())) + self.insert("DEVOICE", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), target_user.GetNick(), None, str(self.GetNetwork())) return True def OnMode(self, user, channel, mode, argument, added, noChange): @@ -58,44 +47,31 @@ target_user.GetNick(), None, str(self.GetNetwork())) code = "BAN" if added else "UNBAN" else: sign = "+" if added else "-" - argument = "{0}{1} {2}".format(sign, mode, -argument) + argument = "{0}{1} {2}".format(sign, mode, argument) - self.insert(code, channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), None, argument, -str(self.GetNetwork())) + self.insert(code, channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), None, argument, str(self.GetNetwork())) return True def OnQuit(self, user, message, channels): for channel in channels: - self.insert("QUIT", channel.GetName(), -user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), -None, message, str(self.GetNetwork())) + self.insert("QUIT", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), None, message, str(self.GetNetwork())) return True def OnNick(self, user, new_nick, channels): for channel in channels: - self.insert("NICK", channel.GetName(), -user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), -new_nick, None, str(self.GetNetwork())) + self.insert("NICK", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), new_nick, None, str(self.GetNetwork())) return True def OnKick(self, user, target_nick, channel, message): - self.insert("KICK", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), target_nick, -message, str(self.GetNetwork())) + self.insert("KICK", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), target_nick, message, str(self.GetNetwork())) return True def OnJoin(self, user, channel): - self.insert("JOIN", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), None, None, -str(self.GetNetwork())) + self.insert("JOIN", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), None, None, str(self.GetNetwork())) return True def OnPart(self, user, channel, message): - self.insert("PART", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), None, message, -str(self.GetNetwork())) + self.insert("PART", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), None, message, str(self.GetNetwork())) return True def OnUserAction (self, target, message): @@ -105,9 +81,7 @@ str(self.GetNetwork())) return self.OnChanAction(user, channel, message) def OnPrivMsg(self, nick, message): - self.insert("MSG", "", nick.GetHost(), nick.GetNick(), -nick.GetIdent(), None, datetime.now(), None, message.s, -str(self.GetNetwork())) + self.insert("MSG", "", nick.GetHost(), nick.GetNick(), nick.GetIdent(), None, datetime.now(), None, message.s, str(self.GetNetwork())) return True def OnUserMsg (self, target, message): @@ -117,21 +91,15 @@ str(self.GetNetwork())) return self.OnChanMsg(user, channel, message) def OnChanAction(self, user, channel, message): - self.insert("ME", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), None, message.s, -str(self.GetNetwork())) + self.insert("ME", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), None, message.s, str(self.GetNetwork())) return True def OnChanMsg(self, user, channel, message): - self.insert("SAY", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), self.findMode(channel, user), -datetime.now(), None, message.s, str(self.GetNetwork())) + self.insert("SAY", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), self.findMode(channel, user), datetime.now(), None, message.s, str(self.GetNetwork())) return True def OnTopic(self, user, channel, message): - self.insert("TOPIC", channel.GetName(), user.GetHost(), -user.GetNick(), user.GetIdent(), None, datetime.now(), None, message.s, -str(self.GetNetwork())) + self.insert("TOPIC", channel.GetName(), user.GetHost(), user.GetNick(), user.GetIdent(), None, datetime.now(), None, message.s, str(self.GetNetwork())) return True # def OnLoad(self, args, message): @@ -170,29 +138,24 @@ str(self.GetNetwork())) assert int(data[find]) while True: assert int(data[find]) - data = data[0:find] + -data[find+1:] + data = data[0:find] + data[find+1:] except: if not done: if data[find] != ',': done = True - if (not done) and (len(data) > find+1) and -(data[find] == ','): + if (not done) and (len(data) > find+1) and (data[find] == ','): try: assert not done assert int(data[find+1]) - data = data[0:find] + -data[find+1:] - data = data[0:find] + -data[find+1:] + data = data[0:find] + data[find+1:] + data = data[0:find] + data[find+1:] except: done = True try: assert not done while True: assert int(data[find]) - data = data[0:find] + -data[find+1:] + data = data[0:find] + data[find+1:] except: pass find = data.find('\x03') @@ -203,39 +166,25 @@ data[find+1:] data = data.replace('\x0f','') return data - def insert(self, code, channel, host, user, ident, user_mode, -date, target_user, message, network): + def insert(self, code, channel, host, user, ident, user_mode, date, target_user, message, network): # self.PutModule("Inserting row...") - regex = -re.compile("\x1f|\x02|\x03(?:\d{1,2}(?:,\d{1,2})?)?", re.UNICODE) + regex = re.compile("\x1f|\x02|\x03(?:\d{1,2}(?:,\d{1,2})?)?", re.UNICODE) try: - with closing(pymssql.connect ("db.spd.internal", -"_srv_znc", "znc", "znc")) as conn: + with closing(pymssql.connect ("db.spd.internal", "_srv_znc", "znc", "znc")) as conn: with closing(conn.cursor()) as cursor: -# sql = "INSERT INTO log (date, -code, network, channel, host, [user], ident, mode, target, message) -VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" - sql = "EXEC dbo.add_log (?, ?, ?, -?, ?, ?, ?, ?, ?, ?, ?)" +# sql = "INSERT INTO log (date, code, network, channel, host, [user], ident, mode, target, message) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" + sql = "EXEC dbo.add_log (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" if message is not None: -# message = -message.encode('utf-8').decode('utf-8', 'replace') - message = regex.sub("", -message) - message = -self.colourstrip(message) - znc_user = -self.GetUser().GetUserName() if self.GetUser() is not None else None - params = (znc_user, str(date), -code, network, channel, host, user, ident, user_mode, target_user, -message) +# message = message.encode('utf-8').decode('utf-8', 'replace') + message = regex.sub("", message) + message = self.colourstrip(message) + znc_user = self.GetUser().GetUserName() if self.GetUser() is not None else None + params = (znc_user, str(date), code, network, channel, host, user, ident, user_mode, target_user, message) # cursor.execute (sql, params) cursor.callproc("add_log", params) conn.commit() conn.close() except Exception as e: - self.PutModule("Could not save {0} to database -caused by: {1} - {2}".format(code, type(e), str(e))) - + self.PutModule("Could not save {0} to database caused by: {1} - {2}".format(code, type(e), str(e))) \ No newline at end of file