X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/d6c6516c3f92d1d03bc119d0dce3cf11903bbbd3..c6880712495b23e15b6fdbee48368322856a9e95:/bot.py diff --git a/bot.py b/bot.py index 11b7ac5..1697972 100644 --- a/bot.py +++ b/bot.py @@ -6,6 +6,8 @@ import socket, sys, time, threading, os, random from collections import deque +MAXLEN = 400 # arbitrary max length of a command generated by Bot.msg functions + class MyTimer(threading._Timer): def __init__(self, *args, **kwargs): threading._Timer.__init__(self, *args, **kwargs) @@ -24,8 +26,8 @@ class Bot(object): self.authname = authname self.authpass = authpass - curs = self.parent.db.cursor() - if curs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,)): + curs = self.parent.query("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,)) + if curs: chansres = curs.fetchall() curs.close() self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres] @@ -43,14 +45,15 @@ class Bot(object): self.msgtimer.start() def __del__(self): - curs = self.parent.db.cursor() - curs.execute("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,)) - curs.close() + try: + curs = self.parent.query("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,)) + curs.close() + except: pass def watchdog(self): - if time.time() > self.parent.cfg.get('watchdog', 'maxtime', default=300)+self.lastreceived: + if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=300))+self.lastreceived: self.parse("ERROR :Fake-error from watchdog timer.") - self.watchdogtimer = MyTimer(self.parent.cfg.get('watchdog', 'interval', default=30), self.watchdog) + self.watchdogtimer = MyTimer(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog) def log(self, *args, **kwargs): self.parent.log(self.nick, *args, **kwargs) @@ -68,7 +71,8 @@ class Bot(object): self.conn.send("NICK %s" % (self.permnick)) def parse(self, line): - self.log('I', line) + if self.parent.cfg.getboolean('debug', 'io'): + self.log('I', line) pieces = line.split() # dispatch dict @@ -113,11 +117,11 @@ class Bot(object): self.conn.send("PONG %s" % (pieces[1])) self._checknick() def _goterror(self, pieces): - try: self.quit("Error detected: %s" % ' '.join(pieces)) + try: + self.quit("Error detected: %s" % ' '.join(pieces)) + curs = self.parent.query("UPDATE bots SET connected = 0") + curs.close() except: pass - curs = self.parent.db.cursor() - curs.execute("UPDATE bots SET connected = 0") - curs.close() sys.exit(2) os._exit(2) def _got001(self, pieces): @@ -125,9 +129,8 @@ class Bot(object): def _gotRegistered(self, pieces): self.conn.registered(True) - curs = self.parent.db.cursor() - curs.execute("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,)) - curs.close() + curs = self.parent.query("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,)) + if curs: curs.close() self.conn.send("MODE %s +x" % (pieces[2])) if self.authname is not None and self.authpass is not None: @@ -222,6 +225,8 @@ class Bot(object): self.parent.users[newnick.lower()].nickchange(newnick) def _gotmode(self, pieces): source = pieces[0].split('!')[0][1:] + chan = pieces[2] + if not chan.startswith("#"): return chan = self.parent.channel(pieces[2]) mode = pieces[3] args = pieces[4:] @@ -246,7 +251,7 @@ class Bot(object): pass # don't care about other modes def __debug_cbexception(self, source, *args, **kwargs): - if int(self.parent.cfg.get('debug', 'cbexc', default=0)) == 1: + if self.parent.cfg.getboolean('debug', 'cbexc'): self.conn.send("PRIVMSG %s :%09.3f 4!!! CBEXC %s" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, source)) __import__('traceback').print_exc() self.log('!', "CBEXC %s %r %r" % (source, args, kwargs)) @@ -320,9 +325,10 @@ class Bot(object): self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000)) self.__debug_cbexception("hook", user=user, target=target, msg=msg) except SystemExit as e: - curs = self.parent.db.cursor() - curs.execute("UPDATE bots SET connected = 0") - curs.close() + try: + curs = self.parent.query("UPDATE bots SET connected = 0") + curs.close() + except: pass raise e else: rancmd = True @@ -331,31 +337,40 @@ class Bot(object): self.msg(user, "You don't have enough access to run that command.") def __debug_nomsg(self, target, msg): - if int(self.parent.cfg.get('debug', 'nomsg', default=0)) == 1: + if self.parent.cfg.getboolean('debug', 'nomsg'): self.conn.send("PRIVMSG %s :%09.3f 4!!! NOMSG %r, %r" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, target, msg)) self.log('!', "!!! NOMSG") # print "%09.3f %s [!] %s" % (time.time() % 100000, self.nick, "!!! NOMSG") __import__('traceback').print_stack() def msg(self, target, msg): + if self.parent.cfg.getboolean('erebus', 'nofakelag'): return self.fastmsg(target, msg) cmd = self._formatmsg(target, msg) + if len(cmd) > MAXLEN: return False if self.conn.exceeded or self.conn.bytessent+len(cmd) >= self.conn.recvq: self.msgqueue.append(cmd) else: self.conn.send(cmd) self.conn.exceeded = True + return True def slowmsg(self, target, msg): + if self.parent.cfg.getboolean('erebus', 'nofakelag'): return self.fastmsg(target, msg) cmd = self._formatmsg(target, msg) + if len(cmd) > MAXLEN: return False if self.conn.exceeded or self.conn.bytessent+len(cmd) >= self.conn.recvq: self.slowmsgqueue.append(cmd) else: self.conn.send(cmd) self.conn.exceeded = True + return True def fastmsg(self, target, msg): - self.conn.send(self._formatmsg(target, msg)) + cmd = self._formatmsg(target, msg) + if len(cmd) > MAXLEN: return False + self.conn.send(cmd) self.conn.exceeded = True + return True def _formatmsg(self, target, msg): if target is None or msg is None: @@ -439,7 +454,8 @@ class BotConnection(object): return self.state == 2 def send(self, line): - self.parent.log('O', line) + if self.parent.parent.cfg.getboolean('debug', 'io'): + self.parent.log('O', line) # print "%09.3f %s [O] %s" % (time.time() % 100000, self.parent.nick, line) self.bytessent += len(line) self._write(line)