added country display; and minor bugfixes to trivia

[erebus.git] / modlib.py

diff --git a/modlib.py b/modlib.py
index d27106a0971963cae86f1e102ea1d5f9dded0b81..2b67c5cbca662e108b6ece99f0485788b86eddca 100644 (file)
--- 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."
@@ -54,14 +55,14 @@ class modlib(object):
                for num, func in self.numhooks.iteritems():
                        self.parent.unhooknum(num, func)
                for chan, func in self.chanhooks.iteritems():
-                       self.parent.hookchan(chan, func)
+                       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
 
@@ -85,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):