From d96a278dbd3049398784f0163c16bb0b58e8ab48 Mon Sep 17 00:00:00 2001
From: Andre Mateus Silva <mateussa@coventry.ac.uk>
Date: Wed, 8 Nov 2017 12:25:18 +0000
Subject: [PATCH] Fixed ask for another question (yes or no detection on
 determineUserInput file)

---
 Server.py             | 11 ++++++-----
 determineUserInput.py |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Server.py b/Server.py
index cdc9e7f..4779ed9 100644
--- a/Server.py
+++ b/Server.py
@@ -55,6 +55,7 @@ def askSomething(answerType, sendMessages, noAnswers, defaultAnswer):
         sendMessage(item, (True if i == len(sendMessages) - 1 else False))
         
     answer = receiveMessage()
+    
     while ((answer[1] != answerType and len(noAnswers) > 0) or
            ((answer[0] == "" or answer[1] in [0, 2]) and len(noAnswers) > 0)):
 
@@ -65,7 +66,7 @@ def askSomething(answerType, sendMessages, noAnswers, defaultAnswer):
                     break
             break
         
-        if (answer[1] == 2): # If the use  asked a questions
+        elif (answer[1] == 2): # If the use  asked a questions
             sendMessage("The answer to that is {}.".format(answer[0]), False)
             sendMessage(noAnswers[0])
             noAnswers.pop(0)
@@ -95,7 +96,7 @@ def qChallenge():
     receivedMessage = askSomething(-1, ["Pick a subject.", cat[0], cat[1], cat[2]],
                 ["You can choose a category from the list above, like 'Music'.",
                  "Hmmm, I see you are afraid of making a mistake."], "Any")
-
+    
     # Get a question and answers, from the user choice
     questionSet = getQuestion(receivedMessage, "")
     if ("Error" in questionSet):
@@ -112,7 +113,7 @@ def qChallenge():
                         ["You can choose one of the options.",
                         "Hmmm, I see you are afraid of making a mistake."], "X")
     else:
-        receivedMessage = askSomething(0, [questionSet["Question"],
+        receivedMessage = askSomething(3, [questionSet["Question"],
                                            "A: {}".format(questionSet["A"]),
                                            "B: {}".format(questionSet["B"])],
                         ["You can choose one of the options.",
@@ -121,7 +122,7 @@ def qChallenge():
     if (receivedMessage[0].casefold() == questionSet["corrAnswer"].casefold()):
         sendMessage("Congratulations! That was the right answer!!", False)
         sendMessage("-" * 50, False)
-        receivedMessage = askSomething(0, ["Would you like to answer another question?"],
+        receivedMessage = askSomething(4, ["Would you like to answer another question?"],
                         ["Are you afraid?? :D.",
                         "Hmmm, I see you are afraid of making a mistake."], "No")
 
@@ -137,7 +138,7 @@ def qChallenge():
                             questionSet[questionSet["corrAnswer"]]), False)
         sendMessage("I know you can get the next one!!", False)
         sendMessage("-" * 50, False)
-        receivedMessage = askSomething(0, ["Would you like to answer another question?"],
+        receivedMessage = askSomething(4, ["Would you like to answer another question?"],
                         ["Are you afraid?? :D.",
                         "Hmmm, I see you are afraid of making a mistake."], "No")
                                            
diff --git a/determineUserInput.py b/determineUserInput.py
index fec0251..c2d9b66 100644
--- a/determineUserInput.py
+++ b/determineUserInput.py
@@ -20,8 +20,10 @@ def determineUserInput(sentence):
         response = respondQuestion(sentence), 2
     elif sentenceParse[0] in greetings:
         response = getName(sentence), 1
-    elif sentenceParse[0] in "abcd":
+    elif sentence in "abcd":
         response = sentence, 3
+    elif (sentence.casefold() == "Yes") or (sentence.casefold() == "No"):
+        response = sentence, 4        
     else:
         response = sentence, 0
     return response