X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/711444b7208fb207eeeb277a9bcfab60232e876f..d776b529c75cb428b7c682fa426e5146c45271eb:/bot.py

diff --git a/bot.py b/bot.py
index e468dc1..94a12ab 100644
--- a/bot.py
+++ b/bot.py
@@ -9,12 +9,29 @@ 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, chans):
+	def __init__(self, parent, nick, user, bind, server, port, realname):
 		self.parent = parent
 		self.nick = nick
 		self.user = user
 		self.realname = realname
-		self.chans = chans
+
+		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()
+
+		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.conn = BotConnection(self, bind, server, port)
 	def connect(self):
@@ -28,12 +45,18 @@ class Bot(object):
 		pieces = line.split()
 
 		if not self.conn.registered() and pieces[0] == "NOTICE":
-				self.conn.register()
+			self.conn.register()
+			return
 
-		elif pieces[1] == "001":
+		if self.parent.hasnumhook(pieces[1]):
+			hooks = self.parent.getnumhook(pieces[1])
+			for callback in hooks:
+				callback(self, line)
+
+		if pieces[1] == "001":
 			self.conn.registered(True)
 			for c in self.chans:
-				self.join(c)
+				self.join(c.name)
 
 		elif pieces[1] == "PRIVMSG":
 			nick = pieces[0].split('!')[0][1:]
@@ -54,17 +77,21 @@ class Bot(object):
 
 		elif pieces[1] == "JOIN":
 			nick = pieces[0].split('!')[0][1:]
-			user = self.parent.user(nick)
 			chan = self.parent.channel(pieces[2])
 
 			if nick == self.nick:
 				self.conn.send("WHO %s %%ant,1" % (chan))
 			else:
-				pass #TODO TODO TODO add to common chans!
+				user = self.parent.user(nick, justjoined=True)
+				chan.userjoin(user)
+				user.join(chan)
 			
 	def parsemsg(self, user, target, msg):
 		chan = None
-		triggerused = msg[0] == self.parent.trigger
+		try:
+			triggerused = msg[0] == self.parent.trigger
+		except IndexError: # Fix if you feel like it /BiohZn
+			triggerused = False
 		if triggerused: msg = msg[1:]
 		pieces = msg.split()
 
@@ -77,26 +104,31 @@ class Bot(object):
 
 		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!
+			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:
+					return # not to bot, don't process!
+			except IndexError:
+				return # Fix if you feel like it /BiohZn
 
 		cmd = pieces[0].lower()
 
 		if self.parent.hashook(cmd):
-			callback = self.parent.gethook(cmd)
-			if chan is None and callback.needchan:
-				self.msg(user, "You need to specify a channel for that command.")
-				return
-			if user.glevel >= callback.reqglevel:
-				#TODO TODO TODO check reqclevel
-				callback(self, user, chan, target, *pieces[1:])
-				return
-
-		self.msg(user, "No such command, or you don't have access.")
+			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
+					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 isinstance(target, self.parent.User): self.conn.send("NOTICE %s :%s" % (target.nick, msg))