control - use new bot.reply return shortcut

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index 884b82b8840d6cc5dac8f8f1a618760b39420e89..fab46f6a1d1df57cec1719d28dc96e4e606317b5 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # Various highly recommended "control" commands.
 # This file is released into the public domain; see http://unlicense.org/
 
@@ -27,7 +28,7 @@ from collections import deque
 @lib.help(None, "stops the bot")
 def die(bot, user, chan, realtarget, *args):
        quitmsg = ' '.join(args)
-       for botitem in bot.parent.bots.itervalues():
+       for botitem in bot.parent.bots.values():
                bot.conn.send("QUIT :Restarting. %s" % (quitmsg))
        sys.exit(0)
        os._exit(0)
@@ -71,7 +72,7 @@ def modreload(bot, user, chan, realtarget, *args):
 @lib.argsEQ(0)
 def modlist(bot, user, chan, realtarget, *args):
        mods = ctlmod.modules
-       for modname, mod in mods.iteritems():
+       for modname, mod in mods.items():
                bot.msg(user, "- %s (%s) [%s]" % ((modname, mod.__file__, ', '.join(ctlmod.dependents[modname]))))
        bot.msg(user, "Done.")
 
@@ -108,14 +109,14 @@ def whois(bot, user, chan, realtarget, *args):
        else:
                target = bot.parent.user(name, create=False)
        if target is None:
-               bot.msg(user, "I don't know %s." % (args[0]))
+               return  "I don't know %s." % (args[0])
        else:
-               bot.msg(user, "%s is %s" % (args[0], _whois(target, chan, (user.glevel >= 1), (chan is not None and chan.levelof(user.auth) >= 1))))
+               return "%s is %s" % (args[0], _whois(target, chan, (user.glevel >= 1), (chan is not None and chan.levelof(user.auth) >= 1)))
 
 @lib.hook(needchan=False, wantchan=True)
 @lib.help(None, "shows who you are")
 def whoami(bot, user, chan, realtarget, *args):
-       bot.msg(user, "You are %s" % (_whois(user, chan)))
+       return "You are %s" % (_whois(user, chan))
 
 @lib.hook(needchan=False)
 @lib.help(None, "tries to read your auth and access level again")
@@ -128,7 +129,7 @@ def auth(bot, user, chan, realtarget, *args):
 def qstat(bot, user, chan, realtarget, *args):
        bot.fastmsg(user, "Regular: %d -- Slow: %d" % (len(bot.msgqueue), len(bot.slowmsgqueue)))
 
-@lib.hook(('qclear','clearq','clearqueue'), needchan=False, glevel=lib.ADMIN)
+@lib.hook(('qclear','cq','clearq','clearqueue'), needchan=False, glevel=lib.ADMIN)
 @lib.help("[regular|slow]", "clears both or a specific msgqueue")
 def qclear(bot, user, chan, realtarget, *args):
        if len(args) == 0: