From 4826c6fe7f86a6ff05d0ce0a549982c9360c3029 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 22 Feb 2022 15:25:45 -0500 Subject: [PATCH] test --- .../SBCore/commands/__init__.py | 124 +++++++++--------- 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py index f40b591..66a16a5 100644 --- a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py +++ b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py @@ -149,69 +149,71 @@ class Commands(): for full_trigger_str in triggers: - if full_trigger_str.startswith(tuple(self.config.prefix_list)): - trigger_type = "command" - trigger_prefix = full_trigger_str[0] - trigger_noprefix = full_trigger_str[1:] - trigger_command = trigger_noprefix.split(" ")[0] - trigger_str = " ".join(trigger_noprefix.split(" ")[1:]) - elif full_trigger_str.startswith(self.bot.nick): - trigger_type = "nickname_command" - trigger_prefix = str(full_trigger_str.split(" ")[0]) - trigger_noprefix = " ".join(full_trigger_str.split(" ")[1:]) - trigger_command = trigger_noprefix.split(" ")[0] - trigger_str = " ".join(trigger_noprefix.split(" ")[1:]) - elif full_trigger_str.startswith(tuple(["ACTION", "/me"])): - trigger_type = "action_command" - trigger_prefix = "ACTION" - trigger_noprefix = full_trigger_str - trigger_command = trigger_noprefix.split(" ")[0] - trigger_str = " ".join(trigger_noprefix.split(" ")[1:]) - else: - trigger_command = full_trigger_str.split(" ")[0] - trigger_str = " ".join(full_trigger_str.split(" ")[1:]) + if not full_trigger_str.isspace(): - command_types = ["command", "nickname_command", "action_command"] - # Assume same command type until proven otherwise - assumed_trigger_type = first_trigger_type - assumed_trigger_prefix = first_trigger_prefix - - # Still under the assumption that the command is most likely the same type as first command - command_types.remove(assumed_trigger_type) - command_types.insert(0, assumed_trigger_type) - - found = [] - for command_type in command_types: - - if command_type == "command": - commands_list = self.valid_sopel_commands - elif command_type == "nickname_command": - commands_list = self.valid_sopel_nickname_commands - elif command_type == "action_command": - commands_list = self.valid_sopel_action_commands - - if trigger_command in commands_list: - found.append(command_type) - - if len(found): - trigger_type = found[0] - if trigger_type == "command": - trigger_prefix = self.config.prefix_list[0] - elif trigger_type == "nickname_command": - trigger_prefix = "%s," % self.bot.nick - elif trigger_type == "action_command": - trigger_prefix = "ACTION" + if full_trigger_str.startswith(tuple(self.config.prefix_list)): + trigger_type = "command" + trigger_prefix = full_trigger_str[0] + trigger_noprefix = full_trigger_str[1:] + trigger_command = trigger_noprefix.split(" ")[0] + trigger_str = " ".join(trigger_noprefix.split(" ")[1:]) + elif full_trigger_str.startswith(self.bot.nick): + trigger_type = "nickname_command" + trigger_prefix = str(full_trigger_str.split(" ")[0]) + trigger_noprefix = " ".join(full_trigger_str.split(" ")[1:]) + trigger_command = trigger_noprefix.split(" ")[0] + trigger_str = " ".join(trigger_noprefix.split(" ")[1:]) + elif full_trigger_str.startswith(tuple(["ACTION", "/me"])): + trigger_type = "action_command" + trigger_prefix = "ACTION" + trigger_noprefix = full_trigger_str + trigger_command = trigger_noprefix.split(" ")[0] + trigger_str = " ".join(trigger_noprefix.split(" ")[1:]) else: - trigger_type = assumed_trigger_type - trigger_prefix = assumed_trigger_prefix + trigger_command = full_trigger_str.split(" ")[0] + trigger_str = " ".join(full_trigger_str.split(" ")[1:]) - commands.append({ - "trigger_type": trigger_type, - "trigger_prefix": trigger_prefix, - "trigger_str": trigger_str, - "trigger_command": trigger_command, - "trigger_hostmask": trigger.hostmask, - "trigger_sender": trigger.sender - }) + command_types = ["command", "nickname_command", "action_command"] + # Assume same command type until proven otherwise + assumed_trigger_type = first_trigger_type + assumed_trigger_prefix = first_trigger_prefix + + # Still under the assumption that the command is most likely the same type as first command + command_types.remove(assumed_trigger_type) + command_types.insert(0, assumed_trigger_type) + + found = [] + for command_type in command_types: + + if command_type == "command": + commands_list = self.valid_sopel_commands + elif command_type == "nickname_command": + commands_list = self.valid_sopel_nickname_commands + elif command_type == "action_command": + commands_list = self.valid_sopel_action_commands + + if trigger_command in commands_list: + found.append(command_type) + + if len(found): + trigger_type = found[0] + if trigger_type == "command": + trigger_prefix = self.config.prefix_list[0] + elif trigger_type == "nickname_command": + trigger_prefix = "%s," % self.bot.nick + elif trigger_type == "action_command": + trigger_prefix = "ACTION" + else: + trigger_type = assumed_trigger_type + trigger_prefix = assumed_trigger_prefix + + commands.append({ + "trigger_type": trigger_type, + "trigger_prefix": trigger_prefix, + "trigger_str": trigger_str, + "trigger_command": trigger_command, + "trigger_hostmask": trigger.hostmask, + "trigger_sender": trigger.sender + }) return commands