control - aliased die to restart

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index c03b8f3445de66811eff3b9a69a9329ec05bef75..5c95b0b6cad5f8ab0e6aad491ea1df73cf0ad2b0 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -17,11 +17,12 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import sys
+import sys, os
 import ctlmod
+from collections import deque
 
 
-@lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.hook(('die','restart'), needchan=False, glevel=lib.MANAGER)
 def die(bot, user, chan, realtarget, *args):
        for botitem in bot.parent.bots.itervalues():
                for chan in botitem.chans:
@@ -65,24 +66,58 @@ def modlist(bot, user, chan, realtarget, *args):
                bot.msg(user, "- %s %r" % (mod.__name__, mod))
        bot.msg(user, "Done.")
 
-@lib.hook(cmd='whoami', needchan=False)
-def whoami(bot, user, chan, realtarget, *args):
+def _whois(user, chan, showglevel=True, showclevel=True):
        if not user.isauthed():
-               bot.msg(user, "You are not authed.")
-               return
+               return "not authed."
 
        fillers = {'auth': user.auth}
-       fmt = "You are %(auth)s"
+       fmt = "%(auth)s"
 
-       if user.glevel >= 1:
-               fillers['glevel'] = user.glevel
-               fmt += " (global access: %(glevel)s)"
+       if showglevel and user.glevel >= 1:
+                       fillers['glevel'] = user.glevel
+                       fmt += " (global access: %(glevel)s)"
+       elif user.glevel >= 1:
+               fmt += " (staff)"
        else:
                fmt += " (not staff)"
 
-       if chan is not None and chan.levelof(user.auth) >= 1:
-               fillers['clevel'] = chan.levelof(user.auth)
-               fmt += " (channel access: %(clevel)s)"
+       if showclevel and chan is not None:
+               if chan.levelof(user.auth) >= 1:
+                       fillers['clevel'] = chan.levelof(user.auth)
+                       fmt += " (channel access: %(clevel)s)"
+               else:
+                       fmt += " (not a channel user)"
+       return fmt % fillers
+
+@lib.hook(needchan=False)
+@lib.argsEQ(1)
+def whois(bot, user, chan, realtarget, *args):
+       target = bot.parent.user(args[0], create=False)
+       if target is None:
+               bot.msg(user, "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))))
+
+@lib.hook(needchan=False)
+def whoami(bot, user, chan, realtarget, *args):
+       bot.msg(user, "You are %s" % (_whois(user, chan)))
+
+@lib.hook(needchan=False, glevel=1)
+def qstat(bot, user, chan, realtarget, *args):
+       bot.fastmsg(user, "Regular: %d -- Slow: %d" % (len(bot.msgqueue), len(bot.slowmsgqueue)))
+
+@lib.hook(needchan=False, glevel=lib.ADMIN)
+def qclear(bot, user, chan, realtarget, *args):
+       if len(args) == 0:
+               bot.msgqueue = deque()
+               bot.slowmsgqueue = deque()
+               bot.fastmsg(user, "Cleared both msgqueues.")
        else:
-               fmt += " (not a channel user)"
-       bot.msg(user, fmt % fillers)
+               if args[0] == 'regular':
+                       bot.msgqueue = deque()
+               elif args[0] == 'slow':
+                       bot.slowmsgqueue = deque()
+               else:
+                       bot.fastmsg(user, "Syntax: QCLEAR [regular|slow]")
+                       return #short-circuit
+               bot.fastmsg(user, "Cleared that msgqueue.")