From ecef571e6ff3a93c06cdd911f33626f5bd151bd2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 30 Jan 2020 10:11:08 +0000
Subject: [PATCH] Question votes use name field

---
 daemon.py   | 2 ++
 question.py | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/daemon.py b/daemon.py
index 76b5615c..dd2ccdc1 100644
--- a/daemon.py
+++ b/daemon.py
@@ -231,6 +231,8 @@ class PubServer(BaseHTTPRequestHandler):
                              messageId,messageId,None, \
                              False,None,None,None)
         if messageJson:
+            # name field contains the answer
+            messageJson['object']['name']=answer
             if self._postToOutbox(messageJson,__version__,nickname):
                 postFilename= \
                     locatePost(self.server.baseDir,nickname, \
diff --git a/question.py b/question.py
index bddef64e..3b2eb094 100644
--- a/question.py
+++ b/question.py
@@ -23,7 +23,7 @@ def questionUpdateVotes(baseDir: str,nickname: str,domain: str,replyJson: {}) ->
         return None
     if not replyJson['object']['inReplyTo']:
         return None
-    if not replyJson['object'].get('content'):
+    if not replyJson['object'].get('name'):
         return None
     inReplyTo=replyJson['object']['inReplyTo']
     questionPostFilename=locatePost(baseDir,nickname,domain,inReplyTo)
@@ -46,13 +46,13 @@ def questionUpdateVotes(baseDir: str,nickname: str,domain: str,replyJson: {}) ->
         return None
     if not questionJson['object'].get('content'):
         return None
-    content=replyJson['object']['content']
-    # does the reply content match any possible question option?
+    replyVote=replyJson['object']['name']
+    # does the reply name field match any possible question option?
     foundAnswer=None
     for possibleAnswer in questionJson['object']['oneOf']:
         if not possibleAnswer.get('name'):
             continue
-        if possibleAnswer['name'] in content:
+        if possibleAnswer['name'] == replyVote:
             foundAnswer=possibleAnswer
             break
     if not foundAnswer: