From 5102d136170f2b4863c4c61d7c7befbad2d963cb Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 5 May 2022 13:20:09 -0400 Subject: [PATCH] test --- sopel_SpiceBot_Core_Prerun/__init__.py | 52 ++++++++------------------ 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py index 5defebd..b3410f7 100644 --- a/sopel_SpiceBot_Core_Prerun/__init__.py +++ b/sopel_SpiceBot_Core_Prerun/__init__.py @@ -57,16 +57,10 @@ def prerun(): # Run function function(bot, trigger, comrun, *args, **kwargs) - # If not piping the replies into pipe, let'sprint to IRC now - print(comrun.is_pipe_command) + # If not piping the replies into pipe, let's print to IRC now if not comrun.is_pipe_command: for say_message in comrun._say: bot.say(say_message) - # Pipe text back to bot for next piped command - else: - for say_message in comrun._say: - trigger_dict = rebuild_pipes(comrun.commands, say_message) - sb.commands.dispatch(trigger_dict) return internal_prerun return actual_decorator @@ -79,45 +73,29 @@ def rebuild_trigger(comrun, function): return trigger -def rebuild_pipes(commands, trigger_str_add=None): +def rebuild_pipes(commands): - if not trigger_str_add: - repipe_trigger_dict = commands[0] - else: - repipe_trigger_dict = "" + repipe_trigger_dict = commands[0] - trigger_number = 1 for trigger_dict in commands[1:]: - if trigger_str_add and trigger_number == 1: - trigger_str = trigger_dict["trigger_str"] + " %s" % trigger_str_add - else: - trigger_str = trigger_dict["trigger_str"] - - if trigger_str_add: - splitkey_str = "" - else: - splitkey_str = " %s " % sb.commands.pipe_split_key - if trigger_dict["trigger_type"] == "command": - repipe_trigger_dict["trigger_str"] += "%s%s%s %s" % (splitkey_str, - trigger_dict["trigger_prefix"], - trigger_dict["trigger_command"], - trigger_str) + repipe_trigger_dict["trigger_str"] += " %s %s%s %s" % (sb.commands.pipe_split_key, + trigger_dict["trigger_prefix"], + trigger_dict["trigger_command"], + trigger_dict["trigger_str"]) elif trigger_dict["trigger_type"] == "nickname_command": - repipe_trigger_dict["trigger_str"] += "%s%s %s %s" % (splitkey_str, - trigger_dict["trigger_prefix"], - trigger_dict["trigger_command"], - trigger_str) + repipe_trigger_dict["trigger_str"] += " %s %s %s %s" % (sb.commands.pipe_split_key, + trigger_dict["trigger_prefix"], + trigger_dict["trigger_command"], + trigger_dict["trigger_str"]) elif trigger_dict["trigger_type"] == "action_command": - repipe_trigger_dict["trigger_str"] += "%s%s %s %s" % (splitkey_str, - "/me", - trigger_dict["trigger_command"], - trigger_str) - - trigger_number += 1 + repipe_trigger_dict["trigger_str"] += " %s %s %s %s" % (sb.commands.pipe_split_key, + "/me", + trigger_dict["trigger_command"], + trigger_dict["trigger_str"]) return repipe_trigger_dict