X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/04638dadff44f10f318b367469b539920441452d..36411de919ae2db1ff5b5376e11739c464cec7ae:/bot.py diff --git a/bot.py b/bot.py index 55c205d..5f9f26f 100644 --- a/bot.py +++ b/bot.py @@ -3,35 +3,24 @@ # Erebus IRC bot - Author: John Runyon # "Bot" and "BotConnection" classes (handling a specific "arm") -#TODO: error checking - import socket, sys #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')} class Bot(object): - def __init__(self, parent, nick, user, bind, server, port, realname): + def __init__(self, parent, nick, user, bind, authname, authpass, server, port, realname): self.parent = parent self.nick = nick self.user = user self.realname = realname - self.chans = [] - - chcurs = self.parent.db.cursor() - chcurs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,)) - chans = chcurs.fetchall() - chcurs.close() + self.authname = authname + self.authpass = authpass - for chrow in chans: - uscurs = self.parent.db.cursor() - uscurs.execute("SELECT user, level FROM chusers WHERE chan = %s", (chrow['chname'],)) - usrow = uscurs.fetchone() - levels = {} - while usrow is not None: - levels[usrow['user']] = -usrow['level'] - usrow = uscurs.fetchone() - uscurs.close() - self.chans.append(self.parent.newchannel(self, chrow['chname'], levels)) + curs = self.parent.db.cursor() + if curs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,)): + chansres = curs.fetchall() + curs.close() + self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres] self.conn = BotConnection(self, bind, server, port) def connect(self): @@ -55,6 +44,9 @@ class Bot(object): if pieces[1] == "001": self.conn.registered(True) + 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)) for c in self.chans: self.join(c.name) @@ -72,41 +64,82 @@ class Bot(object): qt = pieces[3] nick = pieces[4] auth = pieces[5] - if auth != '0': - self.parent.user(nick).authed(auth) + self.parent.user(nick).authed(auth) elif pieces[1] == "JOIN": nick = pieces[0].split('!')[0][1:] chan = self.parent.channel(pieces[2]) if nick == self.nick: - self.conn.send("WHO %s %%ant,1" % (chan)) + self.conn.send("WHO %s c%%ant,1" % (chan)) else: user = self.parent.user(nick, justjoined=True) chan.userjoin(user) user.join(chan) + + elif pieces[1] == "PART": + nick = pieces[0].split('!')[0][1:] + chan = self.parent.channel(pieces[2]) + if nick != self.nick: + self.parent.user(nick).part(chan) + chan.userpart(self.parent.user(nick)) + + elif pieces[1] == "QUIT": + nick = pieces[0].split('!')[0][1:] + if nick != self.nick: + self.parent.user(nick).quit() + del self.parent.users[nick.lower()] + + elif pieces[1] == "NICK": + oldnick = pieces[0].split('!')[0][1:] + newnick = pieces[2][1:] + self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()] + del self.parent.users[oldnick.lower()] + self.parent.user(newnick).nick(newnick) + + elif pieces[1] == "MODE": #TODO parse for ops/voices (at least) + pass + + def parsemsg(self, user, target, msg): chan = None + if len(msg) == 0: + return + triggerused = msg[0] == self.parent.trigger if triggerused: msg = msg[1:] pieces = msg.split() if target == self.nick: + if msg[0] == "\001": #ctcp + msg = msg.strip("\001") + if msg == "VERSION": + self.msg(user, "\001VERSION Erebus v%d.%d - http://github.com/zonidjan/erebus" % (self.parent.APIVERSION, self.parent.RELEASE)) + return if len(pieces) > 1: chanword = pieces[1] if chanword[0] == '#': chan = self.parent.channel(chanword) - pieces.pop(1) + if chan is not None: #if chan is still none, there's no bot on "chanword", and chanword is used as a parameter. + pieces.pop(1) else: # message was sent to a channel - chan = self.parent.channel(target) #TODO check if bot's on channel --- in Erebus.channel() maybe? - if msg[0] == '*': # message may be addressed to bot by "*BOTNICK" trigger? - if pieces[0][1:].lower() == self.nick.lower(): - pieces.pop(0) # command actually starts with next word - msg = ' '.join(pieces) # command actually starts with next word - elif not triggerused: - return # not to bot, don't process! + chan = self.parent.channel(target) + try: + if msg[0] == '*': # message may be addressed to bot by "*BOTNICK" trigger? + if pieces[0][1:].lower() == self.nick.lower(): + pieces.pop(0) # command actually starts with next word + msg = ' '.join(pieces) # command actually starts with next word + elif not triggerused: + if self.parent.haschanhook(target.lower()): + for callback in self.parent.getchanhook(target.lower()): + cbret = callback(self, user, chan, *pieces) + if cbret is NotImplemented: + self.msg(user, "Command not implemented.") + return # not to bot, don't process! + except IndexError: + return # "message" is empty cmd = pieces[0].lower() @@ -114,17 +147,14 @@ class Bot(object): for callback in self.parent.gethook(cmd): if chan is None and callback.needchan: self.msg(user, "You need to specify a channel for that command.") - continue - if user.glevel >= callback.reqglevel: - #TODO TODO TODO check reqclevel + elif user.glevel >= callback.reqglevel and (not callback.needchan or chan.levelof(user.auth) >= callback.reqclevel): cbret = callback(self, user, chan, target, *pieces[1:]) if cbret is NotImplemented: self.msg(user, "Command not implemented.") - continue - - self.msg(user, "No such command, or you don't have access.") def msg(self, target, msg): + if target is None or msg is None: return + if isinstance(target, self.parent.User): self.conn.send("NOTICE %s :%s" % (target.nick, msg)) elif isinstance(target, self.parent.Channel): self.conn.send("PRIVMSG %s :%s" % (target.name, msg)) elif isinstance(target, basestring): @@ -174,7 +204,7 @@ class BotConnection(object): #TODO: rewrite send() to queue def send(self, line): - print self.parent.nick, '[O]', line + print self.parent.nick, '[O]', str(line) self.write(line) def write(self, line):