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

diff --git a/bot.py b/bot.py
index ab97605..09df1db 100644
--- 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,12 +77,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)
 			
@@ -105,16 +111,18 @@ class Bot(object):
 		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))