From 90fda1f24592a1acaa4a4700e63a38e483c4241d Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 17 Jun 2019 13:48:54 -0400
Subject: [PATCH 01/19] reset margin property of form controls

---
 src/App.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.scss b/src/App.scss
index ff7fb5dc6..db9f62f02 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -131,6 +131,7 @@ input, textarea, .select {
   font-family: sans-serif;
   font-family: var(--inputFont, sans-serif);
   font-size: 14px;
+  margin: 0;
   padding: 8px .5em;
   box-sizing: border-box;
   display: inline-block;

From 066efd5b3c3389c066a2550644447bc876b0a1d5 Mon Sep 17 00:00:00 2001
From: Wyatt Benno <wyattbenno@gmail.com>
Date: Thu, 20 Jun 2019 16:15:49 +0900
Subject: [PATCH 02/19] A small sass fix for #577

---
 src/components/user_profile/user_profile.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 48b774eaf..bb5ab7054 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -76,6 +76,11 @@
 
 <style lang="scss">
 
+button:disabled {
+    cursor: not-allowed;
+    opacity: 1;
+}
+
 .user-profile {
   flex: 2;
   flex-basis: 500px;

From 44a03922e60335215eb93f14441f5905405b7ecc Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Thu, 20 Jun 2019 13:00:10 +0000
Subject: [PATCH 03/19] Fix/messed up long polls

---
 src/App.scss                 |  2 ++
 src/components/poll/poll.vue | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index db9f62f02..e4c764bf0 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -200,6 +200,7 @@ input, textarea, .select {
       }
     }
     + label::before {
+      flex-shrink: 0;
       display: inline-block;
       content: '';
       transition: box-shadow 200ms;
@@ -236,6 +237,7 @@ input, textarea, .select {
       }
     }
     + label::before {
+      flex-shrink: 0;
       display: inline-block;
       content: '✔';
       transition: color 200ms;
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 28e9f4a86..4c765ae2f 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -31,8 +31,8 @@
           :disabled="loading"
           :value="index"
         >
-        <label>
-          {{option.title}}
+        <label class="option-vote">
+          <div>{{option.title}}</div>
         </label>
       </div>
     </div>
@@ -68,8 +68,7 @@
     margin: 0 0 0.5em;
   }
   .poll-option {
-    margin: 0.5em 0;
-    height: 1.5em;
+    margin: 0.75em 0.5em;
   }
   .option-result {
     height: 100%;
@@ -87,6 +86,7 @@
   }
   .result-percentage {
     width: 3.5em;
+    flex-shrink: 0;
   }
   .result-fill {
     height: 100%;
@@ -99,6 +99,10 @@
     left: 0;
     transition: width 0.5s;
   }
+  .option-vote {
+    display: flex;
+    align-items: center;
+  }
   input {
     width: 3.5em;
   }

From e5e9bb27f3a0825b695684a503ea7e5e75073734 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Thu, 20 Jun 2019 13:02:04 +0000
Subject: [PATCH 04/19] Move poll state handling to its own module

---
 src/components/poll/poll.js      | 35 ++++++++-------
 src/components/poll/poll.vue     |  4 +-
 src/components/status/status.vue |  2 +-
 src/main.js                      |  4 +-
 src/modules/polls.js             | 73 ++++++++++++++++++++++++++++++++
 src/modules/statuses.js          | 12 ------
 6 files changed, 96 insertions(+), 34 deletions(-)
 create mode 100644 src/modules/polls.js

diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index ecacbc350..9988070e9 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -3,26 +3,33 @@ import { forEach, map } from 'lodash'
 
 export default {
   name: 'Poll',
-  props: ['poll', 'statusId'],
+  props: ['pollId'],
   components: { Timeago },
   data () {
     return {
       loading: false,
-      choices: [],
-      refreshInterval: null
+      choices: []
     }
   },
-  created () {
-    this.refreshInterval = setTimeout(this.refreshPoll, 30 * 1000)
-    // Initialize choices to booleans and set its length to match options
-    this.choices = this.poll.options.map(_ => false)
+  mounted () {
+    this.$store.dispatch('trackPoll', this.pollId)
   },
   destroyed () {
-    clearTimeout(this.refreshInterval)
+    this.$store.dispatch('untrackPoll', this.pollId)
   },
   computed: {
+    poll () {
+      const storePoll = this.$store.state.polls.pollsObject[this.pollId]
+      return storePoll || {}
+    },
+    options () {
+      return (this.poll && this.poll.options) || []
+    },
+    expiresAt () {
+      return (this.poll && this.poll.expires_at) || 0
+    },
     expired () {
-      return Date.now() > Date.parse(this.poll.expires_at)
+      return Date.now() > Date.parse(this.expiresAt)
     },
     loggedIn () {
       return this.$store.state.users.currentUser
@@ -33,9 +40,6 @@ export default {
     totalVotesCount () {
       return this.poll.votes_count
     },
-    expiresAt () {
-      return Date.parse(this.poll.expires_at).toLocaleString()
-    },
     containerClass () {
       return {
         loading: this.loading
@@ -55,11 +59,6 @@ export default {
     }
   },
   methods: {
-    refreshPoll () {
-      if (this.expired) return
-      this.fetchPoll()
-      this.refreshInterval = setTimeout(this.refreshPoll, 30 * 1000)
-    },
     percentageForOption (count) {
       return this.totalVotesCount === 0 ? 0 : Math.round(count / this.totalVotesCount * 100)
     },
@@ -104,4 +103,4 @@ export default {
       })
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 4c765ae2f..bb67101af 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -2,7 +2,7 @@
   <div class="poll" v-bind:class="containerClass">
     <div
       class="poll-option"
-      v-for="(option, index) in poll.options"
+      v-for="(option, index) in options"
       :key="index"
     >
       <div v-if="showResults" :title="resultTitle(option)" class="option-result">
@@ -50,7 +50,7 @@
         {{totalVotesCount}} {{ $t("polls.votes") }}&nbsp;·&nbsp;
       </div>
       <i18n :path="expired ? 'polls.expired' : 'polls.expires_in'">
-        <Timeago :time="this.poll.expires_at" :auto-update="60" :now-threshold="0" />
+        <Timeago :time="this.expiresAt" :auto-update="60" :now-threshold="0" />
       </i18n>
     </div>
   </div>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 58402f7e2..821a7a832 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" :status-id="status.id" />
+            <poll :poll-id="status.poll.id" />
           </div>
 
           <div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body">
diff --git a/src/main.js b/src/main.js
index d0f2674b6..3287fa2b8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,6 +14,7 @@ import authFlowModule from './modules/auth_flow.js'
 import mediaViewerModule from './modules/media_viewer.js'
 import oauthTokensModule from './modules/oauth_tokens.js'
 import reportsModule from './modules/reports.js'
+import pollsModule from './modules/polls.js'
 
 import VueI18n from 'vue-i18n'
 
@@ -72,7 +73,8 @@ const persistedStateOptions = {
       authFlow: authFlowModule,
       mediaViewer: mediaViewerModule,
       oauthTokens: oauthTokensModule,
-      reports: reportsModule
+      reports: reportsModule,
+      polls: pollsModule
     },
     plugins: [persistedState, pushNotifications],
     strict: false // Socket modifies itself, let's ignore this for now.
diff --git a/src/modules/polls.js b/src/modules/polls.js
new file mode 100644
index 000000000..0f0964aa9
--- /dev/null
+++ b/src/modules/polls.js
@@ -0,0 +1,73 @@
+import { each, merge } from 'lodash'
+import { set } from 'vue'
+
+const polls = {
+  state: {
+    // Contains key = id, value = number of trackers for this poll
+    trackedPolls: {},
+    pollsObject: {}
+  },
+  mutations: {
+    addNewStatuses (state, { statuses }) {
+      each(statuses, status => {
+        if (status.poll) {
+          set(state.pollsObject, status.poll.id, status.poll)
+        }
+      })
+    },
+    mergePoll (state, poll) {
+      state.pollsObject[poll.id] = merge(state.pollsObject[poll.id], poll)
+    },
+    trackPoll (state, pollId) {
+      const currentValue = state.trackedPolls[pollId]
+      if (currentValue) {
+        set(state.trackedPolls, pollId, currentValue + 1)
+      } else {
+        set(state.trackedPolls, pollId, 1)
+      }
+    },
+    untrackPoll (state, pollId) {
+      const currentValue = state.trackedPolls[pollId]
+      if (currentValue) {
+        set(state.trackedPolls, pollId, currentValue - 1)
+      } else {
+        set(state.trackedPolls, pollId, 0)
+      }
+    }
+  },
+  actions: {
+    updatePoll ({ rootState, commit }, pollId) {
+      return rootState.api.backendInteractor.fetchPoll(pollId).then(poll => {
+        commit('mergePoll', poll)
+        return poll
+      })
+    },
+    updateTrackedPoll ({ rootState, dispatch, commit }, pollId) {
+      rootState.api.backendInteractor.fetchPoll(pollId).then(poll => {
+        setTimeout(() => {
+          if (rootState.polls.trackedPolls[pollId]) {
+            dispatch('updateTrackedPoll', pollId)
+          }
+        }, 30 * 1000)
+        commit('mergePoll', poll)
+      })
+    },
+    trackPoll ({ rootState, commit, dispatch }, pollId) {
+      if (!rootState.polls.trackedPolls[pollId]) {
+        setTimeout(() => dispatch('updateTrackedPoll', pollId), 30 * 1000)
+      }
+      commit('trackPoll', pollId)
+    },
+    untrackPoll ({ commit }, pollId) {
+      commit('untrackPoll', pollId)
+    },
+    votePoll ({ rootState, commit }, { id, pollId, choices }) {
+      return rootState.api.backendInteractor.vote(pollId, choices).then(poll => {
+        commit('mergePoll', poll)
+        return poll
+      })
+    }
+  }
+}
+
+export default polls
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5f09b8f57..235098d3d 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -582,18 +582,6 @@ 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
-      })
-    },
-    refreshPoll ({ rootState, commit }, { id, pollId }) {
-      return rootState.api.backendInteractor.fetchPoll(pollId).then(poll => {
-        commit('updateStatusWithPoll', { id, poll })
-        return poll
-      })
     }
   },
   mutations

From 268e9ce5042cc89707204153b64f04f1c1b9e0e0 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 19 Jun 2019 23:11:39 -0400
Subject: [PATCH 05/19] make sure to clear old token when logout

---
 src/lib/persisted_state.js | 3 ++-
 src/modules/oauth.js       | 4 ++++
 src/modules/users.js       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 7ab89c123..cad7ea256 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -19,7 +19,8 @@ const saveImmedeatelyActions = [
   'setHighlight',
   'setOption',
   'setClientData',
-  'setToken'
+  'setToken',
+  'clearToken'
 ]
 
 const defaultStorage = (() => {
diff --git a/src/modules/oauth.js b/src/modules/oauth.js
index 11cb10fe3..b7755b640 100644
--- a/src/modules/oauth.js
+++ b/src/modules/oauth.js
@@ -22,6 +22,10 @@ const oauth = {
     },
     setToken (state, token) {
       state.userToken = token
+    },
+    clearToken (state) {
+      state.userToken = false
+      state.token = false
     }
   },
   getters: {
diff --git a/src/modules/users.js b/src/modules/users.js
index 22340271e..1e0b16f59 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -399,7 +399,7 @@ const users = {
     logout (store) {
       store.commit('clearCurrentUser')
       store.dispatch('disconnectFromChat')
-      store.commit('setToken', false)
+      store.commit('clearToken')
       store.dispatch('stopFetching', 'friends')
       store.commit('setBackendInteractor', backendInteractorService(store.getters.getToken()))
       store.dispatch('stopFetching', 'notifications')

From c23228f1967547e7df1462efa7b3bcc1a9a96319 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 19 Jun 2019 23:12:25 -0400
Subject: [PATCH 06/19] fix error breaking logout flow

---
 src/modules/chat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/chat.js b/src/modules/chat.js
index 2804e5776..4d8d66996 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -21,7 +21,7 @@ const chat = {
   },
   actions: {
     disconnectFromChat (store) {
-      store.state.socket.disconnect()
+      store.state.socket && store.state.socket.disconnect()
     },
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')

From 8a32731e4d3772e79b3de35185de3454663be52d Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 19 Jun 2019 23:20:14 -0400
Subject: [PATCH 07/19] use clientSecret in login flow

---
 src/components/login_form/login_form.js         | 3 ++-
 src/components/oauth_callback/oauth_callback.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index 932146462..4a5b19655 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -26,9 +26,10 @@ const LoginForm = {
       this.isTokenAuth ? this.submitToken() : this.submitPassword()
     },
     submitToken () {
-      const { clientId } = this.oauth
+      const { clientId, clientSecret } = this.oauth
       const data = {
         clientId,
+        clientSecret,
         instance: this.instance.server,
         commit: this.$store.commit
       }
diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js
index 2c6ca235a..a3c7b7f98 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -4,10 +4,11 @@ const oac = {
   props: ['code'],
   mounted () {
     if (this.code) {
-      const { clientId } = this.$store.state.oauth
+      const { clientId, clientSecret } = this.$store.state.oauth
 
       oauth.getToken({
         clientId,
+        clientSecret,
         instance: this.$store.state.instance.server,
         code: this.code
       }).then((result) => {

From bd377148ade7aaf26652dc14ee77683b7e6c8c5a Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 20 Jun 2019 11:47:33 -0400
Subject: [PATCH 08/19] delete state.token instead of setting false

---
 src/modules/oauth.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/oauth.js b/src/modules/oauth.js
index b7755b640..a2a834503 100644
--- a/src/modules/oauth.js
+++ b/src/modules/oauth.js
@@ -1,3 +1,5 @@
+import { delete as del } from 'vue'
+
 const oauth = {
   state: {
     clientId: false,
@@ -25,7 +27,9 @@ const oauth = {
     },
     clearToken (state) {
       state.userToken = false
-      state.token = false
+      // state.token is userToken with older name, coming from persistent state
+      // let's clear it as well, since it is being used as a fallback of state.userToken
+      del(state, 'token')
     }
   },
   getters: {

From 308c4c97897ba25ee7a17e2c1ae815c08a11cfc6 Mon Sep 17 00:00:00 2001
From: Wyatt Benno <wyattbenno@gmail.com>
Date: Fri, 21 Jun 2019 08:35:02 +0900
Subject: [PATCH 09/19] Make scss change for tab switcher only

---
 src/components/user_profile/user_profile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index bb5ab7054..e5c49ff1f 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -76,7 +76,7 @@
 
 <style lang="scss">
 
-button:disabled {
+.tab-switcher button:disabled {
     cursor: not-allowed;
     opacity: 1;
 }

From a1c50c3fc1a8613c0c6dec9d366808a32b09bda4 Mon Sep 17 00:00:00 2001
From: Wyatt Benno <wyattbenno@gmail.com>
Date: Fri, 21 Jun 2019 10:31:00 +0900
Subject: [PATCH 10/19] fix for #553

---
 src/modules/statuses.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5f09b8f57..4fcfcdd2a 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -146,7 +146,8 @@ const removeStatusFromGlobalStorage = (state, status) => {
   }
 }
 
-const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {}, noIdUpdate = false, userId }) => {
+const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {},
+  noIdUpdate = false, userId, isPinned = false }) => {
   // Sanity check
   if (!isArray(statuses)) {
     return false
@@ -160,10 +161,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   const newer = timeline && (maxNew > timelineObject.maxId || timelineObject.maxId === 0) && statuses.length > 0
   const older = timeline && (minNew < timelineObject.minId || timelineObject.minId === 0) && statuses.length > 0
 
-  if (!noIdUpdate && newer) {
+  if (!noIdUpdate && newer && !isPinned) {
     timelineObject.maxId = maxNew
   }
-  if (!noIdUpdate && older) {
+  if (!noIdUpdate && older && !isPinned) {
     timelineObject.minId = minNew
   }
 
@@ -504,8 +505,8 @@ export const mutations = {
 const statuses = {
   state: defaultState(),
   actions: {
-    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId }) {
-      commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId })
+    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId, isPinned = false }) {
+      commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId, isPinned })
     },
     addNewNotifications ({ rootState, commit, dispatch, rootGetters }, { notifications, older }) {
       commit('addNewNotifications', { visibleNotificationTypes: visibleNotificationTypes(rootState), dispatch, notifications, older, rootGetters })
@@ -543,7 +544,7 @@ const statuses = {
     },
     fetchPinnedStatuses ({ rootState, dispatch }, userId) {
       rootState.api.backendInteractor.fetchPinnedStatuses(userId)
-        .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true }))
+        .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true, isPinned: true }))
     },
     pinStatus ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.pinOwnStatus(statusId)

From 30a340955ef1d96a4298e7122a99f12f33c97fd4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Sat, 22 Jun 2019 13:41:02 +0000
Subject: [PATCH 11/19] Move character counter into the input box

---
 .../post_status_form/post_status_form.js      |  7 ++--
 .../post_status_form/post_status_form.vue     | 32 ++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 5dbb1c9df..ef6b0fce7 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -269,8 +269,11 @@ const PostStatusForm = {
     resize (e) {
       const target = e.target || e
       if (!(target instanceof window.Element)) { return }
-      const vertPadding = Number(window.getComputedStyle(target)['padding-top'].substr(0, 1)) +
-            Number(window.getComputedStyle(target)['padding-bottom'].substr(0, 1))
+      const topPaddingStr = window.getComputedStyle(target)['padding-top']
+      const bottomPaddingStr = window.getComputedStyle(target)['padding-bottom']
+      // Remove "px" at the end of the values
+      const vertPadding = Number(topPaddingStr.substr(0, topPaddingStr.length - 2)) +
+            Number(bottomPaddingStr.substr(0, bottomPaddingStr.length - 2))
       // Auto is needed to make textbox shrink when removing lines
       target.style.height = 'auto'
       target.style.height = `${target.scrollHeight - vertPadding}px`
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index fbeaf39b9..67cdc7218 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -48,7 +48,7 @@
       <EmojiInput
         :suggest="emojiUserSuggestor"
         v-model="newStatus.status"
-        class="form-control"
+        class="form-control main-input"
         >
         <textarea
           ref="textarea"
@@ -65,6 +65,13 @@
           class="form-post-body"
         >
         </textarea>
+        <p
+          v-if="hasStatusLengthLimit"
+          class="character-counter faint"
+          :class="{ error: isOverLengthLimit }"
+        >
+          {{ charactersLeft }}
+        </p>
       </EmojiInput>
       <div class="visibility-tray">
         <div class="text-format" v-if="postFormats.length > 1">
@@ -109,8 +116,6 @@
           />
         </div>
       </div>
-      <p v-if="isOverLengthLimit" class="error">{{ charactersLeft }}</p>
-      <p class="faint" v-else-if="hasStatusLengthLimit">{{ charactersLeft }}</p>
 
       <button v-if="posting" disabled class="btn btn-default">{{$t('post_status.posting')}}</button>
       <button v-else-if="isOverLengthLimit" disabled class="btn btn-default">{{$t('general.submit')}}</button>
@@ -304,10 +309,12 @@
   }
 
   .form-post-body {
-    line-height:16px;
+    height: 16px; // Only affects the empty-height
+    line-height: 16px;
     resize: none;
     overflow: hidden;
     transition: min-height 200ms 100ms;
+    padding-bottom: 1.75em;
     min-height: 1px;
     box-sizing: content-box;
   }
@@ -316,6 +323,23 @@
     min-height: 48px;
   }
 
+  .main-input {
+    position: relative;
+  }
+
+  .character-counter {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    padding: 0;
+    margin: 0 0.5em;
+
+    &.error {
+      color: $fallback--cRed;
+      color: var(--cRed, $fallback--cRed);
+    }
+  }
+
   .btn {
     cursor: pointer;
   }

From 947f69a9531a7d99e79df3fc05f5e795de717dc6 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Sat, 22 Jun 2019 14:01:36 +0000
Subject: [PATCH 12/19] Fix: problems with polls state

---
 src/components/poll/poll.js      | 12 +++++++++---
 src/components/status/status.vue |  2 +-
 src/modules/polls.js             | 31 ++++++++++++++-----------------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index 9988070e9..98db5582e 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -3,7 +3,7 @@ import { forEach, map } from 'lodash'
 
 export default {
   name: 'Poll',
-  props: ['pollId'],
+  props: ['basePoll'],
   components: { Timeago },
   data () {
     return {
@@ -11,13 +11,19 @@ export default {
       choices: []
     }
   },
-  mounted () {
+  created () {
+    if (!this.$store.state.polls.pollsObject[this.pollId]) {
+      this.$store.dispatch('mergeOrAddPoll', this.basePoll)
+    }
     this.$store.dispatch('trackPoll', this.pollId)
   },
   destroyed () {
     this.$store.dispatch('untrackPoll', this.pollId)
   },
   computed: {
+    pollId () {
+      return this.basePoll.id
+    },
     poll () {
       const storePoll = this.$store.state.polls.pollsObject[this.pollId]
       return storePoll || {}
@@ -29,7 +35,7 @@ export default {
       return (this.poll && this.poll.expires_at) || 0
     },
     expired () {
-      return Date.now() > Date.parse(this.expiresAt)
+      return (this.poll && this.poll.expired) || false
     },
     loggedIn () {
       return this.$store.state.users.currentUser
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 821a7a832..440e19575 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-id="status.poll.id" />
+            <poll :base-poll="status.poll" />
           </div>
 
           <div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body">
diff --git a/src/modules/polls.js b/src/modules/polls.js
index 0f0964aa9..e6158b63f 100644
--- a/src/modules/polls.js
+++ b/src/modules/polls.js
@@ -1,4 +1,4 @@
-import { each, merge } from 'lodash'
+import { merge } from 'lodash'
 import { set } from 'vue'
 
 const polls = {
@@ -8,15 +8,15 @@ const polls = {
     pollsObject: {}
   },
   mutations: {
-    addNewStatuses (state, { statuses }) {
-      each(statuses, status => {
-        if (status.poll) {
-          set(state.pollsObject, status.poll.id, status.poll)
-        }
-      })
-    },
-    mergePoll (state, poll) {
-      state.pollsObject[poll.id] = merge(state.pollsObject[poll.id], poll)
+    mergeOrAddPoll (state, poll) {
+      const existingPoll = state.pollsObject[poll.id]
+      // Make expired-state change trigger re-renders properly
+      poll.expired = Date.now() > Date.parse(poll.expires_at)
+      if (existingPoll) {
+        set(state.pollsObject, poll.id, merge(existingPoll, poll))
+      } else {
+        set(state.pollsObject, poll.id, poll)
+      }
     },
     trackPoll (state, pollId) {
       const currentValue = state.trackedPolls[pollId]
@@ -36,11 +36,8 @@ const polls = {
     }
   },
   actions: {
-    updatePoll ({ rootState, commit }, pollId) {
-      return rootState.api.backendInteractor.fetchPoll(pollId).then(poll => {
-        commit('mergePoll', poll)
-        return poll
-      })
+    mergeOrAddPoll ({ commit }, poll) {
+      commit('mergeOrAddPoll', poll)
     },
     updateTrackedPoll ({ rootState, dispatch, commit }, pollId) {
       rootState.api.backendInteractor.fetchPoll(pollId).then(poll => {
@@ -49,7 +46,7 @@ const polls = {
             dispatch('updateTrackedPoll', pollId)
           }
         }, 30 * 1000)
-        commit('mergePoll', poll)
+        commit('mergeOrAddPoll', poll)
       })
     },
     trackPoll ({ rootState, commit, dispatch }, pollId) {
@@ -63,7 +60,7 @@ const polls = {
     },
     votePoll ({ rootState, commit }, { id, pollId, choices }) {
       return rootState.api.backendInteractor.vote(pollId, choices).then(poll => {
-        commit('mergePoll', poll)
+        commit('mergeOrAddPoll', poll)
         return poll
       })
     }

From 7a5d06a6cf02e9df82d5479e27a86c26507ace58 Mon Sep 17 00:00:00 2001
From: Wyatt Benno <wyattbenno@gmail.com>
Date: Mon, 24 Jun 2019 12:01:13 +0900
Subject: [PATCH 13/19] change isPinned to noIdUpdate

---
 src/modules/statuses.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 4fcfcdd2a..262ff80ad 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -147,7 +147,7 @@ const removeStatusFromGlobalStorage = (state, status) => {
 }
 
 const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {},
-  noIdUpdate = false, userId, isPinned = false }) => {
+  noIdUpdate = false, userId }) => {
   // Sanity check
   if (!isArray(statuses)) {
     return false
@@ -161,10 +161,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   const newer = timeline && (maxNew > timelineObject.maxId || timelineObject.maxId === 0) && statuses.length > 0
   const older = timeline && (minNew < timelineObject.minId || timelineObject.minId === 0) && statuses.length > 0
 
-  if (!noIdUpdate && newer && !isPinned) {
+  if (!noIdUpdate && newer) {
     timelineObject.maxId = maxNew
   }
-  if (!noIdUpdate && older && !isPinned) {
+  if (!noIdUpdate && older) {
     timelineObject.minId = minNew
   }
 
@@ -505,8 +505,8 @@ export const mutations = {
 const statuses = {
   state: defaultState(),
   actions: {
-    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId, isPinned = false }) {
-      commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId, isPinned })
+    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId }) {
+      commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId })
     },
     addNewNotifications ({ rootState, commit, dispatch, rootGetters }, { notifications, older }) {
       commit('addNewNotifications', { visibleNotificationTypes: visibleNotificationTypes(rootState), dispatch, notifications, older, rootGetters })
@@ -544,7 +544,7 @@ const statuses = {
     },
     fetchPinnedStatuses ({ rootState, dispatch }, userId) {
       rootState.api.backendInteractor.fetchPinnedStatuses(userId)
-        .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true, isPinned: true }))
+        .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true, noIdUpdate: true }))
     },
     pinStatus ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.pinOwnStatus(statusId)

From 1c03bd0ebcf8781a4c385bdf54a5dd458fa557c1 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 24 Jun 2019 07:49:22 -0400
Subject: [PATCH 14/19] add resolve param to user search api request

---
 src/services/new_api/user_search.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/services/new_api/user_search.js b/src/services/new_api/user_search.js
index 869afa9c9..c5a87cce3 100644
--- a/src/services/new_api/user_search.js
+++ b/src/services/new_api/user_search.js
@@ -6,7 +6,8 @@ const search = ({query, store}) => {
     store,
     url: '/api/v1/accounts/search',
     params: {
-      q: query
+      q: query,
+      resolve: true
     }
   })
   .then((data) => data.json())

From f2d84ef233a47872d959b5cf414f93a1e68638cc Mon Sep 17 00:00:00 2001
From: Wyatt Benno <wyattbenno@gmail.com>
Date: Tue, 25 Jun 2019 10:27:41 +0900
Subject: [PATCH 15/19] Keep statuses always enabled

---
 src/components/user_profile/user_profile.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index e5c49ff1f..84a159dab 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -3,7 +3,7 @@
   <div v-if="user" class="user-profile panel panel-default">
     <UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
     <tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
-      <div :label="$t('user_card.statuses')" :disabled="!user.statuses_count">
+      <div :label="$t('user_card.statuses')">
         <div class="timeline">
           <template v-for="statusId in user.pinnedStatuseIds">
             <Conversation
@@ -76,11 +76,6 @@
 
 <style lang="scss">
 
-.tab-switcher button:disabled {
-    cursor: not-allowed;
-    opacity: 1;
-}
-
 .user-profile {
   flex: 2;
   flex-basis: 500px;

From b059deb551c25ca08871bce9d089ddd509e9b2e1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 25 Jun 2019 16:30:21 +0000
Subject: [PATCH 16/19] fix specificity that made attachments misalign

---
 src/components/gallery/gallery.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue
index ea525c95c..f0433f10f 100644
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@@ -28,7 +28,9 @@
   flex-grow: 1;
   margin-top: 0.5em;
 
-  .attachments, .attachment {
+  // FIXME: specificity problem with this and .attachments.attachment
+  // we shouldn't have the need for .image here
+  .attachment.image {
     margin: 0 0.5em 0 0;
     flex-grow: 1;
     height: 100%;

From 01bda605a7897a35e8e68f44d70edb804eeb417c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 25 Jun 2019 21:31:43 +0300
Subject: [PATCH 17/19] fix all known problems with clicks on autocomplete
 emojis

---
 src/components/emoji-input/emoji-input.js  | 20 ++++++++++++++------
 src/components/emoji-input/emoji-input.vue |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/emoji-input/emoji-input.js b/src/components/emoji-input/emoji-input.js
index 0955a37e3..f81669b93 100644
--- a/src/components/emoji-input/emoji-input.js
+++ b/src/components/emoji-input/emoji-input.js
@@ -59,7 +59,8 @@ const EmojiInput = {
       input: undefined,
       highlighted: 0,
       caret: 0,
-      focused: false
+      focused: false,
+      blurTimeout: false,
     }
   },
   computed: {
@@ -122,12 +123,12 @@ const EmojiInput = {
       this.$emit('input', newValue)
       this.caret = 0
     },
-    replaceText (e) {
+    replaceText (e, suggestion) {
       const len = this.suggestions.length || 0
       if (this.textAtCaret.length === 1) { return }
-      if (len > 0) {
-        const suggestion = this.suggestions[this.highlighted]
-        const replacement = suggestion.replacement
+      if (len > 0 || suggestion) {
+        const chosenSuggestion = suggestion || this.suggestions[this.highlighted]
+        const replacement = chosenSuggestion.replacement
         const newValue = Completion.replaceWord(this.value, this.wordAtCaret, replacement)
         this.$emit('input', newValue)
         this.highlighted = 0
@@ -173,13 +174,20 @@ const EmojiInput = {
     onBlur (e) {
       // Clicking on any suggestion removes focus from autocomplete,
       // preventing click handler ever executing.
-      setTimeout(() => {
+      this.blurTimeout = setTimeout(() => {
         this.focused = false
         this.setCaret(e)
         this.resize()
       }, 200)
     },
+    onClick (e, suggestion) {
+      this.replaceText(e, suggestion)
+    },
     onFocus (e) {
+      if (this.blurTimeout) {
+        clearTimeout(this.blurTimeout)
+      }
+
       this.focused = true
       this.setCaret(e)
       this.resize()
diff --git a/src/components/emoji-input/emoji-input.vue b/src/components/emoji-input/emoji-input.vue
index 8437a4959..12d7d8a77 100644
--- a/src/components/emoji-input/emoji-input.vue
+++ b/src/components/emoji-input/emoji-input.vue
@@ -6,7 +6,7 @@
       <div
         v-for="(suggestion, index) in suggestions"
         :key="index"
-        @click.stop.prevent="replaceText"
+        @click.stop.prevent="(e) => onClick(e, suggestion)"
         class="autocomplete-item"
         :class="{ highlighted: suggestion.highlighted }"
         >

From 9dbafa4c78fb1a179b707320997ca3dbee982ba3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 25 Jun 2019 21:39:33 +0300
Subject: [PATCH 18/19] lint fix

---
 src/components/emoji-input/emoji-input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/emoji-input/emoji-input.js b/src/components/emoji-input/emoji-input.js
index f81669b93..dc16ba8ad 100644
--- a/src/components/emoji-input/emoji-input.js
+++ b/src/components/emoji-input/emoji-input.js
@@ -60,7 +60,7 @@ const EmojiInput = {
       highlighted: 0,
       caret: 0,
       focused: false,
-      blurTimeout: false,
+      blurTimeout: false
     }
   },
   computed: {

From 82464b3a7efedd3bfee7f652c1465b386c3be1b9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 26 Jun 2019 00:34:09 +0300
Subject: [PATCH 19/19] review

---
 src/components/emoji-input/emoji-input.js  | 3 ++-
 src/components/emoji-input/emoji-input.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/emoji-input/emoji-input.js b/src/components/emoji-input/emoji-input.js
index dc16ba8ad..cd0247df2 100644
--- a/src/components/emoji-input/emoji-input.js
+++ b/src/components/emoji-input/emoji-input.js
@@ -60,7 +60,7 @@ const EmojiInput = {
       highlighted: 0,
       caret: 0,
       focused: false,
-      blurTimeout: false
+      blurTimeout: null
     }
   },
   computed: {
@@ -186,6 +186,7 @@ const EmojiInput = {
     onFocus (e) {
       if (this.blurTimeout) {
         clearTimeout(this.blurTimeout)
+        this.blurTimeout = null
       }
 
       this.focused = true
diff --git a/src/components/emoji-input/emoji-input.vue b/src/components/emoji-input/emoji-input.vue
index 12d7d8a77..b1f7afa55 100644
--- a/src/components/emoji-input/emoji-input.vue
+++ b/src/components/emoji-input/emoji-input.vue
@@ -6,7 +6,7 @@
       <div
         v-for="(suggestion, index) in suggestions"
         :key="index"
-        @click.stop.prevent="(e) => onClick(e, suggestion)"
+        @click.stop.prevent="onClick($event, suggestion)"
         class="autocomplete-item"
         :class="{ highlighted: suggestion.highlighted }"
         >