module cleanup

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index 3e06472e5495ffe42e8d1e5a51751d2465bc9dc4..0ebb5ac146e8091581da209d501afba9056561cb 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -6,8 +6,9 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1],
+       'compatible': [2],
        'depends': [],
+       'softdeps': ['help'],
 }
 
 # preamble
@@ -24,11 +25,11 @@ import ctlmod
 def module(name):
        return lib.mod(name)
 
-@lib.hook('eval', needchan=False, glevel=lib.MANAGER)
+@lib.hook('eval', needchan=False, wantchan=True, glevel=lib.MANAGER)
 @lib.help("<python>", "eval")
 @lib.argsGE(1)
 def cmd_eval(bot, user, chan, realtarget, *args):
-       if chan is not None and realtarget == chan.name: replyto = chan
+       if chan is not None: replyto = chan
        else: replyto = user
 
        try: ret = eval(' '.join(args))
@@ -36,11 +37,11 @@ def cmd_eval(bot, user, chan, realtarget, *args):
        else: bot.msg(replyto, "Done: %r" % (ret,))
 
 
-@lib.hook('exec', needchan=False, glevel=lib.MANAGER)
+@lib.hook('exec', needchan=False, wantchan=True, glevel=lib.MANAGER)
 @lib.help("<python>", "exec")
 @lib.argsGE(1)
 def cmd_exec(bot, user, chan, realtarget, *args):
-       if chan is not None and realtarget == chan.name: replyto = chan
+       if chan is not None: replyto = chan
        else: replyto = user
 
        try: exec ' '.join(args)