just fixing the cat function so it doesn't appear twice

lycette2 · Nov 23, 2020 · 5729b7c1d0dca96035e88691fd9f83bd9c199161 · 5729b7c
1 parent 1a2390b
commit 5729b7c1d0dca96035e88691fd9f83bd9c199161
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.vs/Chatbot/v16/.suo b/.vs/Chatbot/v16/.suo
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git 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())