X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/5477b368b6f982ae96db41d62bbd3ce7abbc9d5d..c36dc312da84cafe38b70155803f60158fdf4915:/bot.py

diff --git a/bot.py b/bot.py
index ab97605..0f2c7e6 100644
--- 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.")