Spotify module added

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index ab97605ee52f16bcb91d0f611cd5eff6e76e8eb5..94a12abfe67d63d33b814d6cf09ccc13dd78106b 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)
@@ -71,18 +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:
+                               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()
 
@@ -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))