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

diff --git a/modlib.py b/modlib.py
index 743e36d..7e9a742 100644
--- a/modlib.py
+++ b/modlib.py
@@ -15,21 +15,25 @@ class error(object):
 class modlib(object):
 	# default (global) access levels
 	MANAGER = 100
-	ADMIN = 90
-	STAFF = 80
+	ADMIN = 75
+	STAFF = 50
 	AUTHED = 0
 	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
@@ -38,9 +42,23 @@ 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, 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):
@@ -53,3 +71,23 @@ class modlib(object):
 				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