diff --git a/.vs/Chatbot/v16/.suo b/.vs/Chatbot/v16/.suo index f17f770..6fed232 100644 Binary files a/.vs/Chatbot/v16/.suo and b/.vs/Chatbot/v16/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 1b83717..f21362c 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Chatbot.py b/Chatbot.py index 3e5c27f..1657219 100644 --- a/Chatbot.py +++ b/Chatbot.py @@ -377,15 +377,16 @@ async def on_message(message): #checks for a message #except: #await message.channel.send(noSteamIDErrorReplies()) - if "cat" in message.content.lower() or "kitten" in message.content.lower(): - await message.channel.send(catMessage()) - await message.channel.send(iNeedACat()) - sadWords = ["sad", "upset", "unhappy", "depressed", "miserable", "despair", "dejected", "glum", "gloomy", "broken heart", "forlorn", "heartbroken", "melancholy", "woebegone", "cry",] firstPersonWords = [" i ", "me", "we", "i am", "i'm", "my"] - if [entry for entry in sadWords if(entry in message.content.lower())] and ([entry for entry in firstPersonWords if(entry in message.content.lower())] or message.content.lower().startswith("i")): - await message.channel.send(cheerUpWithCats()) - await message.channel.send(iNeedACat()) + if "cat" in message.content.lower() or "kitten" in message.content.lower(): + + if [entry for entry in sadWords if(entry in message.content.lower())] and ([entry for entry in firstPersonWords if(entry in message.content.lower())] or message.content.lower().startswith("i")): + await message.channel.send(cheerUpWithCats()) + await message.channel.send(iNeedACat()) + else: + await message.channel.send(catMessage()) + await message.channel.send(iNeedACat()) if "help" in message.content.lower() and "bot" in message.content.lower(): await message.channel.send(helpFunction())