X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b5e5c4470d993b41113ae43b7f5030d412585430..52c80cff91dce5fa14ae903c6c2bf20533ccca46:/modlib.py

diff --git a/modlib.py b/modlib.py
index cc1c47c..b36c153 100644
--- a/modlib.py
+++ b/modlib.py
@@ -33,7 +33,7 @@ class modlib(object):
 	KNOWN   =   1
 	AUTHED  =   0 # Users which have are known to be authed
 	ANYONE  =  -1 # non-authed users have glevel set to -1
-	IGNORED =  -2 # The default reqglevel is ANYONE, so any commands will be ignored from IGNORED users unless the command reglevel=-2
+	IGNORED =  -2 # If the user is IGNORED, no hooks or chanhooks will fire for their messages. numhooks can still be fired.
 	glevs   = {
 		'OWNER': OWNER,
 		'MANAGER': MANAGER,
@@ -234,11 +234,53 @@ class modlib(object):
 		else:
 			return error('unknown parent')
 
+
+	def flags(self, *flags):
+		"""Parses out "flags" to a command, like `MODUNLOAD -AUTOLOAD somemodule`
+		@lib.hook()
+		@lib.flags('autoload', 'force')
+		def baz(bot, user, chan, realtarget, flags, *args)
+
+		Note the added `flags` argument, which will be a dict - in this case `{'autounload':true,'force':false}`."""
+		def realhook(func):
+			func.flags = [f.lower() for f in flags]
+
+			@wraps(func)
+			def parseargs(bot, user, chan, realtarget, *_args):
+				args = list(_args) # we need a copy, also need a list, iterate over _args-tuple, mutate args-list
+				found_flags = {f: False for f in flags}
+				for arg in _args:
+					if arg[0] == "-" and len(arg) > 1:
+						found_prefix = None
+						possible_flag = arg[1:].lower()
+						for f in flags:
+							if possible_flag == f: # Exact match?
+								found_flags[possible_flag] = True
+								args.remove(arg)
+								found_prefix = None
+								break
+							elif f.find(possible_flag) == 0: # Is the current word a prefix of a flag?
+								if found_prefix is not None: # Is it also a prefix of another flag?
+									return 'Error: %s is a prefix of multiple flags (%s, %s).' % (possible_flag, found_prefix[1], f)
+								else:
+									found_prefix = (arg,f)
+						if found_prefix is not None: # found (only one) prefix
+							found_flags[found_prefix[1]] = True
+							args.remove(found_prefix[0])
+				return func(bot, user, chan, realtarget, found_flags, *args)
+
+			return parseargs
+		return realhook
+
+
 	def argsEQ(self, num):
 		def realhook(func):
 			@wraps(func)
 			def checkargs(bot, user, chan, realtarget, *args):
-				if len(args) == num:
+				adjuster = 0
+				if hasattr(checkargs, 'flags'):
+					adjuster = 1
+				if len(args)-adjuster == num:
 					return func(bot, user, chan, realtarget, *args)
 				else:
 					bot.msg(user, self.WRONGARGS)
@@ -249,7 +291,10 @@ class modlib(object):
 		def realhook(func):
 			@wraps(func)
 			def checkargs(bot, user, chan, realtarget, *args):
-				if len(args) >= num:
+				adjuster = 0
+				if hasattr(checkargs, 'flags'):
+					adjuster = 1
+				if len(args)-adjuster >= num:
 					return func(bot, user, chan, realtarget, *args)
 				else:
 					bot.msg(user, self.WRONGARGS)