X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/444eb517c1cdd4e2638c62048c94cbac6d16d96b..b60b31ad90506a3c0efe6fd29f9d9b7119d8428e:/modlib.py

diff --git a/modlib.py b/modlib.py
index 7e9a742..2b67c5c 100644
--- a/modlib.py
+++ b/modlib.py
@@ -10,23 +10,24 @@ 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
-	MANAGER = 100
-	ADMIN = 75
-	STAFF = 50
-	AUTHED = 0
-	ANYONE = -1
+	OWNER   = 100
+	MANAGER =  99
+	ADMIN   =  75
+	STAFF   =  50
+	AUTHED  =   0
+	ANYONE  =  -1
 
 	# (channel) access levels
-	OWNER = 5
-	MASTER = 4
-	OP = 3
-	VOICE = 2
-	KNOWN = 1
-	PUBLIC = 0 #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."
@@ -34,6 +35,7 @@ class modlib(object):
 	def __init__(self, name):
 		self.hooks = {}
 		self.numhooks = {}
+		self.chanhooks = {}
 		self.parent = None
 
 		self.name = name
@@ -44,19 +46,31 @@ class modlib(object):
 			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
+			self.numhooks[str(num)] = func
 			if self.parent is not None:
-				self.parent.hooknum(num, func)
+				self.parent.hooknum(str(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
 
@@ -72,6 +86,12 @@ class modlib(object):
 			return func
 		return realhook
 
+	def mod(self, modname):
+		if self.parent is not None:
+			return self.parent.module(modname)
+		else:
+			return error('unknown parent')
+
 	def argsEQ(self, num):
 		def realhook(func):
 			def checkargs(bot, user, chan, realtarget, *args):