From 5729b7c1d0dca96035e88691fd9f83bd9c199161 Mon Sep 17 00:00:00 2001
From: Emily Lycett <lycette2@coventry.ac.uk>
Date: Mon, 23 Nov 2020 14:47:01 +0000
Subject: [PATCH] just fixing the cat function so it doesn't appear twice

---
 .vs/Chatbot/v16/.suo | Bin 43520 -> 43520 bytes
 .vs/slnx.sqlite      | Bin 90112 -> 90112 bytes
 Chatbot.py           |  15 ++++++++-------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.vs/Chatbot/v16/.suo b/.vs/Chatbot/v16/.suo
index f17f770d3c8fc2e610a1025ff33a8a847442440a..6fed232b76c80ff4303ece900baa0eda0ee1933a 100644
GIT binary patch
delta 103
zcmZp;!qjkuX+sVZYXZ}k*yWoGnSL{~8k9W(G1-bk#4;Ee;GhM_HU{!s7EUhowwnCk
ROMP>6bf+~zHPe?00RS?{9H{^R

delta 103
zcmZp;!qjkuX+sVZtAq9g^XAQkOuv~~10t(HOt#_>u_+8NpmSggkeLg_E(<3YdRtBY
R@1?#uI=a)EpqlARg#bat9#sGU

diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 1b837179023845a8c40b9b3472d400aa8e58a2fe..f21362c2aa2d59b0f349b5639b88ed2d6cbb4f80 100644
GIT binary patch
delta 998
zcmY+CUr19?9LIO>^?Fjbb5xR`Iowz_!^(V7!UrqY)CcEuo16c4+>YC&?M}8kVF)Qb
zCBa2I(1U~z(VGyJRG<(-PeR-1De57M-ij<JsK?ITky#h+{rrCS{C>atJ>PRz_T-g4
zdCe*$)|>l;#FI#%L%`e5Iy@`#%awckcb`5M>N`y)Q<FJghwh-aD28nC7kmS^;1cYG
z$nx2;YgxBoOONFgdSU))E}0*i^V<%4zgcS2G3_n5s-kUr#0Zwd4t=)PRMXNToDf7I
zn$D@3FP%(Qf*M)qk{$ZYaZL)}AlFlKBvuJn%_UYdbzBoC<tc;iO2BHIvQwXAH4aDl
zTbhz09-1#SR0~z|1$~09724%LvP&PQdxci{o7}30>6e1D^FThQhghG>#Wg0d8Yg~@
z;MAZy`fpMrn_jU=W3;i@Q5R$#-QDF5ii=I`ZWaRcX0b!?(?`WtakQ51lx*^{d{!T!
zzl&{xkJ?KfVVK5CKBrBeX6;sMxgE!1h9yT}8#&K<y!3s^RXzo{2;eGQM4!+uQcwd5
z!28IAUc()9i1O$*+(MVp8MFcS;URp-PQeZ7^AC;7xKVP6SE5OUsM<xc$ethqr53T`
zJeW1oipgNcNGpDVDI__>vWMwR3Tt5Uq|`3vvLurYFk^j5oF_3b(IB;!U-sh^8C2)f
zV7y*(it|M4iYChM+#qZS`OilXGG=8+T*+!AbL2D_J1upKhLr;#XskyQgk*vXAw^5{
zVJ!;+hM*|chDbJx;{^B(y^5ER*j2U;Mhz)SHpmoS!>Y=}jnIt)`;gBNG?&);GlXc0
z8VAD`$!6?xAf3x(O`GgTH!ibe6^~8;OdF#TB)Q<psZmWytH4{!N}5oLf{*sPRdfq2
zAq}O_S7vt)qHEu)mvOZuh%$(9%yP_dOmj?eOma+cjB|uJLL6fpL5={2pJS9`gu`b5
PnKmI$hdI0tek}Y2x^D%4

delta 725
zcmX|+Uq}=|9LINd+nY|?nbYj06wj{fg!69i)VuRQ`lp@xU<fI_w%(0*OWv;Rj)D~F
zLk~f;DASXH^d3ZY<VzINTjA{)1VM%QCP73&&|~d7>A=kA_xsK7_v8Cr-jtU&<&{%l
zdbNEBOh3Cmse*j%g<4paAKuyd`|kNu5Q^aqA*8f4;d}TaF5wRJ8@)%5(M@z7VP#Kw
zrQBD_%AnFx>k5B6CUrY`c55qkq^;W-*biXD$+2_wa6s6T6Hb<u>T&tA9CI@4K|LyO
z%TcGFy{<>(H{Nd_YjxG;-X<ZK%Yman1Wa>Jc()y-*=<(^DfYyT0+oGmPlF`;<934t
z3pWa&hm{)>5kcq@f}Ne-AOQLmLP{5hG<p~W<+DzleQLyFcvlFajR1O!Ht<WV<4JrR
zZ{Z(!5#Pmmd<L(fFBqWjo*xIXg`L)=e5(`_FBE5WV$dX6@Lo88r7n@`RZ=jmszzb1
zO^S>2HnHqUuQ)NQEs_$<wn)+a;)qryW5$dLGa)G=&JbFx?3adNzdvV@vTjpiU8O{;
zjt#@UlTuDJ%>U_ScEfERg}r`fu|kM7HFr&?70;Uu)4q(NM#qV5Yh?mcNa_?1Eko58
zpxaZPu1lI>c#@KA?Q3{E;mepd>4-%L)r~UjQKSyBOz5aNZ`s1SaB$G!u7JO)LT2X*
z^G1>CrUBzkURMaOFt{78rFRGM>Z8O`Kmwu+^Be;lIgTtxhNGXOkE53(&5`0zIg%U+
XA6QuDSr12C@s)-S<O((X^OyM#e|fxM

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())