From 080921e97750a8281ea60323999502808fddac94 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Wed, 5 Jun 2019 22:19:13 +0300
Subject: [PATCH] make poll voting update status, making it reactive, fix
 multiple choice voting

---
 src/components/poll/poll.vue                | 13 ++++++++++---
 src/components/poll/poll_vote/poll_vote.vue | 14 +++++++-------
 src/components/status/status.vue            |  2 +-
 src/modules/statuses.js                     | 10 ++++++++++
 src/services/api/api.service.js             |  4 ----
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 0a0b3175..824adb4d 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -2,11 +2,14 @@
   <poll-results
     v-if="currentUserHasVoted"
     :poll="poll"
-    v-on:poll-refreshed="handlePollUpdate" />
+    v-on:poll-refreshed="handlePollUpdate"
+  />
   <poll-vote
     v-else
     :poll="poll"
-    v-on:user-has-voted="handlePollUpdate" />
+    :status-id="statusId"
+    v-on:user-has-voted="handlePollUpdate"
+  />
 </template>
 
 <script>
@@ -15,13 +18,17 @@ import PollVote from './poll_vote/poll_vote.vue'
 
 export default {
   name: 'Poll',
-  props: ['poll'],
+  props: ['poll', 'statusId'],
   components: {
     PollResults,
     PollVote
   },
   computed: {
     currentUserHasVoted () {
+      console.log('currentUserHasVoted poll', this.poll)
+      return this.poll.voted
+    },
+    voted () {
       return this.poll.voted
     }
   },
diff --git a/src/components/poll/poll_vote/poll_vote.vue b/src/components/poll/poll_vote/poll_vote.vue
index 28f568e9..3e259fee 100644
--- a/src/components/poll/poll_vote/poll_vote.vue
+++ b/src/components/poll/poll_vote/poll_vote.vue
@@ -21,7 +21,7 @@
 <script>
 export default {
   name: 'PollVote',
-  props: ['poll'],
+  props: ['poll', 'statusId'],
   data () {
     return {
       loading: false,
@@ -39,14 +39,14 @@ export default {
     optionID (index) {
       return `pollOption${this.poll.id}#${index}`
     },
-    async onVote () {
+    onVote () {
       this.loading = true
 
-      const choices = this.checks.filter(_=>_).map((entry, index) => index)
-      const poll = await this.$store.state.api.backendInteractor.vote(this.poll.id, choices)
-
-      this.loading = false
-      this.$emit('user-has-voted', poll)
+      const choices = this.checks.map((entry, index) => index).filter(value => typeof value === 'number')
+      this.$store.dispatch('votePoll', { id: this.statusId, pollId: this.poll.id, choices }).then(poll => {
+        console.log('vote result:', poll)
+        this.loading = false
+      })
     }
   }
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0712a96b..6b4002a2 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -124,7 +124,7 @@
           </div>
 
           <div v-if="status.poll && status.poll.options">
-            <poll :poll="status.poll" />
+            <poll :poll="status.poll" :status-id="status.id" />
           </div>
 
           <div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body">
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index e6ee5447..e8f094f3 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -494,6 +494,10 @@ export const mutations = {
     const newStatus = state.allStatusesObject[id]
     newStatus.favoritedBy = favoritedByUsers.filter(_ => _)
     newStatus.rebloggedBy = rebloggedByUsers.filter(_ => _)
+  },
+  updateStatusWithPoll (state, { id, poll }) {
+    const status = state.allStatusesObject[id]
+    status.poll = poll
   }
 }
 
@@ -578,6 +582,12 @@ const statuses = {
       ]).then(([favoritedByUsers, rebloggedByUsers]) =>
         commit('addFavsAndRepeats', { id, favoritedByUsers, rebloggedByUsers })
       )
+    },
+    votePoll ({ rootState, commit }, { id, pollId, choices }) {
+      return rootState.api.backendInteractor.vote(pollId, choices).then(poll => {
+        commit('updateStatusWithPoll', { id, poll })
+        return poll
+      })
     }
   },
   mutations
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 74a312aa..f421b3ad 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -739,18 +739,14 @@ const markNotificationsAsSeen = ({ id, credentials }) => {
 
 const vote = ({ pollID, choices, credentials }) => {
   const form = new FormData()
-
   form.append('choices', choices)
-
   const url = MASTODON_VOTE_URL(encodeURIComponent(pollID))
-  console.log(url, choices)
 
   return promisedRequest({
     url: MASTODON_VOTE_URL(encodeURIComponent(pollID)),
     method: 'POST',
     credentials,
     payload: {
-      'test': 'test',
       choices: choices
     }
   })