X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/28d06664efd6959f6d6fef7829808258453921ff..8a9b8a6cd0379efd7b343bceb1fc4feed7347111:/bot.py diff --git a/bot.py b/bot.py index 52e196f..9bf8e0d 100644 --- a/bot.py +++ b/bot.py @@ -3,7 +3,7 @@ # Erebus IRC bot - Author: John Runyon # "Bot" and "BotConnection" classes (handling a specific "arm") -import socket, sys, time, threading, os +import socket, sys, time, threading, os, random from collections import deque #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')} @@ -11,6 +11,7 @@ class Bot(object): def __init__(self, parent, nick, user, bind, authname, authpass, server, port, realname): self.parent = parent self.nick = nick + self.permnick = nick self.user = user self.realname = realname @@ -28,8 +29,17 @@ class Bot(object): self.msgqueue = deque() self.slowmsgqueue = deque() self.makemsgtimer() + 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() + def log(self, *args, **kwargs): + self.parent.log(self.nick, *args, **kwargs) + def connect(self): if self.conn.connect(): self.parent.newfd(self, self.conn.socket.fileno()) @@ -37,18 +47,28 @@ class Bot(object): def getdata(self): return self.conn.read() + def _checknick(self): # check if we're using the right nick, try changing + if self.nick != self.permnick and self.conn.registered(): + self.conn.send("NICK %s" % (self.permnick)) + def parse(self, line): + self.log('I', line) pieces = line.split() - zero = { - 'NOTICE': self._gotregistered, + # dispatch dict + zero = { #things to look for without source + 'NOTICE': self._gotconnected, 'PING': self._gotping, 'ERROR': self._goterror, } - one = { + one = { #things to look for after source '001': self._got001, + '376': self._gotRegistered, + '422': self._gotRegistered, 'PRIVMSG': self._gotprivmsg, - '354': self._got354, + '353': self._got353, #NAMES + '354': self._got354, #WHO + '433': self._got433, #nick in use 'JOIN': self._gotjoin, 'PART': self._gotpart, 'QUIT': self._gotquit, @@ -59,23 +79,37 @@ class Bot(object): if self.parent.hasnumhook(pieces[1]): hooks = self.parent.getnumhook(pieces[1]) for callback in hooks: - callback(self, line) + try: + callback(self, line) + except Exception: + self.__debug_cbexception("numhook", line) if pieces[0] in zero: zero[pieces[0]](pieces) elif pieces[1] in one: one[pieces[1]](pieces) - def _gotregistered(self, pieces): + def _gotconnected(self, pieces): if not self.conn.registered(): self.conn.register() def _gotping(self, pieces): self.conn.send("PONG %s" % (pieces[1])) - def _goterror(self, pieces): #TODO handle better + self._checknick() + def _goterror(self, pieces): #TODO handle more gracefully + curs = self.parent.db.cursor() + curs.execute("UPDATE bots SET connected = 0") + curs.close() sys.exit(2) os._exit(2) def _got001(self, pieces): + pass # wait until the end of MOTD instead + 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() + self.conn.send("MODE %s +x" % (pieces[2])) if self.authname is not None and self.authpass is not None: self.conn.send("AUTH %s %s" % (self.authname, self.authpass)) @@ -87,15 +121,53 @@ class Bot(object): target = pieces[2] msg = ' '.join(pieces[3:])[1:] self.parsemsg(user, target, msg) + def _got353(self, pieces): + chan = self.parent.channel(pieces[4]) + names = pieces[5:] + names[0] = names[0][1:] #remove colon + for n in names: + user = self.parent.user(n.lstrip('@+')) + if n[0] == '@': + chan.userjoin(user, 'op') + elif n[0] == '+': + chan.userjoin(user, 'voice') + else: + chan.userjoin(user) + user.join(chan) def _got354(self, pieces): - qt, nick, auth = pieces[3:6] - self.parent.user(nick).authed(auth) + qt = int(pieces[3]) + if qt < 3: + nick, auth = pieces[4:6] + chan = None + else: + chan, nick, auth = pieces[4:7] + chan = self.parent.channel(chan) + user = self.parent.user(nick) + user.authed(auth) + + if chan is not None: + user.join(chan) + chan.userjoin(user) + + if qt == 2: # triggered by !auth + if user.isauthed(): + if user.glevel > 0: + self.msg(nick, "You are now known as #%s (access level: %s)" % (auth, user.glevel)) + else: + self.msg(nick, "You are now known as #%s (not staff)" % (auth)) + else: + self.msg(nick, "I tried, but you're not authed!") + def _got433(self, pieces): + if not self.conn.registered(): #we're trying to connect + newnick = "%s%d" % (self.nick, random.randint(111,999)) + self.conn.send("NICK %s" % (newnick)) + self.nick = newnick def _gotjoin(self, pieces): nick = pieces[0].split('!')[0][1:] chan = self.parent.channel(pieces[2]) if nick == self.nick: - self.conn.send("WHO %s c%%ant,1" % (chan)) + self.conn.send("WHO %s c%%cant,3" % (chan)) else: user = self.parent.user(nick, justjoined=True) chan.userjoin(user) @@ -105,11 +177,16 @@ class Bot(object): chan = self.parent.channel(pieces[2]) if nick != self.nick: - self.parent.user(nick).part(chan) + gone = self.parent.user(nick).part(chan) chan.userpart(self.parent.user(nick)) + if gone: + self.parent.user(nick).quit() + del self.parent.users[nick.lower()] def _gotquit(self, pieces): nick = pieces[0].split('!')[0][1:] if nick != self.nick: + for chan in self.parent.user(nick).chans: + chan.userpart(self.parent.user(nick)) self.parent.user(nick).quit() del self.parent.users[nick.lower()] def _gotnick(self, pieces): @@ -119,15 +196,37 @@ class Bot(object): self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()] del self.parent.users[oldnick.lower()] self.parent.users[newnick.lower()].nickchange(newnick) - def _gotmode(self, pieces): #TODO parse for ops/voices (at least) - pass - - - def __debug_cbexception(self, *args): + def _gotmode(self, pieces): + source = pieces[0].split('!')[0][1:] + chan = self.parent.channel(pieces[2]) + mode = pieces[3] + args = pieces[4:] + + adding = True + for c in mode: + if c == '+': + adding = True + elif c == '-': + adding = False + elif c == 'o': + if adding: + chan.userop(self.parent.user(args.pop(0))) + else: + chan.userdeop(self.parent.user(args.pop(0))) + elif c == 'v': + if adding: + chan.uservoice(self.parent.user(args.pop(0))) + else: + chan.userdevoice(self.parent.user(args.pop(0))) + else: + 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: - self.conn.send("PRIVMSG DimeCadmium :%09.3f ^C4^B!!!^B^C CBEXC" % (time.time() % 100000)) - print "%09.3f %s [!] CBEXC %r" % (time.time() % 100000, self.nick, args) + 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)) +# print "%09.3f %s [!] CBEXC %s %r %r" % (time.time() % 100000, self.nick, source, args, kwargs) def parsemsg(self, user, target, msg): @@ -164,10 +263,11 @@ class Bot(object): for callback in self.parent.getchanhook(target.lower()): try: cbret = callback(self, user, chan, *pieces) - if cbret is NotImplemented: self.msg(user, "Command not implemented.") + except NotImplementedError: + self.msg(user, "Command not implemented.") except: self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000)) - self.__debug_cbexception("chanhook", user, target, msg) + self.__debug_cbexception("chanhook", user=user, target=target, msg=msg) return # not to bot, don't process! except IndexError: return # "message" is empty @@ -181,34 +281,47 @@ class Bot(object): elif user.glevel >= callback.reqglevel and (not callback.needchan or chan.levelof(user.auth) >= callback.reqclevel): try: cbret = callback(self, user, chan, target, *pieces[1:]) - if cbret is NotImplemented: self.msg(user, "Command not implemented.") + except NotImplementedError: + self.msg(user, "Command not implemented.") except Exception: self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000)) - self.__debug_cbexception("hook", user, target, msg) + 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() + raise e + else: + self.msg(user, "I don't know that command.") def __debug_nomsg(self, target, msg): if int(self.parent.cfg.get('debug', 'nomsg', default=0)) == 1: - self.conn.send("PRIVMSG DimeCadmium :%09.3f 4!!! NOMSG %r, %r" % (time.time() % 100000, target, msg)) - print "%09.3f %s [!] %s" % (time.time() % 100000, self.nick, "!!! 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 target is None or msg is None: - return self.__debug_nomsg(target, msg) - - self.msgqueue.append((target, msg)) - if not self.msgtimer.is_alive(): - self.msgtimer.start() + cmd = self._formatmsg(target, msg) + 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 def slowmsg(self, target, msg): - if target is None or msg is None: - return self.__debug_nomsg(target, msg) - - self.slowmsgqueue.append((target, msg)) - if not self.msgtimer.is_alive(): - self.msgtimer.start() + cmd = self._formatmsg(target, msg) + 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 def fastmsg(self, target, msg): + self.conn.send(self._formatmsg(target, msg)) + self.conn.exceeded = True + + def _formatmsg(self, target, msg): if target is None or msg is None: return self.__debug_nomsg(target, msg) @@ -217,23 +330,32 @@ class Bot(object): if target[0] == '#': command = "PRIVMSG %s :%s" % (target, msg) else: command = "NOTICE %s :%s" % (target, msg) - self.conn.send(command) + return command def _popmsg(self): self.makemsgtimer() + self.conn.bytessent -= self.conn.recvq/3 + if self.conn.bytessent < 0: self.conn.bytessent = 0 + self.conn.exceeded = False try: - self.fastmsg(*self.msgqueue.popleft()) - self.msgtimer.start() + cmd = self.msgqueue.popleft() + if not self.conn.exceeded and self.conn.bytessent+len(cmd) < self.conn.recvq: + self.conn.send(cmd) + self.conn.exceeded = True + else: raise IndexError except IndexError: try: - self.fastmsg(*self.slowmsgqueue.popleft()) - self.msgtimer.start() + cmd = self.slowmsgqueue.popleft() + if not self.conn.exceeded and self.conn.bytessent+len(cmd) < self.conn.recvq: + self.conn.send(cmd) + self.conn.exceeded = True except IndexError: pass + self.msgtimer.start() def makemsgtimer(self): - self.msgtimer = threading.Timer(2, self._popmsg) + self.msgtimer = threading.Timer(3, self._popmsg) self.msgtimer.daemon = True def join(self, chan): @@ -260,6 +382,10 @@ class BotConnection(object): self.state = 0 # 0=disconnected, 1=registering, 2=connected + self.bytessent = 0 + self.recvq = 500 + self.exceeded = False + def connect(self): self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.socket.bind((self.bind, 0)) @@ -277,7 +403,9 @@ class BotConnection(object): return self.state == 2 def send(self, line): - print "%09.3f %s [O] %s" % (time.time() % 100000, self.parent.nick, line) + 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) def _write(self, line): @@ -289,8 +417,8 @@ class BotConnection(object): while "\r\n" in self.buffer: pieces = self.buffer.split("\r\n", 1) - print "%09.3f %s [I] %s" % (time.time() % 100000, self.parent.nick, pieces[0]) -# print (time.time() % 1460000000), self.parent.nick, '[I]', pieces[0] +# self.parent.log('I', pieces[0]) # replaced by statement in Bot.parse() +# print "%09.3f %s [I] %s" % (time.time() % 100000, self.parent.nick, pieces[0]) lines.append(pieces[0]) self.buffer = pieces[1]