From 9571770e32bb327c09e5ef5105f3cb97cce1dd52 Mon Sep 17 00:00:00 2001
From: Maxim Filippov <colixer@gmail.com>
Date: Tue, 9 Apr 2019 23:02:48 +0200
Subject: [PATCH] Refresh poll

---
 src/components/poll/poll.vue                       |  9 ++++++---
 src/components/poll/poll_results/poll_results.vue  |  8 ++++++--
 src/components/status/status.vue                   |  2 +-
 src/services/api/api.service.js                    | 14 +++++++++++++-
 .../backend_interactor_service.js                  |  9 +++++++--
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 7f671437..7ed4821c 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -1,9 +1,12 @@
 <template>
-  <poll-results v-if="currentUserHasVoted" :poll="poll" />
+  <poll-results
+    v-if="currentUserHasVoted"
+    :poll="poll"
+    v-on:poll-refreshed="handlePollUpdate" />
   <poll-vote
     v-else
     :poll="poll"
-    v-on:user-has-voted="onUserVote" />
+    v-on:user-has-voted="handlePollUpdate" />
 </template>
 
 <script>
@@ -23,7 +26,7 @@ export default {
     }
   },
   methods: {
-    onUserVote (poll) {
+    handlePollUpdate (poll) {
       this.poll = poll
     }
   }
diff --git a/src/components/poll/poll_results/poll_results.vue b/src/components/poll/poll_results/poll_results.vue
index 85d95d73..f7cea6c5 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="#">Refresh</a>&nbsp;·&nbsp;
+        <a href="#" @click="fetchPoll(poll.id)">Refresh</a>&nbsp;·&nbsp;
       </div>
       <div class="total">
         {{totalVotesCount}} {{ $t("polls.votes") }}
@@ -31,8 +31,12 @@ export default {
     }
   },
   methods: {
-    percentageForOption: function (count) {
+    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)
+      this.$emit('poll-refreshed', poll)
     }
   }
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index b10de57e..597d4810 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -110,7 +110,7 @@
             <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">{{$t("general.show_less")}}</a>
           </div>
 
-          <div v-if="status.poll.votes">
+          <div v-if="status.poll && status.poll.votes">
             <poll :poll="status.poll" />
           </div>
 
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index fee77a77..276ae57c 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -46,6 +46,7 @@ const MASTODON_UNMUTE_USER_URL = id => `/api/v1/accounts/${id}/unmute`
 const MASTODON_POST_STATUS_URL = '/api/v1/statuses'
 const MASTODON_MEDIA_UPLOAD_URL = '/api/v1/media'
 const MASTODON_VOTE_URL = '/api/v1/polls/vote'
+const MASTODON_POLL_URL = id => `/api/v1/polls/${id}`
 
 import { each, map } from 'lodash'
 import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'
@@ -658,6 +659,16 @@ const vote = ({pollID, optionName, credentials}) => {
   )
 }
 
+const fetchPoll = ({pollID, credentials}) => {
+  return promisedRequest(
+    MASTODON_POLL_URL(encodeURIComponent(pollID)),
+    {
+      method: 'GET',
+      headers: authHeaders(credentials)
+    }
+  )
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -701,7 +712,8 @@ const apiService = {
   denyUser,
   suggestions,
   markNotificationsAsSeen,
-  vote
+  vote,
+  fetchPoll
 }
 
 export default apiService
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index c642c2d8..3c780492 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -59,7 +59,11 @@ const backendInteractorService = (credentials) => {
   }
 
   const vote = (pollID, optionName) => {
-    return apiService.vote({pollID, optionName})
+    return apiService.vote({credentials, pollID, optionName})
+  }
+
+  const fetchPoll = (pollID) => {
+    return apiService.fetchPoll({credentials, pollID})
   }
 
   const startFetching = ({timeline, store, userId = false, tag}) => {
@@ -121,7 +125,8 @@ const backendInteractorService = (credentials) => {
     fetchFollowRequests,
     approveUser,
     denyUser,
-    vote
+    vote,
+    fetchPoll
   }
 
   return backendInteractorServiceInstance