X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/1743224e7c43eab0eb8732575aca443f6222eba0..c9db2d7ede0848cf876ee4613d0b4f804b374d88:/modlib.py

diff --git a/modlib.py b/modlib.py
index abf1a3d..02b657e 100644
--- a/modlib.py
+++ b/modlib.py
@@ -10,18 +10,31 @@ 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 access levels
+	# default (global) access levels
 	MANAGER = 100
-	ADMIN = 90
-	STAFF = 80
+	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)
+
+	# messages
+	WRONGARGS = "Wrong number of arguments."
+
 	def __init__(self, name):
 		self.hooks = {}
+		self.numhooks = {}
+		self.chanhooks = {}
 		self.parent = None
 
 		self.name = name
@@ -30,15 +43,64 @@ 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 hook(self, cmd, level=ANYONE):
+	def hookchan(self, chan, glevel=ANYONE, clevel=PUBLIC):
 		def realhook(func):
-			func.reqlevel = level
+			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
+			func.reqglevel = glevel
+			func.reqclevel = clevel
+
 			self.hooks[cmd] = func
 			if self.parent is not None:
 				self.parent.hook(cmd, func)
 			return func
 		return realhook
+
+	def argsEQ(self, num):
+		def realhook(func):
+			def checkargs(bot, user, chan, realtarget, *args):
+				if len(args) == num:
+					return func(bot, user, chan, realtarget, *args)
+				else:
+					bot.msg(user, self.WRONGARGS)
+			return checkargs
+		return realhook
+
+	def argsGE(self, num):
+		def realhook(func):
+			def checkargs(bot, user, chan, realtarget, *args):
+				if len(args) >= num:
+					return func(bot, user, chan, realtarget, *args)
+				else:
+					bot.msg(user, self.WRONGARGS)
+			return checkargs
+		return realhook