From a0daa2b5bdeff62f7761bd210620ae0f15b9f099 Mon Sep 17 00:00:00 2001 From: Appelsiini1 <37345715+Appelsiini1@users.noreply.github.com> Date: Tue, 8 Feb 2022 11:18:59 +0200 Subject: [PATCH] Added "!" strip to morning reactions --- constants.py | 2 +- modules/message_listener.py | 20 +++++++++++--------- webhook/versions.txt | 4 ++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/constants.py b/constants.py index 7288b48..296620c 100644 --- a/constants.py +++ b/constants.py @@ -135,4 +135,4 @@ def resetLimits(self): REQUEST_LIMITS = requestLimits() # Version number -VERSION = "v2.0.5" +VERSION = "v2.0.6" diff --git a/modules/message_listener.py b/modules/message_listener.py index d7d7155..93da1b0 100644 --- a/modules/message_listener.py +++ b/modules/message_listener.py @@ -94,6 +94,7 @@ def __init__(self, bot): @commands.Cog.listener() async def on_message(self, message, *args): lower_message = message.content.strip().lower() + lower_message2 = lower_message.strip("!") if message.author.bot == True: return elif message.type in [ @@ -117,15 +118,16 @@ async def on_message(self, message, *args): await message.channel.send(msg) return elif ( - lower_message == "morning" - or lower_message == "merning" - or lower_message == "morn" - or lower_message == "good morning" - or lower_message == "morniing" - or lower_message == "mornin" - or lower_message == "mornign" - or lower_message == "mern" - or lower_message == "morning all" + lower_message2 == "morning" + or lower_message2 == "merning" + or lower_message2 == "morn" + or lower_message2 == "good morning" + or lower_message2 == "morniing" + or lower_message2 == "mornin" + or lower_message2 == "mornign" + or lower_message2 == "mern" + or lower_message2 == "morning all" + or lower_message2 == "good morning everyone!" ): msgIndex = randint(0, self.morning_len - 1) msgToSend = self.morning_messages[msgIndex] + " \N{sparkling heart}" diff --git a/webhook/versions.txt b/webhook/versions.txt index 7754d0e..9b62706 100644 --- a/webhook/versions.txt +++ b/webhook/versions.txt @@ -1,3 +1,7 @@ +v2.0.6 +- Re-enabled morning reactions +- Changed the triggers for morning reactions +### v2.0.4 - Add error handling for HTTP requests in vaccine command ###