mode parsing bugfix

[erebus.git] / modules / resources.py

diff --git a/modules/resources.py b/modules/resources.py
index 520f762fb2b71e41b47672b344f9817aa278b52d..dacda2310e9f677ef9b8008f59ad6540fa13ef1e 100644 (file)
--- a/modules/resources.py
+++ b/modules/resources.py
@@ -1,13 +1,14 @@
 # Erebus IRC bot - Author: Erebus Team
-# simple module example
+# resource-usage module
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1], # compatible module API versions
-       'depends': [], # other modules required to work properly?
+       'compatible': [2],
+       'depends': [],
+       'softdeps': ['help'],
 }
 
 # preamble
@@ -19,9 +20,10 @@ modstop = lib.modstop
 # module code
 import resource
 
-@lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.hook(needchan=False, wantchan=True, glevel=lib.MANAGER)
+@lib.help(None, "show RAM usage")
 def ram(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:
@@ -31,9 +33,10 @@ def ram(bot, user, chan, realtarget, *args):
 
        bot.fastmsg(replyto, "Memory usage (MiB): %r" % (res.ru_maxrss/1024.0))
 
-@lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.hook(needchan=False, wantchan=True, glevel=lib.MANAGER)
+@lib.help(None, "show resource usage")
 def resources(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: