X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/e4a4c7620b268cd6d4154a28e2e8b8cda40f5b0c..e5a3970b9326b064c88b296b1fa5a9bed320b8b3:/modlib.py

diff --git a/modlib.py b/modlib.py
index 6962881..02b657e 100644
--- a/modlib.py
+++ b/modlib.py
@@ -10,7 +10,7 @@ class error(object):
 	def __repr__(self):
 		return '<modlib.error %r>' % self.errormsg
 	def __str__(self):
-		return self.errormsg
+		return str(self.errormsg)
 
 class modlib(object):
 	# default (global) access levels
@@ -21,18 +21,20 @@ 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.chanhooks = {}
 		self.parent = None
 
 		self.name = name
@@ -41,12 +43,36 @@ 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)
+		for chan, func in self.chanhooks.iteritems():
+			self.parent.hookchan(chan, func)
 		return True
 	def modstop(self, parent):
 		for cmd, func in self.hooks.iteritems():
 			self.parent.unhook(cmd, func)
+		for num, func in self.numhooks.iteritems():
+			self.parent.unhooknum(num, func)
+		for chan, func in self.chanhooks.iteritems():
+			self.parent.unhookchan(chan, 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 hookchan(self, chan, glevel=ANYONE, clevel=PUBLIC):
+		def realhook(func):
+			self.chanhooks[chan] = func
+			if self.parent is not None:
+				self.parent.hookchan(chan, func)
+			return func
+		return realhook
+
 	def hook(self, cmd, needchan=True, glevel=ANYONE, clevel=PUBLIC):
 		def realhook(func):
 			func.needchan = needchan