Modules!

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 50456b5d1cebaf9a6250d06b8f00c1bf690f3c04..513f25722284543c144f4a80c13c76085c3b0fad 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -56,24 +56,14 @@ class Bot(object):
        def parsemsg(self, user, chan, msg):
                if msg[0] == '!': #TODO check config for trigger
                        msg = msg[1:]
-
                else:
                        return
 
                pieces = msg.split()
-               cmd = pieces[0].upper()
-
-               if cmd == "EVAL":
-                       try: ret = eval(' '.join(pieces[1:]))
-                       except: self.msg(chan, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-                       else: self.msg(chan, "Done: %r" % (ret))
-
-               elif cmd == "EXEC":
-                       try: exec ' '.join(pieces[1:])
-                       except: self.msg(chan, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-                       else: self.msg(chan, "Done.")
+               cmd = pieces[0].lower()
 
-               #TODO
+               if self.parent.hashook(cmd):
+                       self.parent.gethook(cmd)(self, user, chan, *pieces[1:])
 
        def msg(self, target, msg):
                if isinstance(target, self.parent.User): self.conn.send("NOTICE %s :%s" % (target.nick, msg))