Skip to content

Commit 39db6de

Browse files
committed
update modules.py to use command spec (and not docstrings)
1 parent a19f630 commit 39db6de

File tree

1 file changed

+17
-26
lines changed

1 file changed

+17
-26
lines changed

src/core_modules/modules.py

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@ def info(self, event):
4242
% (event["user"].nickname, module.name, loaded_at, event_calls,
4343
event_str))
4444

45-
@utils.hook("received.command.loadmodule", min_args=1)
45+
@utils.hook("received.command.loadmodule")
46+
@utils.kwarg("help", "Load a module")
47+
@utils.kwarg("permission", "loadmodule")
48+
@utils.spec("!<name>wordlower")
4649
def load(self, event):
47-
"""
48-
:help: Load a module
49-
:usage: <module name>
50-
:permission: load-module
51-
"""
52-
name = event["args_split"][0].lower()
50+
name = event["spec"][0]
5351
if name in self.bot.modules.modules:
5452
raise utils.EventError("Module '%s' is already loaded" % name)
5553
definition = self._catch(name,
@@ -58,14 +56,12 @@ def load(self, event):
5856
self._catch(name, lambda: self.bot.modules.load_module(self.bot, definition))
5957
event["stdout"].write("Loaded '%s'" % name)
6058

61-
@utils.hook("received.command.unloadmodule", min_args=1)
59+
@utils.hook("received.command.unloadmodule")
60+
@utils.kwarg("help", "Unload a module")
61+
@utils.kwarg("permission", "unloadmodule")
62+
@utils.spec("!<name>wordlower")
6263
def unload(self, event):
63-
"""
64-
:help: Unload a module
65-
:usage: <module name>
66-
:permission: unload-module
67-
"""
68-
name = event["args_split"][0].lower()
64+
name = event["spec"][0]
6965
if not name in self.bot.modules.modules:
7066
raise utils.EventError("Module '%s' isn't loaded" % name)
7167

@@ -77,24 +73,19 @@ def _reload(self, name):
7773
definition = self._catch(name,
7874
lambda: self.bot.modules.find_module(name))
7975
self.bot.modules.load_module(self.bot, definition)
80-
@utils.hook("received.command.reloadmodule", min_args=1)
76+
@utils.hook("received.command.reloadmodule")
77+
@utils.kwarg("help", "Reload a module")
78+
@utils.kwarg("permission", "reloadmodule")
79+
@utils.spec("!<name>wordlower")
8180
def reload(self, event):
82-
"""
83-
:help: Reload a module
84-
:usage: <module name>
85-
:permission: reload-module
86-
"""
87-
name = event["args_split"][0].lower()
88-
81+
name = event["spec"][0]
8982
self._catch(name, lambda: self._reload(name))
9083
event["stdout"].write("Reloaded '%s'" % name)
9184

9285
@utils.hook("received.command.reloadallmodules")
86+
@utils.kwarg("help", "Reload all modules")
87+
@utils.kwarg("permission", "reloadallmodules")
9388
def reload_all(self, event):
94-
"""
95-
:help: Reload all modules
96-
:permission: reload-all-modules
97-
"""
9889
result = self.bot.try_reload_modules()
9990
if result.success:
10091
event["stdout"].write(result.message)

0 commit comments

Comments
 (0)