X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/32cabc3d9b1e7cc05b0c2c7f8519e137053ac66b..ea3909b57e527c81e9a0b8eea98ab92e026a99d5:/bot.py

diff --git a/bot.py b/bot.py
index 0f2c7e6..2a4dd14 100644
--- a/bot.py
+++ b/bot.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: latin-1 -*-
 
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
@@ -45,9 +46,15 @@ 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.name)
@@ -82,6 +89,9 @@ class Bot(object):
 			
 	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()
@@ -95,28 +105,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
-				cbret = callback(self, user, chan, target, *pieces[1:])
-				if cbret is NotImplemented:
-					self.msg(user, "Command not implemented.")
-				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))
@@ -168,7 +181,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):