change try-except around msg[0] to if len(msg)==0

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 603b966dd1356c4f9a6c5937dc56a60f4ca8bddc..7a4cb378583eff9344dc464bc7b767e8fd8fdae9 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -45,9 +45,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 +88,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,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))