Fixed example config

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index ab97605ee52f16bcb91d0f611cd5eff6e76e8eb5..0f2c7e6e782541d35ed09c3438cb30fbb084c4fd 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -71,12 +71,12 @@ 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)
                        
@@ -111,7 +111,9 @@ class Bot(object):
                                return
                        if user.glevel >= callback.reqglevel:
                                #TODO TODO TODO check reqclevel
-                               callback(self, user, chan, target, *pieces[1:])
+                               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.")