From 70ba232ce3bd9766b00a50dd428d2008d7d9f3ba Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Thu, 6 Jun 2019 07:33:00 +0300
Subject: [PATCH] fix refreshing

---
 src/components/poll/poll.vue                  |  1 +
 .../poll/poll_results/poll_results.vue        | 10 +++---
 src/components/poll/poll_vote/poll_vote.vue   | 35 +++++++++----------
 src/modules/statuses.js                       |  6 ++++
 src/services/api/api.service.js               | 11 +++---
 .../backend_interactor_service.js             |  8 ++---
 6 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 824adb4d..64f7d740 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -2,6 +2,7 @@
   <poll-results
     v-if="currentUserHasVoted"
     :poll="poll"
+    :status-id="statusId"
     v-on:poll-refreshed="handlePollUpdate"
   />
   <poll-vote
diff --git a/src/components/poll/poll_results/poll_results.vue b/src/components/poll/poll_results/poll_results.vue
index 3eba6d79..3238431a 100644
--- a/src/components/poll/poll_results/poll_results.vue
+++ b/src/components/poll/poll_results/poll_results.vue
@@ -12,7 +12,7 @@
     </div>
     <footer>
       <div class="refresh">
-        <a href="#" @click="fetchPoll(poll.id)">Refresh</a>&nbsp;·&nbsp;
+        <a href="#" @click.stop.prevent="fetchPoll(poll.id)">Refresh</a>&nbsp;·&nbsp;
       </div>
       <div class="total">
         {{totalVotesCount}} {{ $t("polls.votes") }}
@@ -24,7 +24,7 @@
 <script>
 export default {
   name: 'PollResults',
-  props: ['poll'],
+  props: ['poll', 'statusId'],
   created () {
     console.log(this.poll)
   },
@@ -37,10 +37,8 @@ export default {
     percentageForOption (count) {
       return (this.totalVotesCount === 0 ? 0 : (count / this.totalVotesCount * 100)).toFixed(1)
     },
-    async fetchPoll (pollID) {
-      const poll = await this.$store.state.api.backendInteractor.fetchPoll(pollID)
-      console.log(poll)
-      this.$emit('poll-refreshed', poll)
+    fetchPoll () {
+      this.$store.dispatch('refreshPoll', { id: this.statusId, pollId: this.poll.id })
     }
   }
 }
diff --git a/src/components/poll/poll_vote/poll_vote.vue b/src/components/poll/poll_vote/poll_vote.vue
index 3e259fee..69fdc8dd 100644
--- a/src/components/poll/poll_vote/poll_vote.vue
+++ b/src/components/poll/poll_vote/poll_vote.vue
@@ -1,21 +1,24 @@
 <template>
-  <div class="poll-vote" v-bind:class="containerClass">
+  <form class="poll-vote" v-bind:class="containerClass">
     <div
       class="poll-choice"
       v-for="(pollOption, index) in poll.options"
-      :key="index">
-        <input
-          :disabled="loading"
-          type="checkbox"
-          :id="optionID(index)"
-          :value="pollOption.title"
-          name="choice"
-          v-model="checks[index]"
-        >
-        <label :for="optionID(index)">{{pollOption.title}}</label>
+      :key="index"
+    >
+      <input
+        type="checkbox"
+        name="choice"
+        :id="index"
+        :disabled="loading"
+        :value="pollOption.title"
+        v-model="checks[index]"
+      >
+      <label :for="index">
+        {{pollOption.title}}
+      </label>
     </div>
-    <button class="btn btn-default poll-vote-button" @click="onVote">{{$t('polls.vote')}}</button>
-  </div>
+    <button class="btn btn-default poll-vote-button" type="button" @click="vote">{{$t('polls.vote')}}</button>
+  </form>
 </template>
 
 <script>
@@ -36,15 +39,11 @@ export default {
     }
   },
   methods: {
-    optionID (index) {
-      return `pollOption${this.poll.id}#${index}`
-    },
-    onVote () {
+    vote () {
       this.loading = true
 
       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/modules/statuses.js b/src/modules/statuses.js
index e8f094f3..5f09b8f5 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -588,6 +588,12 @@ const statuses = {
         commit('updateStatusWithPoll', { id, poll })
         return poll
       })
+    },
+    refreshPoll ({ rootState, commit }, { id, pollId }) {
+      return rootState.api.backendInteractor.fetchPoll(pollId).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 f421b3ad..e744183f 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -737,13 +737,12 @@ const markNotificationsAsSeen = ({ id, credentials }) => {
   }).then((data) => data.json())
 }
 
-const vote = ({ pollID, choices, credentials }) => {
+const vote = ({ pollId, choices, credentials }) => {
   const form = new FormData()
   form.append('choices', choices)
-  const url = MASTODON_VOTE_URL(encodeURIComponent(pollID))
 
   return promisedRequest({
-    url: MASTODON_VOTE_URL(encodeURIComponent(pollID)),
+    url: MASTODON_VOTE_URL(encodeURIComponent(pollId)),
     method: 'POST',
     credentials,
     payload: {
@@ -752,12 +751,12 @@ const vote = ({ pollID, choices, credentials }) => {
   })
 }
 
-const fetchPoll = ({ pollID, credentials }) => {
+const fetchPoll = ({ pollId, credentials }) => {
   return promisedRequest(
-    MASTODON_POLL_URL(encodeURIComponent(pollID)),
     {
+      url: MASTODON_POLL_URL(encodeURIComponent(pollId)),
       method: 'GET',
-      headers: authHeaders(credentials)
+      credentials
     }
   )
 }
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index d8c4b4cc..df5747a8 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -87,12 +87,12 @@ const backendInteractorService = credentials => {
     return apiService.deleteUser({ screen_name, credentials })
   }
 
-  const vote = (pollID, choices) => {
-    return apiService.vote({ credentials, pollID, choices })
+  const vote = (pollId, choices) => {
+    return apiService.vote({ credentials, pollId, choices })
   }
 
-  const fetchPoll = (pollID) => {
-    return apiService.fetchPoll({ credentials, pollID })
+  const fetchPoll = (pollId) => {
+    return apiService.fetchPoll({ credentials, pollId })
   }
 
   const updateNotificationSettings = ({ settings }) => {