diff options
| author |  jesopo | 2018-09-09 09:02:15 +0100 |
|---|---|---|
| committer |  GitHub | 2018-09-09 09:02:15 +0100 |
| commit | dacf8998ebab0bcf755cb8617ed85bbcad8af363 (patch) | |
| tree | b450e1f86e433679e488cdc147c1d373ee0fa9db /modules/commands.py | |
| parent | Clean up combining new.channel and __init__ channel bootstrapping (diff) | |
| parent | Merge branch 'master' into master (diff) | |
Merge pull request #19 from dngfx/master
I have no idea why ducks.py is in here. Google.py update.
Diffstat (limited to 'modules/commands.py')
| -rw-r--r-- | modules/commands.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/modules/commands.py b/modules/commands.py index 6cac8c43..2567880b 100644 --- a/modules/commands.py +++ b/modules/commands.py @@ -38,11 +38,11 @@ class Out(object): class StdOut(Out): def prefix(self): return "%s%s%s" % (Utils.color(Utils.COLOR_GREEN), - self.module_name, Utils.FONT_RESET) + self.module_name, Utils.FONT_COLOR) class StdErr(Out): def prefix(self): return "%s!%s%s" % (Utils.color(Utils.COLOR_RED), - self.module_name, Utils.FONT_RESET) + self.module_name, Utils.FONT_COLOR) class Module(object): def __init__(self, bot, events, exports): @@ -190,12 +190,24 @@ class Module(object): event["stdout"].write("Commands: %s" % ", ".join(help_available)) def usage(self, event): + if event["is_channel"]: + command_prefix = event["target"].get_setting("command-prefix", + event["server"].get_setting( + "command-prefix", + "!")) + else: + command_prefix = "" + + command = event["args_split"][0].lower() if command in self.events.on("received").on( "command").get_children(): hooks = self.events.on("received").on("command").on(command).get_hooks() if hooks and "usage" in hooks[0].kwargs: - event["stdout"].write("Usage: %s %s" % (command, hooks[0].kwargs["usage"])) + event["stdout"].write("Usage: %s%s %s" % (command_prefix, + command, + hooks[0].kwargs[ + "usage"])) else: event["stderr"].write("No usage help available for %s" % command) else: |