err... yeah.

diff --git a/bot.py b/bot.py
index 83eb76fc4364be5730a953d0150b35cb45cabb6e..7140a1a61f09846767d547e3d88465b15a24cc06 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -98,9 +98,9 @@ class Bot(object):
                                                pieces.pop(0) # command actually starts with next word
                                                msg = ' '.join(pieces) # command actually starts with next word
                                elif not triggerused:
-                                       if self.parents.haschanhook(target.lower()):
+                                       if self.parent.haschanhook(target.lower()):
                                                for callback in self.parent.getchanhook(target.lower()):
-                                                       cbret = callback(self, user, chan, *pieces[1:])
+                                                       cbret = callback(self, user, chan, *pieces)
                                                        if cbret is NotImplemented:
                                                                self.msg(user, "Command not implemented.")
                                        else:

diff --git a/erebus.py b/erebus.py
index 3091760f473cc9115d98d576c33d7487c531cdd2..66f6cd2532a38695b7c178765e0a58b70dead2b7 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -14,6 +14,7 @@ class Erebus(object):
        mods = {}
        numhandlers = {}
        msghandlers = {}
+       chanhandlers = {}
        users = {}
        chans = {}
 
@@ -203,9 +204,9 @@ class Erebus(object):
 
        def hookchan(self, chan, handler):
                try:
-                       self.chanhandlers[word].append(handler)
+                       self.chanhandlers[chan].append(handler)
                except:
-                       self.chanhandlers[word] = [handler]
+                       self.chanhandlers[chan] = [handler]
        def unhookchan(self, chan, handler):
                if chan in self.chanhandlers and handler in self.chanhandlers[chan]:
                        self.chanhandlers[chan].remove(handler)

diff --git a/modlib.py b/modlib.py
index d27106a0971963cae86f1e102ea1d5f9dded0b81..5fb7e77704866e97751848400d015cde5cb0a4d8 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -54,7 +54,7 @@ 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):

diff --git a/modules/eval.py b/modules/eval.py
index 795c72a96376834c6172e11ce6b6750f41cb6b10..e516464355c51446baac414e5124bf7e41dabfc6 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -18,6 +18,7 @@ modstop = lib.modstop
 
 # module code
 import sys
+import ctlmod
 
 @lib.hook('eval', needchan=False, glevel=lib.MANAGER)
 @lib.argsGE(1)

diff --git a/modules/trivia.py b/modules/trivia.py
index 673a14ef000e28a54c157f9a7e171b864572cbd9..0762bed45094ff48349a0c417932c305efe49ec6 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -14,8 +14,7 @@ modinfo = {
 import modlib
 lib = modlib.modlib(__name__)
 def modstart(parent, *args, **kwargs):
-       global state
-       state = TriviaState("/home/jrunyon/erebus/modules/trivia.json", parent) #TODO
+       state.parent = parent
        return lib.modstart(parent, *args, **kwargs)
 def modstop(*args, **kwargs):
        global state
@@ -26,10 +25,11 @@ def modstop(*args, **kwargs):
 import json, random
 
 class TriviaState(object):
-       def __init__(self, questionfile, parent):
-               self.parent = parent
+       def __init__(self, questionfile):
                self.questionfile = questionfile
                self.db = json.load(open(questionfile, "r"))
+               self.chan = self.db['chan']
+               self.curq = None
 
        def __del__(self):
                json.dump(self.db, open(self.questionfile, "w"), indent=4, separators=(',',': '))
@@ -37,21 +37,24 @@ class TriviaState(object):
        def nextquestion(self):
                nextq = random.choice(self.db['questions'])
                self.curq = nextq
-               self.parent.msg(self.chan, "Next up: %s" % (nextq['question']))
+               self.parent.channel(self.chan).bot.msg(self.chan, "Next up: %s" % (nextq['question']))
 
        def checkanswer(self, answer):
-               if isinstance(self.curq['answer'], basestring):
+               if self.curq is None:
+                       return False
+               elif isinstance(self.curq['answer'], basestring):
                        return answer.lower() == self.curq['answer']
                else: # assume it's a list or something.
                        return answer.lower() in self.curq['answer']
        
        def addpoint(self, _user, count=1):
+               _user = str(_user)
                user = _user.lower()
                if user in self.db['users']:
                        self.db['users'][user]['points'] += count
                else:
                        self.db['users'][user] = {'points': count, 'realnick': _user, 'rank': len(self.db['ranks'])}
-                       self.db['ranks']append(user)
+                       self.db['ranks'].append(user)
 
                oldrank = self.db['users'][user]['rank']
                while oldrank != 0:
@@ -65,29 +68,31 @@ class TriviaState(object):
                return self.db['users'][user]['points']
 
        def points(self, user):
-               user = user.lower()
+               user = str(user).lower()
                if user in self.db['users']:
                        return self.db['users'][user]['points']
                else:
                        return 0
 
        def rank(self, user):
+               user = str(user)
                return self.db['users'][user]['rank']
        
        def targetuser(self, user): return "TODO" #TODO
        def targetpoints(self, user): return 0 #TODO
 
+state = TriviaState("/home/jrunyon/erebus/modules/trivia.json") #TODO
+
 @lib.hookchan(state.db['chan'])
 def trivia_checkanswer(bot, user, chan, *args):
-       global state
        line = ' '.join([str(arg) for arg in args])
+       bot.msg('dimecadmium', line)
        if state.checkanswer(line):
                bot.msg(chan, "\00308%s\003 has it! The answer was \00308%s\003. Current points: %d. Rank: %d. Target: %s (%d)." % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)))
-       state.nextquestion()
+               state.nextquestion()
 
 @lib.hook('points')
 def cmd_points(bot, user, chan, realtarget, *args):
-       global state
        if chan is not None: replyto = chan
        else: replyto = user
 
@@ -99,7 +104,6 @@ def cmd_points(bot, user, chan, realtarget, *args):
 @lib.hook('give', clevel=lib.OP)
 @lib.argsGE(1)
 def cmd_give(bot, user, chan, realtarget, *args):
-       global state
        if len(args) > 1 and args[1] != 1:
                bot.msg(user, "Giving more than one point is not yet implemented.")
                return NotImplemented
@@ -111,8 +115,7 @@ def cmd_give(bot, user, chan, realtarget, *args):
 @lib.hook('rank')
 @lib.argsEQ(1)
 def cmd_rank(bot, user, chan, realtarget, *args):
-       global state
        if chan is not None: replyto = chan
        else: replyto = user
 
-       bot.msg(replyto, "%s is in %d place." % (args[0], state.rank(args[0]))
+       bot.msg(replyto, "%s is in %d place." % (args[0], state.rank(args[0])))