move stuff around

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 83eb76fc4364be5730a953d0150b35cb45cabb6e..ca7dc37e6f7a1ad13eed7897d9a6ee1dae6976cb 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -67,12 +67,30 @@ class Bot(object):
                        chan = self.parent.channel(pieces[2])
 
                        if nick == self.nick:
-                               self.conn.send("WHO %s %%ant,1" % (chan))
+                               self.conn.send("WHO %s c%%ant,1" % (chan))
                        else:
                                user = self.parent.user(nick, justjoined=True)
                                chan.userjoin(user)
                                user.join(chan)
+
+               elif pieces[1] == "PART":
+                       nick = pieces[0].split('!')[0][1:]
+                       chan = self.parent.channel(pieces[2])
                        
+                       if nick != self.nick:
+                               self.parent.user(nick).part(chan)
+                               chan.userpart(self.parent.user(nick))
+
+               elif pieces[1] == "QUIT":
+                       nick = pieces[0].split('!')[0][1:]
+                       if nick != self.nick:
+                               self.parent.user(nick).quit()
+                               del self.parent.users[nick.lower()]
+
+               elif pieces[1] == "MODE": #TODO
+                       pass
+
+       
        def parsemsg(self, user, target, msg):
                chan = None
                if len(msg) == 0:
@@ -83,6 +101,11 @@ class Bot(object):
                pieces = msg.split()
 
                if target == self.nick:
+                       if msg[0] == "\001": #ctcp
+                               msg = msg.strip("\001")
+                               if msg == "VERSION":
+                                       self.msg(user, "\001VERSION Erebus v%d.%d - http://github.com/zonidjan/erebus" % (self.parent.APIVERSION, self.parent.RELEASE))
+                               return
                        if len(pieces) > 1:
                                chanword = pieces[1]
                                if chanword[0] == '#':
@@ -98,15 +121,14 @@ class Bot(object):
                                                pieces.pop(0) # command actually starts with next word
                                                msg = ' '.join(pieces) # command actually starts with next word
                                elif not triggerused:
-                                       if self.parents.haschanhook(target.lower()):
+                                       if self.parent.haschanhook(target.lower()):
                                                for callback in self.parent.getchanhook(target.lower()):
-                                                       cbret = callback(self, user, chan, *pieces[1:])
+                                                       cbret = callback(self, user, chan, *pieces)
                                                        if cbret is NotImplemented:
                                                                self.msg(user, "Command not implemented.")
-                                       else:
-                                               return # not to bot, don't process!
+                                       return # not to bot, don't process!
                        except IndexError:
-                               return # Fix if you feel like it /BiohZn
+                               return # "message" is empty
 
                cmd = pieces[0].lower()