X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/d431e54309841dcdb50d440e440234200d0de2fc..dafa38fceae67f73ff998588c49e23294f98864b:/modlib.py

diff --git a/modlib.py b/modlib.py
index 717406a..7e9a742 100644
--- a/modlib.py
+++ b/modlib.py
@@ -21,18 +21,19 @@ class modlib(object):
 	ANYONE = -1
 
 	# (channel) access levels
-	OWNER = -10
-	MASTER = -8 #master is {-8,-9}
-	OP = -5 #op is {-5,-6,-7}
-	VOICE = -4
-	KNOWN = -3
-	PUBLIC = -2 #anyone (use glevel to control auth-needed)
+	OWNER = 5
+	MASTER = 4
+	OP = 3
+	VOICE = 2
+	KNOWN = 1
+	PUBLIC = 0 #anyone (use glevel to control auth-needed)
 
 	# messages
 	WRONGARGS = "Wrong number of arguments."
 
 	def __init__(self, name):
 		self.hooks = {}
+		self.numhooks = {}
 		self.parent = None
 
 		self.name = name
@@ -41,12 +42,24 @@ class modlib(object):
 		self.parent = parent
 		for cmd, func in self.hooks.iteritems():
 			self.parent.hook(cmd, func)
+		for num, func in self.numhooks.iteritems():
+			self.parent.hooknum(num, func)
 		return True
 	def modstop(self, parent):
 		for cmd, func in self.hooks.iteritems():
-			self.parent.unhook(cmd)
+			self.parent.unhook(cmd, func)
+		for num, func in self.numhooks.iteritems():
+			self.parent.unhooknum(num, func)
 		return True
 
+	def hooknum(self, num):
+		def realhook(func):
+			self.numhooks[num] = func
+			if self.parent is not None:
+				self.parent.hooknum(num, func)
+			return func
+		return realhook
+
 	def hook(self, cmd, needchan=True, glevel=ANYONE, clevel=PUBLIC):
 		def realhook(func):
 			func.needchan = needchan