diff options
| author |  jesopo | 2018-10-03 17:01:10 +0100 |
|---|---|---|
| committer | jesopo | 2018-10-03 17:01:10 +0100 |
| commit | 02e76444d17f02e152411d6ceafd43e0e2e68cae (patch) | |
| tree | 2bfdc5e6fac3a2bd6bc9a2fa47336257d04b448f /modules | |
| parent | Correctly get BitBot's own modes in modules/print_activity.py (diff) | |
| signature | ||
Add 'remove_empty' kwarg for commands, to strip out empty space
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/channel_op.py | 6 | ||||
| -rw-r--r-- | modules/commands.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/modules/channel_op.py b/modules/channel_op.py index b2c1e3af..9f9984ee 100644 --- a/modules/channel_op.py +++ b/modules/channel_op.py @@ -202,7 +202,8 @@ class Module(ModuleManager.BaseModule): "args_split"][0] event["target"].send_mode("-v", target) - @utils.hook("received.command.topic", min_args=1, channel_only=True) + @utils.hook("received.command.topic", min_args=1, channel_only=True, + remove_empty=False) def topic(self, event): """ :help: Set the topic in the current channel @@ -210,7 +211,8 @@ class Module(ModuleManager.BaseModule): :require_mode: o """ event["target"].send_topic(event["args"]) - @utils.hook("received.command.tappend", min_args=1, channel_only=True) + @utils.hook("received.command.tappend", min_args=1, channel_only=True, + remove_empty=False) def tappend(self, event): """ :help: Append to the topic in the current channel diff --git a/modules/commands.py b/modules/commands.py index 3660beb7..fbe4eb23 100644 --- a/modules/commands.py +++ b/modules/commands.py @@ -140,7 +140,11 @@ class Module(ModuleManager.BaseModule): stderr.write(returned).send() target.buffer.skip_next() return + args_split = event["message_split"][args_index:] + if hook.kwargs.get("remove_empty", True): + args_split = list(filter(None, args_split)) + min_args = hook.kwargs.get("min_args") if min_args and len(args_split) < min_args: if "usage" in hook.kwargs: |