#!/usr/bin/python
-# -*- coding: latin-1 -*-
# Erebus IRC bot - Author: John Runyon
# "Bot" and "BotConnection" classes (handling a specific "arm")
self.user = user
self.realname = realname
- self.chans = []
+ curs = self.parent.db.cursor()
+ curs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,))
+ chansres = curs.fetchall()
+ curs.close()
- chcurs = self.parent.db.cursor()
- chcurs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,))
- chans = chcurs.fetchall()
- chcurs.close()
-
- 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))
+ self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres]
self.conn = BotConnection(self, bind, server, port)
def connect(self):
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:]
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?
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
- else:
- 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):