added ability to hook all messages to a certain channel

diff --git a/bot.py b/bot.py
index 2c214c746a4b35729d14dab22b9c14bab13cb55a..83eb76fc4364be5730a953d0150b35cb45cabb6e 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -98,7 +98,13 @@ class Bot(object):
                                                pieces.pop(0) # command actually starts with next word
                                                msg = ' '.join(pieces) # command actually starts with next word
                                elif not triggerused:
-                                       return # not to bot, don't process!
+                                       if self.parents.haschanhook(target.lower()):
+                                               for callback in self.parent.getchanhook(target.lower()):
+                                                       cbret = callback(self, user, chan, *pieces[1:])
+                                                       if cbret is NotImplemented:
+                                                               self.msg(user, "Command not implemented.")
+                                       else:
+                                               return # not to bot, don't process!
                        except IndexError:
                                return # Fix if you feel like it /BiohZn
 

diff --git a/erebus.py b/erebus.py
index d96ae0becb650b4a93cca93c7b99aa247362ee0c..3091760f473cc9115d98d576c33d7487c531cdd2 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -201,6 +201,18 @@ class Erebus(object):
        def getnumhook(self, word):
                return self.numhandlers[word]
 
+       def hookchan(self, chan, handler):
+               try:
+                       self.chanhandlers[word].append(handler)
+               except:
+                       self.chanhandlers[word] = [handler]
+       def unhookchan(self, chan, handler):
+               if chan in self.chanhandlers and handler in self.chanhandlers[chan]:
+                       self.chanhandlers[chan].remove(handler)
+       def haschanhook(self, chan):
+               return chan in self.chanhandlers and len(self.chanhandlers[chan]) != 0
+       def getchanhook(self, chan):
+               return self.chanhandlers[chan]
 
 
 class MyCursor(MySQLdb.cursors.DictCursor):

diff --git a/modlib.py b/modlib.py
index 7e9a742506545fa27ae1b88d0a53cbc0e7d779bb..d27106a0971963cae86f1e102ea1d5f9dded0b81 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -34,6 +34,7 @@ class modlib(object):
        def __init__(self, name):
                self.hooks = {}
                self.numhooks = {}
+               self.chanhooks = {}
                self.parent = None
 
                self.name = name
@@ -44,12 +45,16 @@ class modlib(object):
                        self.parent.hook(cmd, func)
                for num, func in self.numhooks.iteritems():
                        self.parent.hooknum(num, func)
+               for chan, func in self.chanhooks.iteritems():
+                       self.parent.hookchan(chan, 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)
+               for chan, func in self.chanhooks.iteritems():
+                       self.parent.hookchan(chan, func)
                return True
 
        def hooknum(self, num):
@@ -60,6 +65,14 @@ class modlib(object):
                        return func
                return realhook
 
+       def hookchan(self, chan, glevel=ANYONE, clevel=PUBLIC):
+               def realhook(func):
+                       self.chanhooks[chan] = func
+                       if self.parent is not None:
+                               self.parent.hookchan(chan, func)
+                       return func
+               return realhook
+
        def hook(self, cmd, needchan=True, glevel=ANYONE, clevel=PUBLIC):
                def realhook(func):
                        func.needchan = needchan