From 0cc199de83677d89aed80a87fe931e25eed1209f Mon Sep 17 00:00:00 2001 From: Logan Cusano Date: Wed, 29 Dec 2021 23:47:02 -0500 Subject: [PATCH] Bugfix: WillieTimer --- modules/WillieTimer/cog.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/WillieTimer/cog.py b/modules/WillieTimer/cog.py index edba856..cd3458a 100644 --- a/modules/WillieTimer/cog.py +++ b/modules/WillieTimer/cog.py @@ -132,7 +132,7 @@ class WillieTimer(commands.Cog): if selected_phrase is not None: if selected_phrase != self.current_phrase: self.current_phrase = selected_phrase - return selected_phrase + return selected_phrase.replace('\n', '') else: selected_phrase = None continue @@ -148,20 +148,23 @@ class WillieTimer(commands.Cog): if selected_phrase is not None: if selected_phrase != self.current_phrase: self.current_phrase = selected_phrase - return selected_phrase + return selected_phrase.replace('\n', '') else: selected_phrase = None continue def get_output_string(self): + willie_time_string = "" + warm_up_string = "" + if self.caller_name is not None: + willie_time_string += f"<@&{self.bot_get_user().id}>, " + warm_up_string += f"<@&{self.bot_get_user().id}> & " - willie_time_string = f"<@&{self.bot_get_user().id}>, " if self.caller_name is not None else f'<@&{self.bot_get_role().id}>, ' \ - f"Willie wanted me to tell you:\n" \ - f"\"{self.get_random_420_phrase()}\"\n" \ + willie_time_string = f"Willie wanted me to tell you:\n" \ + f"\"{self.get_random_420_phrase()}\"" \ f"<@&{self.bot_get_role().id}>" - warm_up_string = f"<@&{str(self.bot_get_user().id)}> & " if self.caller_name is not None else '' \ - f"<@&{self.bot_get_role().id}>! Heads up! " \ + warm_up_string = f"<@&{self.bot_get_role().id}>! Heads up! " \ f"Willie's passing an early message along:\n" \ f"\"{self.get_random_warm_up_phrase()}\""