help bugfix

[erebus.git] / modlib.py

diff --git a/modlib.py b/modlib.py
index 1fb53ded550143c0b2161db7d40e359eba005d82..ff63a07612a9fd0fcf6157bb820275a7d635ace6 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -20,6 +20,7 @@ class modlib(object):
        STAFF   =  50
        AUTHED  =   0
        ANYONE  =  -1
+       IGNORED =  -2
 
        # (channel) access levels
        COWNER  =   5
@@ -28,6 +29,9 @@ class modlib(object):
        VOICE   =   2
        KNOWN   =   1
        PUBLIC  =   0 #anyone (use glevel to control auth-needed)
+       BANNED  =  -1
+       #         [   0         1        2     3         4        5    -1]
+       clevs   = [None, 'Friend', 'Voice', 'Op', 'Master', 'Owner', None]
 
        # messages
        WRONGARGS = "Wrong number of arguments."
@@ -39,9 +43,16 @@ class modlib(object):
                self.helps = []
                self.parent = None
 
-               self.name = name
+               self.name = (name.split("."))[-1]
 
        def modstart(self, parent):
+               #modstart can return a few things...
+               # None: unspecified success
+               # False: unspecified error
+               # modlib.error (or anything else False-y): specified error
+               # True: unspecified success
+               # non-empty string (or anything else True-y): specified success
+               #"specified" values will be printed. unspecified values will result in "OK" or "failed"
                self.parent = parent
                for cmd, func in self.hooks.iteritems():
                        self.parent.hook(cmd, func)
@@ -59,12 +70,12 @@ class modlib(object):
                return True
        def modstop(self, parent):
                for cmd, func in self.hooks.iteritems():
-                       self.parent.unhook(cmd, func)
-                       self.parent.unhook("%s.%s" % (self.name, cmd), func)
+                       parent.unhook(cmd, func)
+                       parent.unhook("%s.%s" % (self.name, cmd), func)
                for num, func in self.numhooks.iteritems():
-                       self.parent.unhooknum(num, func)
+                       parent.unhooknum(num, func)
                for chan, func in self.chanhooks.iteritems():
-                       self.parent.unhookchan(chan, func)
+                       parent.unhookchan(chan, func)
 
                for func, args, kwargs in self.helps:
                        try:
@@ -89,7 +100,8 @@ class modlib(object):
                        return func
                return realhook
 
-       def hook(self, cmd=None, needchan=True, glevel=ANYONE, clevel=PUBLIC):
+       def hook(self, cmd=None, needchan=True, glevel=ANYONE, clevel=PUBLIC, wantchan=None):
+               if wantchan is None: wantchan = needchan
                _cmd = cmd #save this since it gets wiped out...
                def realhook(func):
                        cmd = _cmd #...and restore it
@@ -99,9 +111,11 @@ class modlib(object):
                                cmd = (cmd,)
 
                        func.needchan = needchan
+                       func.wantchan = wantchan
                        func.reqglevel = glevel
                        func.reqclevel = clevel
                        func.cmd = cmd
+                       func.module = func.__module__.split('.')[1]
 
                        for c in cmd:
                                self.hooks[c] = func
@@ -125,6 +139,7 @@ class modlib(object):
                                else:
                                        bot.msg(user, self.WRONGARGS)
                        checkargs.__name__ = func.__name__
+                       checkargs.__module__ = func.__module__
                        return checkargs
                return realhook
 
@@ -136,6 +151,7 @@ class modlib(object):
                                else:
                                        bot.msg(user, self.WRONGARGS)
                        checkargs.__name__ = func.__name__
+                       checkargs.__module__ = func.__module__
                        return checkargs
                return realhook