From ee694d62eb34b825bccf4d0a6cbb299c6bde2a6e Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sun, 3 Feb 2019 15:32:24 -0500
Subject: [PATCH 01/51] Fix fixed background issue

---
 src/App.js   |  3 +--
 src/App.scss | 14 ++++++++++----
 src/App.vue  |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/App.js b/src/App.js
index 83a61d392..23f6cb785 100644
--- a/src/App.js
+++ b/src/App.js
@@ -66,9 +66,8 @@ export default {
       })
     },
     logo () { return this.$store.state.instance.logo },
-    style () {
+    bgStyle () {
       return {
-        '--body-background-image': `url(${this.background})`,
         'background-image': `url(${this.background})`
       }
     },
diff --git a/src/App.scss b/src/App.scss
index d3721b324..dedc294d8 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -1,15 +1,21 @@
 @import './_variables.scss';
 
 #app {
-  background-size: cover;
-  background-attachment: fixed;
-  background-repeat: no-repeat;
-  background-position: 0 50px;
   min-height: 100vh;
   max-width: 100%;
   overflow: hidden;
 }
 
+.app-bg-wrapper {
+  position: fixed;
+  z-index: -1;
+  height: 100%;
+  width: 100%;
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: 0 50%;
+}
+
 i {
   user-select: none;
 }
diff --git a/src/App.vue b/src/App.vue
index 833608ea5..8a4e02c47 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,6 @@
 <template>
-  <div id="app" v-bind:style="style">
+  <div id="app">
+    <div class="app-bg-wrapper" v-bind:style="bgStyle"></div>
     <nav class='nav-bar container' @click="scrollToTop()" id="nav">
       <div class='logo' :style='logoBgStyle'>
         <div class='mask' :style='logoMaskStyle'></div>

From 0483f1d6365d8a2b4f847bdc412831b29e5541da Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sun, 3 Feb 2019 20:12:22 -0500
Subject: [PATCH 02/51] Revert a change which can break the theme preview

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

diff --git a/src/App.js b/src/App.js
index 23f6cb785..32589b64c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -68,6 +68,7 @@ export default {
     logo () { return this.$store.state.instance.logo },
     bgStyle () {
       return {
+        '--body-background-image': `url(${this.background})`,
         'background-image': `url(${this.background})`
       }
     },

From a57f8bdd68ae52b4e5725fe0358dc8c7567c81ac Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Wed, 6 Feb 2019 10:18:13 -0800
Subject: [PATCH 03/51] Add option to hide filtered statuses

---
 src/boot/after_store.js              |  1 +
 src/components/settings/settings.js  |  8 ++++++++
 src/components/settings/settings.vue | 14 ++++++++++----
 src/components/status/status.js      |  5 +++++
 src/components/status/status.vue     |  2 +-
 src/i18n/en.json                     |  1 +
 src/modules/instance.js              |  1 +
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5693dcc65..c4126e4c8 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -59,6 +59,7 @@ const afterStoreSetup = ({ store, i18n }) => {
           copyInstanceOption('background')
           copyInstanceOption('hidePostStats')
           copyInstanceOption('hideUserStats')
+          copyInstanceOption('hideFilteredStatuses')
           copyInstanceOption('logo')
 
           store.dispatch('setInstanceOption', {
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 8d1384855..257eb691f 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -27,6 +27,11 @@ const settings = {
         : user.hideUserStats,
       hideUserStatsDefault: this.$t('settings.values.' + instance.hideUserStats),
 
+      hideFilteredStatusesLocal: typeof user.hideFilteredStatuses === 'undefined'
+        ? instance.hideFilteredStatuses
+        : user.hideFilteredStatuses,
+      hideFilteredStatusesDefault: this.$t('settings.values.' + instance.hideFilteredStatuses),
+
       notificationVisibilityLocal: user.notificationVisibility,
       replyVisibilityLocal: user.replyVisibility,
       loopVideoLocal: user.loopVideo,
@@ -96,6 +101,9 @@ const settings = {
     hideUserStatsLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideUserStats', value })
     },
+    hideFilteredStatusesLocal (value) {
+      this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
+    },
     hideNsfwLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideNsfw', value })
     },
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 9953780f2..2fa2c89ca 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -205,7 +205,6 @@
                 </label>
               </li>
             </ul>
-            </label>
           </div>
           <div>
             {{$t('settings.replies_in_timeline')}}
@@ -232,11 +231,18 @@
           </div>
         </div>
         <div class="setting-item">
-          <p>{{$t('settings.filtering_explanation')}}</p>
-          <textarea id="muteWords" v-model="muteWordsString"></textarea>
+          <div>
+            <p>{{$t('settings.filtering_explanation')}}</p>
+            <textarea id="muteWords" v-model="muteWordsString"></textarea>
+          </div>
+          <div>
+            <input type="checkbox" id="hideFilteredStatuses" v-model="hideFilteredStatusesLocal">
+            <label for="hideFilteredStatuses">
+              {{$t('settings.hide_filtered_statuses')}} {{$t('settings.instance_default', { value: hideFilteredStatusesDefault })}}
+            </label>
+          </div>
         </div>
       </div>
-
     </tab-switcher>
 </keep-alive>
   </div>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 65ddcb9f6..3403fd129 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -110,6 +110,11 @@ const Status = {
       return hits
     },
     muted () { return !this.unmuted && (this.status.user.muted || this.muteWordHits.length > 0) },
+    hideFilteredStatuses () {
+      return typeof this.$store.state.config.hideFilteredStatuses === 'undefined'
+        ? this.$store.state.instance.hideFilteredStatuses
+        : this.$store.state.config.hideFilteredStatuses
+    },
     isFocused () {
       // retweet or root of an expanded conversation
       if (this.focused) {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 9986107f7..5e7fa6c5b 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="status-el" v-if="!hideReply && !deleted" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+  <div class="status-el" v-if="(!hideReply && !deleted) && !(muted && hideFilteredStatuses)" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ac7cc2a7c..6820203b2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -139,6 +139,7 @@
     "use_one_click_nsfw": "Open NSFW attachments with just one click",
     "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
     "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+    "hide_filtered_statuses": "Hide filtered statuses",
     "import_followers_from_a_csv_file": "Import follows from a csv file",
     "import_theme": "Load preset",
     "inputRadius": "Input fields",
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 4ad418738..ebc7732a6 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -21,6 +21,7 @@ const defaultState = {
   collapseMessageWithSubject: false,
   hidePostStats: false,
   hideUserStats: false,
+  hideFilteredStatuses: true,
   disableChat: false,
   scopeCopy: true,
   subjectLineBehavior: 'email',

From a12397cf387da7d411184a72f9c128ba6486a631 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Wed, 6 Feb 2019 11:34:21 -0700
Subject: [PATCH 04/51] Hashtag opens in same tab

---
 src/components/status/status.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 65ddcb9f6..cccb19cc7 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -282,8 +282,15 @@ const Status = {
             this.$router.push(link)
             return
           }
+        } else {
+          if (target.hostname === window.location.hostname) {
+            // if the hashtag's target is current instance, open in same tab
+            this.$router.push(target.pathname)
+          } else {
+            // if it is different instance, open in a new tab
+            window.open(target.href, '_blank')
+          }
         }
-        window.open(target.href, '_blank')
       }
     },
     toggleReplying () {

From fbdb7d3d9510851518fb3669ed9294210b10458c Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Wed, 6 Feb 2019 10:50:21 -0800
Subject: [PATCH 05/51] Add german translation for option label

---
 src/i18n/de.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 59449e330..d0bfba385 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -132,6 +132,7 @@
     "preload_images": "Bilder vorausladen",
     "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
     "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
+    "hide_filtered_statuses": "Gefilterte Beiträge verbergen",
     "import_followers_from_a_csv_file": "Importiere Follower, denen du folgen möchtest, aus einer CSV-Datei",
     "import_theme": "Farbschema laden",
     "inputRadius": "Eingabefelder",

From fafe258f2b94cc2faf516ea2722c01e17ab8e2d8 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Wed, 6 Feb 2019 19:19:14 -0700
Subject: [PATCH 06/51] Typo

---
 .../public_and_external_timeline.vue                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.vue b/src/components/public_and_external_timeline/public_and_external_timeline.vue
index aded2ead0..6be9f955d 100644
--- a/src/components/public_and_external_timeline/public_and_external_timeline.vue
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.vue
@@ -1,5 +1,5 @@
 <template>
-  <Timeline :title="$t('nav.twkn')"v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
+  <Timeline :title="$t('nav.twkn')" v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
 </template>
 
 <script src="./public_and_external_timeline.js"></script>

From 19870c0b6d4f7cb73e36b16d3c09d2011e6367a9 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Wed, 6 Feb 2019 19:19:43 -0700
Subject: [PATCH 07/51] Fix issue while fetching timelines for tag page

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

diff --git a/src/modules/api.js b/src/modules/api.js
index 7bda13e77..95782e385 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,5 +1,5 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
-import {isArray} from 'lodash'
+import { isArray } from 'lodash'
 import { Socket } from 'phoenix'
 
 const api = {
@@ -34,18 +34,24 @@ const api = {
     }
   },
   actions: {
-    startFetching (store, timeline) {
+    startFetching (store, payload) {
       let userId = false
+      let timeline = 'friends'
+      let tag = false
 
-      // This is for user timelines
-      if (isArray(timeline)) {
-        userId = timeline[1]
-        timeline = timeline[0]
+      if (isArray(payload)) {
+        // For user timelines
+        timeline = payload[0]
+        userId = payload[1]
+      } else if (payload.tag) {
+        // For tag timelines
+        timeline = 'tag'
+        tag = payload.tag
       }
 
       // Don't start fetching if we already are.
       if (!store.state.fetchers[timeline]) {
-        const fetcher = store.state.backendInteractor.startFetching({timeline, store, userId})
+        const fetcher = store.state.backendInteractor.startFetching({timeline, store, userId, tag})
         store.commit('addFetcher', {timeline, fetcher})
       }
     },

From a215f6856d0dff53869a4c20e538eb744b636a4d Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Wed, 6 Feb 2019 21:26:32 -0700
Subject: [PATCH 08/51] Always open tag in same instance

---
 src/components/status/status.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index cccb19cc7..1ebb8a8d1 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -283,13 +283,7 @@ const Status = {
             return
           }
         } else {
-          if (target.hostname === window.location.hostname) {
-            // if the hashtag's target is current instance, open in same tab
-            this.$router.push(target.pathname)
-          } else {
-            // if it is different instance, open in a new tab
-            window.open(target.href, '_blank')
-          }
+          this.$router.push(target.pathname)
         }
       }
     },

From c0b833cb85ccd10942accbefc3ba4d70cf3d745e Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Thu, 7 Feb 2019 14:46:10 -0700
Subject: [PATCH 09/51] Added tag extractor method and spec

---
 src/services/matcher/matcher.service.js       | 23 ++++++++++++
 .../mention_matcher/mention_matcher.js        |  9 -----
 .../matcher.spec.js}                          | 35 ++++++++++++++-----
 3 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 src/services/matcher/matcher.service.js
 delete mode 100644 src/services/mention_matcher/mention_matcher.js
 rename test/unit/specs/services/{mention_matcher/mention_matcher.spec.js => matcher/matcher.spec.js} (57%)

diff --git a/src/services/matcher/matcher.service.js b/src/services/matcher/matcher.service.js
new file mode 100644
index 000000000..b6c4e9099
--- /dev/null
+++ b/src/services/matcher/matcher.service.js
@@ -0,0 +1,23 @@
+export const mentionMatchesUrl = (attention, url) => {
+  if (url === attention.statusnet_profile_url) {
+    return true
+  }
+  const [namepart, instancepart] = attention.screen_name.split('@')
+  const matchstring = new RegExp('://' + instancepart + '/.*' + namepart + '$', 'g')
+
+  return !!url.match(matchstring)
+}
+
+/**
+ * Extract tag name from pleroma or mastodon url.
+ * i.e https://bikeshed.party/tag/photo or https://quey.org/tags/sky
+ * @param {string} url
+ */
+export const extractTagFromUrl = (url) => {
+  const regex = /tag[s]*\/(\w+)$/g
+  const result = regex.exec(url)
+  if (!result) {
+    return false
+  }
+  return result[1]
+}
diff --git a/src/services/mention_matcher/mention_matcher.js b/src/services/mention_matcher/mention_matcher.js
deleted file mode 100644
index 2c1ed9706..000000000
--- a/src/services/mention_matcher/mention_matcher.js
+++ /dev/null
@@ -1,9 +0,0 @@
-
-export const mentionMatchesUrl = (attention, url) => {
-  if (url === attention.statusnet_profile_url) {
-    return true
-  }
-  const [namepart, instancepart] = attention.screen_name.split('@')
-  const matchstring = new RegExp('://' + instancepart + '/.*' + namepart + '$', 'g')
-  return !!url.match(matchstring)
-}
diff --git a/test/unit/specs/services/mention_matcher/mention_matcher.spec.js b/test/unit/specs/services/matcher/matcher.spec.js
similarity index 57%
rename from test/unit/specs/services/mention_matcher/mention_matcher.spec.js
rename to test/unit/specs/services/matcher/matcher.spec.js
index 4f6f58fff..0b5363b4b 100644
--- a/test/unit/specs/services/mention_matcher/mention_matcher.spec.js
+++ b/test/unit/specs/services/matcher/matcher.spec.js
@@ -1,4 +1,4 @@
-import * as MentionMatcher from 'src/services/mention_matcher/mention_matcher.js'
+import * as MatcherService from 'src/services/matcher/matcher.service.js'
 
 const localAttn = () => ({
   id: 123,
@@ -16,48 +16,67 @@ const externalAttn = () => ({
   statusnet_profile_url: 'https://instance.com/users/person'
 })
 
-describe('MentionMatcher', () => {
+describe('MatcherService', () => {
   describe.only('mentionMatchesUrl', () => {
     it('should match local mention', () => {
       const attention = localAttn()
       const url = 'https://instance.com/users/person'
 
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(true)
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(true)
     })
 
     it('should not match a local mention with same name but different instance', () => {
       const attention = localAttn()
       const url = 'https://website.com/users/person'
 
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(false)
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(false)
     })
 
     it('should match external pleroma mention', () => {
       const attention = externalAttn()
       const url = 'https://instance.com/users/person'
 
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(true)
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(true)
     })
 
     it('should not match external pleroma mention with same name but different instance', () => {
       const attention = externalAttn()
       const url = 'https://website.com/users/person'
 
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(false)
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(false)
     })
 
     it('should match external mastodon mention', () => {
       const attention = externalAttn()
       const url = 'https://instance.com/@person'
 
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(true)
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(true)
     })
 
     it('should not match external mastodon mention with same name but different instance', () => {
       const attention = externalAttn()
       const url = 'https://website.com/@person'
 
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(false)
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(false)
+    })
+  })
+  describe.only('extractTagFromUrl', () => {
+    it('should return tag name from valid pleroma url', () => {
+      const url = 'https://website.com/tag/photo'
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql('photo')
+    })
+
+    it('should return tag name from valid mastodon url', () => {
+      const url = 'https://website.com/tags/sky'
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql('sky')
+    })
+
+    it('should not return string but false if invalid url', () => {
+      const url = 'https://website.com/users/sky'
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql(false)
     })
   })
 })

From e44d8ad71eb1128ae53bfdd47ac81d3aa5d8ae07 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Thu, 7 Feb 2019 14:54:49 -0700
Subject: [PATCH 10/51] Extract tag name from href and open in same tab

---
 src/components/status/status.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 1ebb8a8d1..a3b662b6b 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -10,7 +10,7 @@ import LinkPreview from '../link-preview/link-preview.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import fileType from 'src/services/file_type/file_type.service'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
-import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
+import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
 import { filter, find } from 'lodash'
 
 const Status = {
@@ -273,7 +273,7 @@ const Status = {
       }
       if (target.tagName === 'A') {
         if (target.className.match(/mention/)) {
-          const href = target.getAttribute('href')
+          const href = target.href
           const attn = this.status.attentions.find(attn => mentionMatchesUrl(attn, href))
           if (attn) {
             event.stopPropagation()
@@ -282,8 +282,14 @@ const Status = {
             this.$router.push(link)
             return
           }
-        } else {
-          this.$router.push(target.pathname)
+        }
+        if (target.className.match(/hashtag/)) {
+          // Extract tag name from link url
+          const tag = extractTagFromUrl(target.href)
+          if (tag) {
+            const link = this.generateTagLink(tag)
+            this.$router.push(link)
+          }
         }
       }
     },
@@ -340,6 +346,9 @@ const Status = {
     generateUserProfileLink (id, name) {
       return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
     },
+    generateTagLink (tag) {
+      return `/tag/${tag}`
+    },
     setMedia () {
       const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
       return () => this.$store.dispatch('setMedia', attachments)

From d39e2643f523e84cdce1945538149a9bd6419fd6 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Thu, 7 Feb 2019 14:56:00 -0700
Subject: [PATCH 11/51] Fix lint warning

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

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 9986107f7..779696ea2 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -57,7 +57,7 @@
               </div>
               <h4 class="replies" v-if="inConversation && !noReplyLinks">
                 <small v-if="replies.length">Replies:</small>
-                <small class="reply-link" v-for="reply in replies">
+                <small class="reply-link" v-bind:key="reply.id" v-for="reply in replies">
                   <a href="#" @click.prevent="gotoOriginal(reply.id)" @mouseenter="replyEnter(reply.id, $event)" @mouseout="replyLeave()">{{reply.name}}&nbsp;</a>
                 </small>
               </h4>

From 0dc7c45f324c246cc74c6ed55c006c67742c4139 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Thu, 7 Feb 2019 16:23:18 -0700
Subject: [PATCH 12/51] Code refactoring

---
 .../public_and_external_timeline.js           |  2 +-
 .../public_timeline/public_timeline.js        |  2 +-
 src/components/tag_timeline/tag_timeline.js   |  4 +--
 src/components/user_profile/user_profile.js   | 10 ++++----
 src/modules/api.js                            | 25 ++++---------------
 src/modules/users.js                          |  2 +-
 6 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.js b/src/components/public_and_external_timeline/public_and_external_timeline.js
index 0db6efae1..d45677e0f 100644
--- a/src/components/public_and_external_timeline/public_and_external_timeline.js
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.js
@@ -7,7 +7,7 @@ const PublicAndExternalTimeline = {
     timeline () { return this.$store.state.statuses.timelines.publicAndExternal }
   },
   created () {
-    this.$store.dispatch('startFetching', 'publicAndExternal')
+    this.$store.dispatch('startFetching', { timeline: 'publicAndExternal' })
   },
   destroyed () {
     this.$store.dispatch('stopFetching', 'publicAndExternal')
diff --git a/src/components/public_timeline/public_timeline.js b/src/components/public_timeline/public_timeline.js
index 9b866be89..64c951ac7 100644
--- a/src/components/public_timeline/public_timeline.js
+++ b/src/components/public_timeline/public_timeline.js
@@ -7,7 +7,7 @@ const PublicTimeline = {
     timeline () { return this.$store.state.statuses.timelines.public }
   },
   created () {
-    this.$store.dispatch('startFetching', 'public')
+    this.$store.dispatch('startFetching', { timeline: 'public' })
   },
   destroyed () {
     this.$store.dispatch('stopFetching', 'public')
diff --git a/src/components/tag_timeline/tag_timeline.js b/src/components/tag_timeline/tag_timeline.js
index 43de4f49c..41b09706b 100644
--- a/src/components/tag_timeline/tag_timeline.js
+++ b/src/components/tag_timeline/tag_timeline.js
@@ -3,7 +3,7 @@ import Timeline from '../timeline/timeline.vue'
 const TagTimeline = {
   created () {
     this.$store.commit('clearTimeline', { timeline: 'tag' })
-    this.$store.dispatch('startFetching', { 'tag': this.tag })
+    this.$store.dispatch('startFetching', { timeline: 'tag', tag: this.tag })
   },
   components: {
     Timeline
@@ -15,7 +15,7 @@ const TagTimeline = {
   watch: {
     tag () {
       this.$store.commit('clearTimeline', { timeline: 'tag' })
-      this.$store.dispatch('startFetching', { 'tag': this.tag })
+      this.$store.dispatch('startFetching', { timeline: 'tag', tag: this.tag })
     }
   },
   destroyed () {
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 7b0ab705a..8b5571bdf 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -8,8 +8,8 @@ const UserProfile = {
     this.$store.commit('clearTimeline', { timeline: 'user' })
     this.$store.commit('clearTimeline', { timeline: 'favorites' })
     this.$store.commit('clearTimeline', { timeline: 'media' })
-    this.$store.dispatch('startFetching', ['user', this.fetchBy])
-    this.$store.dispatch('startFetching', ['media', this.fetchBy])
+    this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
+    this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
     this.startFetchFavorites()
     if (!this.user.id) {
       this.$store.dispatch('fetchUser', this.fetchBy)
@@ -63,12 +63,12 @@ const UserProfile = {
   methods: {
     startFetchFavorites () {
       if (this.isUs) {
-        this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+        this.$store.dispatch('startFetching', { timeline: 'favorites', userId: this.fetchBy })
       }
     },
     startUp () {
-      this.$store.dispatch('startFetching', ['user', this.fetchBy])
-      this.$store.dispatch('startFetching', ['media', this.fetchBy])
+      this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
+      this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
 
       this.startFetchFavorites()
     },
diff --git a/src/modules/api.js b/src/modules/api.js
index 95782e385..31cb55c6d 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,5 +1,4 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
-import { isArray } from 'lodash'
 import { Socket } from 'phoenix'
 
 const api = {
@@ -34,26 +33,12 @@ const api = {
     }
   },
   actions: {
-    startFetching (store, payload) {
-      let userId = false
-      let timeline = 'friends'
-      let tag = false
-
-      if (isArray(payload)) {
-        // For user timelines
-        timeline = payload[0]
-        userId = payload[1]
-      } else if (payload.tag) {
-        // For tag timelines
-        timeline = 'tag'
-        tag = payload.tag
-      }
-
+    startFetching (store, {timeline = 'friends', tag = false, userId = false}) {
       // Don't start fetching if we already are.
-      if (!store.state.fetchers[timeline]) {
-        const fetcher = store.state.backendInteractor.startFetching({timeline, store, userId, tag})
-        store.commit('addFetcher', {timeline, fetcher})
-      }
+      if (store.state.fetchers[timeline]) return
+
+      const fetcher = store.state.backendInteractor.startFetching({ timeline, store, userId, tag })
+      store.commit('addFetcher', { timeline, fetcher })
     },
     stopFetching (store, timeline) {
       const fetcher = store.state.fetchers[timeline]
diff --git a/src/modules/users.js b/src/modules/users.js
index ca2e0f31f..4d56ec6f6 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -271,7 +271,7 @@ const users = {
               }
 
               // Start getting fresh posts.
-              store.dispatch('startFetching', 'friends')
+              store.dispatch('startFetching', { timeline: 'friends' })
 
               // Get user mutes and follower info
               store.rootState.api.backendInteractor.fetchMutes().then((mutedUsers) => {

From b57b4c6e45ca612a890e594942e86faab5a946e0 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 8 Feb 2019 05:31:06 -0500
Subject: [PATCH 13/51] #291 - disable empty tabs in user profile panel

---
 src/components/tab_switcher/tab_switcher.js                | 2 +-
 src/components/user_profile/user_profile.vue               | 7 +++++--
 .../entity_normalizer/entity_normalizer.service.js         | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index f9c3f9276..423df258a 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -37,7 +37,7 @@ export default Vue.component('tab-switcher', {
 
             return (
               <div class={ classesWrapper.join(' ')}>
-                <button onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
+                <button disabled={slot.data.attrs.disabled} onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
               </div>
             )
           })
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 9001ed001..7a1e6a18f 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -9,19 +9,20 @@
     <tab-switcher :renderOnlyFocused="true">
       <Timeline
         :label="$t('user_card.statuses')"
+        :diabled="!user.statuses_count"
         :embedded="true"
         :title="$t('user_profile.timeline_title')"
         :timeline="timeline"
         :timeline-name="'user'"
         :user-id="fetchBy"
       />
-      <div :label="$t('user_card.followees')" v-if="followsTabVisible">
+      <div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
         <FollowList v-if="user.friends_count > 0" :userId="userId" :showFollowers="false" />
         <div class="userlist-placeholder" v-else>
           <i class="icon-spin3 animate-spin"></i>
         </div>
       </div>
-      <div :label="$t('user_card.followers')" v-if="followersTabVisible">
+      <div :label="$t('user_card.followers')" v-if="followersTabVisible" :disabled="!user.followers_count">
         <FollowList v-if="user.followers_count > 0" :userId="userId" :showFollowers="true" />
         <div class="userlist-placeholder" v-else>
           <i class="icon-spin3 animate-spin"></i>
@@ -29,6 +30,7 @@
       </div>
       <Timeline
         :label="$t('user_card.media')"
+        :disabled="!user.media_count"
         :embedded="true" :title="$t('user_card.media')"
         timeline-name="media"
         :timeline="media"
@@ -37,6 +39,7 @@
       <Timeline
         v-if="isUs"
         :label="$t('user_card.favorites')"
+        :disabled="!user.favourites_count"
         :embedded="true"
         :title="$t('user_card.favorites')"
         timeline-name="favorites"
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 828c48f9c..71744f394 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -115,6 +115,8 @@ export const parseUser = (data) => {
   output.locked = data.locked
   output.followers_count = data.followers_count
   output.statuses_count = data.statuses_count
+  output.favourites_count = data.favourites_count
+  output.media_count = data.media_count
   output.friends = []
   output.followers = []
 

From 10c7365451c7820482def600ed84580c76f6b2ac Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 04:25:56 -0800
Subject: [PATCH 14/51] Add option to hide filtered statuses

---
 src/components/status/status.js  | 3 +++
 src/components/status/status.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 3403fd129..4a1fcfdff 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -115,6 +115,9 @@ const Status = {
         ? this.$store.state.instance.hideFilteredStatuses
         : this.$store.state.config.hideFilteredStatuses
     },
+    hideStatus () {
+      return (!this.hideReply && !this.deleted) && !(this.muted && this.hideFilteredStatuses)
+    },
     isFocused () {
       // retweet or root of an expanded conversation
       if (this.focused) {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 5e7fa6c5b..83d7b25ad 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="status-el" v-if="(!hideReply && !deleted) && !(muted && hideFilteredStatuses)" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+  <div class="status-el" v-if="hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>

From 7818d6786b8489ddc18a5cd0d63e894450ec5ead Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 05:17:20 -0800
Subject: [PATCH 15/51] Add option to hide filtered statuses

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

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 4a1fcfdff..8181b0dba 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -116,7 +116,7 @@ const Status = {
         : this.$store.state.config.hideFilteredStatuses
     },
     hideStatus () {
-      return (!this.hideReply && !this.deleted) && !(this.muted && this.hideFilteredStatuses)
+      return (this.hideReply || this.deleted) || (this.muted && this.hideFilteredStatuses)
     },
     isFocused () {
       // retweet or root of an expanded conversation
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 83d7b25ad..13e6ccec3 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="status-el" v-if="hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+  <div class="status-el" v-if="!hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>

From b129049fedd3a7b0601a9350cb6720996f66a2f6 Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Fri, 8 Feb 2019 13:42:02 +0000
Subject: [PATCH 16/51] Update spanish translate

---
 src/i18n/es.json | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 7eaef1e70..29c8aec4c 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -28,7 +28,8 @@
     "password": "Contraseña",
     "placeholder": "p.ej. lain",
     "register": "Registrar",
-    "username": "Usuario"
+    "username": "Usuario",
+    "hint": "Inicia sesión para unirte a la discusión"
   },
   "nav": {
     "about": "Sobre",
@@ -55,7 +56,7 @@
     "no_more_notifications": "No hay más notificaciones"
   },
   "post_status": {
-    "new_status": "Post new status",
+    "new_status": "Publicar un nuevo estado",
     "account_not_locked_warning": "Tu cuenta no está {0}. Cualquiera puede seguirte y leer las entradas para Solo-Seguidores.",
     "account_not_locked_warning_link": "bloqueada",
     "attachments_sensitive": "Contenido sensible",
@@ -139,7 +140,7 @@
     "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
     "hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
     "hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
-    "import_followers_from_a_csv_file": "Importar personas que tú sigues apartir de un archivo csv",
+    "import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
     "import_theme": "Importar tema",
     "inputRadius": "Campos de entrada",
     "checkboxRadius": "Casillas de verificación",
@@ -164,7 +165,10 @@
     "notification_visibility_mentions": "Menciones",
     "notification_visibility_repeats": "Repeticiones (Repeats)",
     "no_rich_text_description": "Eliminar el formato de texto enriquecido de todas las entradas",
-    "hide_network_description": "No mostrar a quién sigo, ni quién me sigue",
+    "hide_follows_description": "No mostrar a quién sigo",
+    "hide_followers_description": "No mostrar quién me sigue",
+    "show_admin_badge": "Mostrar la placa de administrador en mi perfil",
+    "show_moderator_badge": "Mostrar la placa de moderador en mi perfil",
     "nsfw_clickthrough": "Activar el clic para ocultar los adjuntos NSFW",
     "panelRadius": "Paneles",
     "pause_on_unfocused": "Parar la transmisión cuando no estés en foco.",
@@ -191,6 +195,8 @@
     "subject_line_email": "Tipo email: \"re: tema\"",
     "subject_line_mastodon": "Tipo mastodon: copiar como es",
     "subject_line_noop": "No copiar",
+    "post_status_content_type": "Formato de publicación",
+    "status_content_type_plain": "Texto plano",
     "stop_gifs": "Iniciar GIFs al pasar el ratón",
     "streaming": "Habilite la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
     "text": "Texto",

From 34169e692f9d42104413b816b3f096d808360ce4 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 8 Feb 2019 09:56:45 -0500
Subject: [PATCH 17/51] #291 - enable media/favorite tabs with prefetched data

---
 src/components/user_profile/user_profile.vue                | 6 +++---
 src/services/entity_normalizer/entity_normalizer.service.js | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 7a1e6a18f..cfb4fa950 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -30,7 +30,7 @@
       </div>
       <Timeline
         :label="$t('user_card.media')"
-        :disabled="!user.media_count"
+        :disabled="!media.visibleStatuses.length"
         :embedded="true" :title="$t('user_card.media')"
         timeline-name="media"
         :timeline="media"
@@ -39,13 +39,13 @@
       <Timeline
         v-if="isUs"
         :label="$t('user_card.favorites')"
-        :disabled="!user.favourites_count"
+        :disabled="!favorites.visibleStatuses.length"
         :embedded="true"
         :title="$t('user_card.favorites')"
         timeline-name="favorites"
         :timeline="favorites"
       />
-    </tab-switcher>
+    </tab-switcher> 
   </div>
   <div v-else class="panel user-profile-placeholder">
     <div class="panel-heading">
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 71744f394..828c48f9c 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -115,8 +115,6 @@ export const parseUser = (data) => {
   output.locked = data.locked
   output.followers_count = data.followers_count
   output.statuses_count = data.statuses_count
-  output.favourites_count = data.favourites_count
-  output.media_count = data.media_count
   output.friends = []
   output.followers = []
 

From d112d5b3331cd1805319c9641d489eee2ca01311 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 8 Feb 2019 10:02:00 -0500
Subject: [PATCH 18/51] #291 - remove whitespace

---
 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 cfb4fa950..9a8faf4b0 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -45,7 +45,7 @@
         timeline-name="favorites"
         :timeline="favorites"
       />
-    </tab-switcher> 
+    </tab-switcher>
   </div>
   <div v-else class="panel user-profile-placeholder">
     <div class="panel-heading">

From 910b63624b75bdbdc7e4bf80cfe42c7a8092260e Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 8 Feb 2019 10:40:03 -0500
Subject: [PATCH 19/51] #291 - fixed typo

---
 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 9a8faf4b0..79461291d 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -9,7 +9,7 @@
     <tab-switcher :renderOnlyFocused="true">
       <Timeline
         :label="$t('user_card.statuses')"
-        :diabled="!user.statuses_count"
+        :disabled="!user.statuses_count"
         :embedded="true"
         :title="$t('user_profile.timeline_title')"
         :timeline="timeline"

From fb0cf6454982a371e68b22e29b0374507425242d Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 10:49:14 -0500
Subject: [PATCH 20/51] #255 - make AutoCompleteInput component

---
 .../autocomplete_input/autocomplete_input.js  | 147 ++++++++++++++++++
 .../autocomplete_input/autocomplete_input.vue |  34 ++++
 .../post_status_form/post_status_form.js      | 129 +--------------
 .../post_status_form/post_status_form.vue     |  35 +----
 4 files changed, 196 insertions(+), 149 deletions(-)
 create mode 100644 src/components/autocomplete_input/autocomplete_input.js
 create mode 100644 src/components/autocomplete_input/autocomplete_input.vue

diff --git a/src/components/autocomplete_input/autocomplete_input.js b/src/components/autocomplete_input/autocomplete_input.js
new file mode 100644
index 000000000..51c1f5d9b
--- /dev/null
+++ b/src/components/autocomplete_input/autocomplete_input.js
@@ -0,0 +1,147 @@
+import Completion from '../../services/completion/completion.js'
+import { take, filter, map } from 'lodash'
+
+const AutoCompleteInput = {
+  props: [
+    'classObj',
+    'value',
+    'autoResize',
+    'drop',
+    'dragoverPrevent',
+    'paste',
+    'keydownMetaEnter',
+    'keyupCtrlEnter'
+  ],
+  components: {},
+  mounted () {
+    this.autoResize && this.resize(this.$refs.textarea)
+    const textLength = this.$refs.textarea.value.length
+    this.$refs.textarea.setSelectionRange(textLength, textLength)
+  },
+  data () {
+    return {
+      caret: 0,
+      highlighted: 0,
+      text: this.value
+    }
+  },
+  computed: {
+    users () {
+      return this.$store.state.users.users
+    },
+    emoji () {
+      return this.$store.state.instance.emoji || []
+    },
+    customEmoji () {
+      return this.$store.state.instance.customEmoji || []
+    },
+    textAtCaret () {
+      return (this.wordAtCaret || {}).word || ''
+    },
+    wordAtCaret () {
+      const word = Completion.wordAtPosition(this.text, this.caret - 1) || {}
+      return word
+    },
+    candidates () {
+      const firstchar = this.textAtCaret.charAt(0)
+      if (firstchar === '@') {
+        const query = this.textAtCaret.slice(1).toUpperCase()
+        const matchedUsers = filter(this.users, (user) => {
+          return user.screen_name.toUpperCase().startsWith(query) ||
+            user.name && user.name.toUpperCase().startsWith(query)
+        })
+        if (matchedUsers.length <= 0) {
+          return false
+        }
+        // eslint-disable-next-line camelcase
+        return map(take(matchedUsers, 5), ({screen_name, name, profile_image_url_original}, index) => ({
+          // eslint-disable-next-line camelcase
+          screen_name: `@${screen_name}`,
+          name: name,
+          img: profile_image_url_original,
+          highlighted: index === this.highlighted
+        }))
+      } else if (firstchar === ':') {
+        if (this.textAtCaret === ':') { return }
+        const matchedEmoji = filter(this.emoji.concat(this.customEmoji), (emoji) => emoji.shortcode.startsWith(this.textAtCaret.slice(1)))
+        if (matchedEmoji.length <= 0) {
+          return false
+        }
+        return map(take(matchedEmoji, 5), ({shortcode, image_url, utf}, index) => ({
+          screen_name: `:${shortcode}:`,
+          name: '',
+          utf: utf || '',
+          // eslint-disable-next-line camelcase
+          img: utf ? '' : this.$store.state.instance.server + image_url,
+          highlighted: index === this.highlighted
+        }))
+      } else {
+        return false
+      }
+    }
+  },
+  methods: {
+    setCaret ({target: {selectionStart}}) {
+      this.caret = selectionStart
+    },
+    cycleBackward (e) {
+      const len = this.candidates.length || 0
+      if (len > 0) {
+        e.preventDefault()
+        this.highlighted -= 1
+        if (this.highlighted < 0) {
+          this.highlighted = this.candidates.length - 1
+        }
+      } else {
+        this.highlighted = 0
+      }
+    },
+    cycleForward (e) {
+      const len = this.candidates.length || 0
+      if (len > 0) {
+        if (e.shiftKey) { return }
+        e.preventDefault()
+        this.highlighted += 1
+        if (this.highlighted >= len) {
+          this.highlighted = 0
+        }
+      } else {
+        this.highlighted = 0
+      }
+    },
+    replace (replacement) {
+      this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
+      const el = this.$el.querySelector('textarea')
+      el.focus()
+      this.caret = 0
+    },
+    replaceCandidate (e) {
+      const len = this.candidates.length || 0
+      if (this.textAtCaret === ':' || e.ctrlKey) { return }
+      if (len > 0) {
+        e.preventDefault()
+        const candidate = this.candidates[this.highlighted]
+        const replacement = candidate.utf || (candidate.screen_name + ' ')
+        this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
+        const el = this.$el.querySelector('textarea')
+        el.focus()
+        this.caret = 0
+        this.highlighted = 0
+      }
+    },
+    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))
+      // Auto is needed to make textbox shrink when removing lines
+      target.style.height = 'auto'
+      target.style.height = `${target.scrollHeight - vertPadding}px`
+      if (target.value === '') {
+        target.style.height = null
+      }
+    }
+  }
+}
+
+export default AutoCompleteInput
diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
new file mode 100644
index 000000000..1c0498916
--- /dev/null
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <textarea
+      ref="textarea"
+      :value="text"
+      @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
+      @click="setCaret"
+      @keyup="setCaret" :placeholder="$t('post_status.default')" rows="1" :class="classObj"
+      @keydown.down="cycleForward"
+      @keydown.up="cycleBackward"
+      @keydown.shift.tab="cycleBackward"
+      @keydown.tab="cycleForward"
+      @keydown.enter="replaceCandidate"
+      @drop="drop && drop()"
+      @dragover.prevent="dragoverPrevent && dragoverPrevent()"
+      @paste="paste && paste()"
+      @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()"
+      @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()">
+    </textarea>
+    <div style="position:relative;" v-if="candidates">
+      <div class="autocomplete-panel">
+        <div v-for="candidate in candidates" @click="replace(candidate.utf || (candidate.screen_name + ' '))">
+          <div class="autocomplete" :class="{ highlighted: candidate.highlighted }">
+            <span v-if="candidate.img"><img :src="candidate.img"></img></span>
+            <span v-else>{{candidate.utf}}</span>
+            <span>{{candidate.screen_name}}<small>{{candidate.name}}</small></span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./autocomplete_input.js"></script>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index ab379c233..3568951f2 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -1,8 +1,8 @@
 import statusPoster from '../../services/status_poster/status_poster.service.js'
 import MediaUpload from '../media_upload/media_upload.vue'
+import AutoCompleteInput from '../autocomplete_input/autocomplete_input.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
-import Completion from '../../services/completion/completion.js'
-import { take, filter, reject, map, uniqBy } from 'lodash'
+import { reject, map, uniqBy } from 'lodash'
 
 const buildMentionsString = ({user, attentions}, currentUser) => {
   let allAttentions = [...attentions]
@@ -28,13 +28,10 @@ const PostStatusForm = {
     'subject'
   ],
   components: {
-    MediaUpload
+    MediaUpload,
+    AutoCompleteInput
   },
   mounted () {
-    this.resize(this.$refs.textarea)
-    const textLength = this.$refs.textarea.value.length
-    this.$refs.textarea.setSelectionRange(textLength, textLength)
-
     if (this.replyTo) {
       this.$refs.textarea.focus()
     }
@@ -61,15 +58,13 @@ const PostStatusForm = {
       submitDisabled: false,
       error: null,
       posting: false,
-      highlighted: 0,
       newStatus: {
         spoilerText: this.subject || '',
         status: statusText,
         nsfw: false,
         files: [],
         visibility: scope
-      },
-      caret: 0
+      }
     }
   },
   computed: {
@@ -81,59 +76,6 @@ const PostStatusForm = {
         direct: { selected: this.newStatus.visibility === 'direct' }
       }
     },
-    candidates () {
-      const firstchar = this.textAtCaret.charAt(0)
-      if (firstchar === '@') {
-        const query = this.textAtCaret.slice(1).toUpperCase()
-        const matchedUsers = filter(this.users, (user) => {
-          return user.screen_name.toUpperCase().startsWith(query) ||
-            user.name && user.name.toUpperCase().startsWith(query)
-        })
-        if (matchedUsers.length <= 0) {
-          return false
-        }
-        // eslint-disable-next-line camelcase
-        return map(take(matchedUsers, 5), ({screen_name, name, profile_image_url_original}, index) => ({
-          // eslint-disable-next-line camelcase
-          screen_name: `@${screen_name}`,
-          name: name,
-          img: profile_image_url_original,
-          highlighted: index === this.highlighted
-        }))
-      } else if (firstchar === ':') {
-        if (this.textAtCaret === ':') { return }
-        const matchedEmoji = filter(this.emoji.concat(this.customEmoji), (emoji) => emoji.shortcode.startsWith(this.textAtCaret.slice(1)))
-        if (matchedEmoji.length <= 0) {
-          return false
-        }
-        return map(take(matchedEmoji, 5), ({shortcode, image_url, utf}, index) => ({
-          screen_name: `:${shortcode}:`,
-          name: '',
-          utf: utf || '',
-          // eslint-disable-next-line camelcase
-          img: utf ? '' : this.$store.state.instance.server + image_url,
-          highlighted: index === this.highlighted
-        }))
-      } else {
-        return false
-      }
-    },
-    textAtCaret () {
-      return (this.wordAtCaret || {}).word || ''
-    },
-    wordAtCaret () {
-      const word = Completion.wordAtPosition(this.newStatus.status, this.caret - 1) || {}
-      return word
-    },
-    users () {
-      return this.$store.state.users.users
-    },
-    emoji () {
-      return this.$store.state.instance.emoji || []
-    },
-    customEmoji () {
-      return this.$store.state.instance.customEmoji || []
-    },
     statusLength () {
       return this.newStatus.status.length
     },
@@ -174,53 +116,8 @@ const PostStatusForm = {
     }
   },
   methods: {
-    replace (replacement) {
-      this.newStatus.status = Completion.replaceWord(this.newStatus.status, this.wordAtCaret, replacement)
-      const el = this.$el.querySelector('textarea')
-      el.focus()
-      this.caret = 0
-    },
-    replaceCandidate (e) {
-      const len = this.candidates.length || 0
-      if (this.textAtCaret === ':' || e.ctrlKey) { return }
-      if (len > 0) {
-        e.preventDefault()
-        const candidate = this.candidates[this.highlighted]
-        const replacement = candidate.utf || (candidate.screen_name + ' ')
-        this.newStatus.status = Completion.replaceWord(this.newStatus.status, this.wordAtCaret, replacement)
-        const el = this.$el.querySelector('textarea')
-        el.focus()
-        this.caret = 0
-        this.highlighted = 0
-      }
-    },
-    cycleBackward (e) {
-      const len = this.candidates.length || 0
-      if (len > 0) {
-        e.preventDefault()
-        this.highlighted -= 1
-        if (this.highlighted < 0) {
-          this.highlighted = this.candidates.length - 1
-        }
-      } else {
-        this.highlighted = 0
-      }
-    },
-    cycleForward (e) {
-      const len = this.candidates.length || 0
-      if (len > 0) {
-        if (e.shiftKey) { return }
-        e.preventDefault()
-        this.highlighted += 1
-        if (this.highlighted >= len) {
-          this.highlighted = 0
-        }
-      } else {
-        this.highlighted = 0
-      }
-    },
-    setCaret ({target: {selectionStart}}) {
-      this.caret = selectionStart
+    postStatus () {
+      this.postStatus(this.newStatus)
     },
     postStatus (newStatus) {
       if (this.posting) { return }
@@ -305,18 +202,6 @@ const PostStatusForm = {
     fileDrag (e) {
       e.dataTransfer.dropEffect = 'copy'
     },
-    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))
-      // Auto is needed to make textbox shrink when removing lines
-      target.style.height = 'auto'
-      target.style.height = `${target.scrollHeight - vertPadding}px`
-      if (target.value === '') {
-        target.style.height = null
-      }
-    },
     clearError () {
       this.error = null
     },
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 6ed5d92e0..ac5f55664 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -16,22 +16,14 @@
         :placeholder="$t('post_status.content_warning')"
         v-model="newStatus.spoilerText"
         class="form-cw">
-      <textarea
-        ref="textarea"
-        @click="setCaret"
-        @keyup="setCaret" v-model="newStatus.status" :placeholder="$t('post_status.default')" rows="1" class="form-control"
-        @keydown.down="cycleForward"
-        @keydown.up="cycleBackward"
-        @keydown.shift.tab="cycleBackward"
-        @keydown.tab="cycleForward"
-        @keydown.enter="replaceCandidate"
-        @keydown.meta.enter="postStatus(newStatus)"
-        @keyup.ctrl.enter="postStatus(newStatus)"
-        @drop="fileDrop"
-        @dragover.prevent="fileDrag"
-        @input="resize"
-        @paste="paste">
-      </textarea>
+      <auto-complete-input v-model="newStatus.status"
+        :classObj="{ 'form-control': true }"
+        :autoResize="true"
+        :drop="fileDrop"
+        :dragoverPrevent="fileDrag"
+        :paste="paste"
+        :keydownMetaEnter="postStatus"
+        :keyupCtrlEnter="postStatus"/>
       <div class="visibility-tray">
         <span class="text-format" v-if="formattingOptionsEnabled">
           <label for="post-content-type" class="select">
@@ -52,17 +44,6 @@
         </div>
       </div>
     </div>
-    <div style="position:relative;" v-if="candidates">
-        <div class="autocomplete-panel">
-          <div v-for="candidate in candidates" @click="replace(candidate.utf || (candidate.screen_name + ' '))">
-            <div class="autocomplete" :class="{ highlighted: candidate.highlighted }">
-              <span v-if="candidate.img"><img :src="candidate.img"></img></span>
-              <span v-else>{{candidate.utf}}</span>
-              <span>{{candidate.screen_name}}<small>{{candidate.name}}</small></span>
-            </div>
-          </div>
-        </div>
-      </div>
       <div class='form-bottom'>
         <media-upload ref="mediaUpload" @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="uploadFailed" :drop-files="dropFiles"></media-upload>
 

From 2d91c9d949e5a696585de566f2a5498bdd3c9ffa Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 10:50:27 -0500
Subject: [PATCH 21/51] make bio field auto-complete

---
 src/components/user_settings/user_settings.js  | 4 +++-
 src/components/user_settings/user_settings.vue | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index d20bf3087..fa389c3be 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -2,6 +2,7 @@ import { unescape } from 'lodash'
 
 import TabSwitcher from '../tab_switcher/tab_switcher.js'
 import StyleSwitcher from '../style_switcher/style_switcher.vue'
+import AutoCompleteInput from '../autocomplete_input/autocomplete_input.vue'
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 
 const UserSettings = {
@@ -41,7 +42,8 @@ const UserSettings = {
   },
   components: {
     StyleSwitcher,
-    TabSwitcher
+    TabSwitcher,
+    AutoCompleteInput
   },
   computed: {
     user () {
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index ea5b3de55..c5ee672f2 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -11,7 +11,7 @@
             <p>{{$t('settings.name')}}</p>
             <input class='name-changer' id='username' v-model="newName"></input>
             <p>{{$t('settings.bio')}}</p>
-            <textarea class="bio" v-model="newBio"></textarea>
+            <auto-complete-input :classObj="{ bio: true }" v-model="newBio"/>
             <p>
               <input type="checkbox" v-model="newLocked" id="account-locked">
               <label for="account-locked">{{$t('settings.lock_account_description')}}</label>

From 128dcc637edb5550168423941171f5b567365b7c Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 11:01:12 -0500
Subject: [PATCH 22/51] make name field auto-complete

---
 .../autocomplete_input/autocomplete_input.vue | 19 +++++++++++++++++++
 .../user_settings/user_settings.vue           |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
index 1c0498916..d3bda5977 100644
--- a/src/components/autocomplete_input/autocomplete_input.vue
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <textarea
+      v-if="multiline"
       ref="textarea"
       :value="text"
       @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
@@ -17,6 +18,24 @@
       @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()"
       @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()">
     </textarea>
+    <input
+      v-else
+      ref="textarea"
+      :value="text"
+      :id="id"
+      @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
+      @click="setCaret"
+      @keyup="setCaret" :placeholder="placeholder" rows="1" :class="classObj"
+      @keydown.down="cycleForward"
+      @keydown.up="cycleBackward"
+      @keydown.shift.tab="cycleBackward"
+      @keydown.tab="cycleForward"
+      @keydown.enter="replaceCandidate"
+      @drop="drop && drop()"
+      @dragover.prevent="dragoverPrevent && dragoverPrevent()"
+      @paste="paste && paste()"
+      @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()"
+      @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()"/>
     <div style="position:relative;" v-if="candidates">
       <div class="autocomplete-panel">
         <div v-for="candidate in candidates" @click="replace(candidate.utf || (candidate.screen_name + ' '))">
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index c5ee672f2..7f81af1b5 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -9,9 +9,9 @@
           <div class="setting-item" >
             <h2>{{$t('settings.name_bio')}}</h2>
             <p>{{$t('settings.name')}}</p>
-            <input class='name-changer' id='username' v-model="newName"></input>
+            <auto-complete-input :classObj="{ 'name-changer': true }" :id="'username'" v-model="newName"/>
             <p>{{$t('settings.bio')}}</p>
-            <auto-complete-input :classObj="{ bio: true }" v-model="newBio"/>
+            <auto-complete-input :classObj="{ bio: true }" v-model="newBio" :multiline="true"/>
             <p>
               <input type="checkbox" v-model="newLocked" id="account-locked">
               <label for="account-locked">{{$t('settings.lock_account_description')}}</label>

From 17c70fc0ef380d1faa360aa5b91791fd44d6c419 Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 11:02:28 -0500
Subject: [PATCH 23/51] add id & placeholder props to AutoCompleteInput
 component

---
 src/components/autocomplete_input/autocomplete_input.js  | 3 +++
 src/components/autocomplete_input/autocomplete_input.vue | 3 ++-
 src/components/post_status_form/post_status_form.vue     | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/autocomplete_input/autocomplete_input.js b/src/components/autocomplete_input/autocomplete_input.js
index 51c1f5d9b..0f1a510c2 100644
--- a/src/components/autocomplete_input/autocomplete_input.js
+++ b/src/components/autocomplete_input/autocomplete_input.js
@@ -3,9 +3,12 @@ import { take, filter, map } from 'lodash'
 
 const AutoCompleteInput = {
   props: [
+    'id',
     'classObj',
     'value',
+    'placeholder',
     'autoResize',
+    'multiline',
     'drop',
     'dragoverPrevent',
     'paste',
diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
index d3bda5977..309f22026 100644
--- a/src/components/autocomplete_input/autocomplete_input.vue
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -4,9 +4,10 @@
       v-if="multiline"
       ref="textarea"
       :value="text"
+      :id="id"
       @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
       @click="setCaret"
-      @keyup="setCaret" :placeholder="$t('post_status.default')" rows="1" :class="classObj"
+      @keyup="setCaret" :placeholder="placeholder" rows="1" :class="classObj"
       @keydown.down="cycleForward"
       @keydown.up="cycleBackward"
       @keydown.shift.tab="cycleBackward"
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index ac5f55664..18c2d2b25 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -18,7 +18,9 @@
         class="form-cw">
       <auto-complete-input v-model="newStatus.status"
         :classObj="{ 'form-control': true }"
+        :placeholder="$t('post_status.default')"
         :autoResize="true"
+        :multiline="true"
         :drop="fileDrop"
         :dragoverPrevent="fileDrag"
         :paste="paste"

From dd8531f9c908e1aefd3f5577024ba86e20b26447 Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 11:06:27 -0500
Subject: [PATCH 24/51] move styles for AutoCompleteInput

---
 .../autocomplete_input/autocomplete_input.vue | 51 +++++++++++++++++++
 .../post_status_form/post_status_form.vue     | 47 -----------------
 2 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
index 309f22026..44324e23a 100644
--- a/src/components/autocomplete_input/autocomplete_input.vue
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -52,3 +52,54 @@
 </template>
 
 <script src="./autocomplete_input.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.autocomplete-panel {
+  margin: 0 0.5em 0 0.5em;
+  border-radius: $fallback--tooltipRadius;
+  border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+  position: absolute;
+  z-index: 1;
+  box-shadow: 1px 2px 4px rgba(0, 0, 0, 0.5);
+  // this doesn't match original but i don't care, making it uniform.
+  box-shadow: var(--popupShadow);
+  min-width: 75%;
+  background: $fallback--bg;
+  background: var(--bg, $fallback--bg);
+  color: $fallback--lightText;
+  color: var(--lightText, $fallback--lightText);
+}
+
+.autocomplete {
+  cursor: pointer;
+  padding: 0.2em 0.4em 0.2em 0.4em;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.4);
+  display: flex;
+
+  img {
+    width: 24px;
+    height: 24px;
+    border-radius: $fallback--avatarRadius;
+    border-radius: var(--avatarRadius, $fallback--avatarRadius);
+    object-fit: contain;
+  }
+
+  span {
+    line-height: 24px;
+    margin: 0 0.1em 0 0.2em;
+  }
+
+  small {
+    margin-left: .5em;
+    color: $fallback--faint;
+    color: var(--faint, $fallback--faint);
+  }
+
+  &.highlighted {
+    background-color: $fallback--fg;
+    background-color: var(--lightBg, $fallback--fg);
+  }
+}
+</style>
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 18c2d2b25..4c3eb1591 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -233,52 +233,5 @@
     cursor: pointer;
     z-index: 4;
   }
-
-  .autocomplete-panel {
-    margin: 0 0.5em 0 0.5em;
-    border-radius: $fallback--tooltipRadius;
-    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-    position: absolute;
-    z-index: 1;
-    box-shadow: 1px 2px 4px rgba(0, 0, 0, 0.5);
-    // this doesn't match original but i don't care, making it uniform.
-    box-shadow: var(--popupShadow);
-    min-width: 75%;
-    background: $fallback--bg;
-    background: var(--bg, $fallback--bg);
-    color: $fallback--lightText;
-    color: var(--lightText, $fallback--lightText);
-  }
-
-  .autocomplete {
-    cursor: pointer;
-    padding: 0.2em 0.4em 0.2em 0.4em;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.4);
-    display: flex;
-
-    img {
-      width: 24px;
-      height: 24px;
-      border-radius: $fallback--avatarRadius;
-      border-radius: var(--avatarRadius, $fallback--avatarRadius);
-      object-fit: contain;
-    }
-
-    span {
-      line-height: 24px;
-      margin: 0 0.1em 0 0.2em;
-    }
-
-    small {
-      margin-left: .5em;
-      color: $fallback--faint;
-      color: var(--faint, $fallback--faint);
-    }
-
-    &.highlighted {
-      background-color: $fallback--fg;
-      background-color: var(--lightBg, $fallback--fg);
-    }
-  }
 }
 </style>

From e8dc019afd31981295fbf79637727fb4ce34a072 Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 11:10:47 -0500
Subject: [PATCH 25/51] remove rows attribute from input

---
 .../autocomplete_input/autocomplete_input.vue         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
index 44324e23a..5f285af04 100644
--- a/src/components/autocomplete_input/autocomplete_input.vue
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -3,11 +3,11 @@
     <textarea
       v-if="multiline"
       ref="textarea"
-      :value="text"
-      :id="id"
+      rows="1"
+      :value="text" :class="classObj" :id="id" :placeholder="placeholder"
       @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
       @click="setCaret"
-      @keyup="setCaret" :placeholder="placeholder" rows="1" :class="classObj"
+      @keyup="setCaret"
       @keydown.down="cycleForward"
       @keydown.up="cycleBackward"
       @keydown.shift.tab="cycleBackward"
@@ -22,11 +22,10 @@
     <input
       v-else
       ref="textarea"
-      :value="text"
-      :id="id"
+      :value="text" :class="classObj" :id="id" :placeholder="placeholder"
       @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
       @click="setCaret"
-      @keyup="setCaret" :placeholder="placeholder" rows="1" :class="classObj"
+      @keyup="setCaret"
       @keydown.down="cycleForward"
       @keydown.up="cycleBackward"
       @keydown.shift.tab="cycleBackward"

From e90e7ce2dbcaa1e585d39028ffcdacc4fa76e817 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 08:25:53 -0800
Subject: [PATCH 26/51] Subject copying composition bug

---
 package.json                    | 1 +
 src/components/status/status.js | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 90bf48cf8..1bfee49c4 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "babel-plugin-lodash": "^3.2.11",
     "chromatism": "^3.0.0",
     "diff": "^3.0.1",
+    "entities": "^1.1.2",
     "karma-mocha-reporter": "^2.2.1",
     "localforage": "^1.5.0",
     "node-sass": "^3.10.1",
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 65ddcb9f6..68d02ce3a 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -12,6 +12,7 @@ import fileType from 'src/services/file_type/file_type.service'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
 import { filter, find } from 'lodash'
+import entities from 'entities'
 
 const Status = {
   name: 'Status',
@@ -201,14 +202,15 @@ const Status = {
     },
     replySubject () {
       if (!this.status.summary) return ''
+      const decodedSummary = entities.decodeHTML(this.status.summary)
       const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
             ? this.$store.state.instance.subjectLineBehavior
             : this.$store.state.config.subjectLineBehavior
-      const startsWithRe = this.status.summary.match(/^re[: ]/i)
+      const startsWithRe = decodedSummary.match(/^re[: ]/i)
       if (behavior !== 'noop' && startsWithRe || behavior === 'masto') {
-        return this.status.summary
+        return decodedSummary
       } else if (behavior === 'email') {
-        return 're: '.concat(this.status.summary)
+        return 're: '.concat(decodedSummary)
       } else if (behavior === 'noop') {
         return ''
       }

From 63680227c1fa03db64d6dccf51af24580de01f7b Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 11:26:17 -0500
Subject: [PATCH 27/51] select either textarea or input

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

diff --git a/src/components/autocomplete_input/autocomplete_input.js b/src/components/autocomplete_input/autocomplete_input.js
index 0f1a510c2..2a959fd15 100644
--- a/src/components/autocomplete_input/autocomplete_input.js
+++ b/src/components/autocomplete_input/autocomplete_input.js
@@ -126,7 +126,7 @@ const AutoCompleteInput = {
         const candidate = this.candidates[this.highlighted]
         const replacement = candidate.utf || (candidate.screen_name + ' ')
         this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
-        const el = this.$el.querySelector('textarea')
+        const el = this.$el.querySelector('textarea') || this.$el.querySelector('input')
         el.focus()
         this.caret = 0
         this.highlighted = 0

From 59cde429b9c19cc2df0ea2b1717a5be67fc18f07 Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 11:40:54 -0500
Subject: [PATCH 28/51] fix naming

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3568951f2..8e30264d6 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -116,7 +116,7 @@ const PostStatusForm = {
     }
   },
   methods: {
-    postStatus () {
+    postStatusCopy () {
       this.postStatus(this.newStatus)
     },
     postStatus (newStatus) {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 4c3eb1591..ef3a79018 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -24,8 +24,8 @@
         :drop="fileDrop"
         :dragoverPrevent="fileDrag"
         :paste="paste"
-        :keydownMetaEnter="postStatus"
-        :keyupCtrlEnter="postStatus"/>
+        :keydownMetaEnter="postStatusCopy"
+        :keyupCtrlEnter="postStatusCopy"/>
       <div class="visibility-tray">
         <span class="text-format" v-if="formattingOptionsEnabled">
           <label for="post-content-type" class="select">

From 9f83aee1ed6d4a56150d58e6af8573718bac6529 Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Fri, 8 Feb 2019 11:54:12 -0500
Subject: [PATCH 29/51] fix auto-complete field not taking the whole parent
 width in flex

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

diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
index 5f285af04..56233535a 100644
--- a/src/components/autocomplete_input/autocomplete_input.vue
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="display: flex; flex-direction: column;">
     <textarea
       v-if="multiline"
       ref="textarea"

From 70c05a0c085adb95ef9946ac58a461f56252c2c2 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 12:17:14 -0800
Subject: [PATCH 30/51] Fix showFeaturesPanel option as instance

---
 src/App.js                    | 2 +-
 src/boot/after_store.js       | 1 +
 src/components/about/about.js | 2 +-
 src/modules/config.js         | 3 +--
 src/modules/instance.js       | 1 +
 static/config.json            | 3 ++-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/App.js b/src/App.js
index 18bff2dde..200254f36 100644
--- a/src/App.js
+++ b/src/App.js
@@ -82,7 +82,7 @@ export default {
     unseenNotificationsCount () {
       return this.unseenNotifications.length
     },
-    showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
+    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
   },
   methods: {
     scrollToTop () {
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5693dcc65..2e7754ab5 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -86,6 +86,7 @@ const afterStoreSetup = ({ store, i18n }) => {
           copyInstanceOption('subjectLineBehavior')
           copyInstanceOption('alwaysShowSubjectInput')
           copyInstanceOption('noAttachmentLinks')
+          copyInstanceOption('showFeaturesPanel')
 
           if ((config.chatDisabled)) {
             store.dispatch('disableChat')
diff --git a/src/components/about/about.js b/src/components/about/about.js
index b1ce3c7d3..ae1cb1821 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -9,7 +9,7 @@ const About = {
     TermsOfServicePanel
   },
   computed: {
-    showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
+    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
   }
 }
 
diff --git a/src/modules/config.js b/src/modules/config.js
index 526a70210..c9528f6f4 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -30,8 +30,7 @@ const defaultState = {
   interfaceLanguage: browserLocale,
   scopeCopy: undefined, // instance default
   subjectLineBehavior: undefined, // instance default
-  alwaysShowSubjectInput: undefined, // instance default
-  showFeaturesPanel: true
+  alwaysShowSubjectInput: undefined // instance default
 }
 
 const config = {
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 4ad418738..1bb5eb1bc 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -28,6 +28,7 @@ const defaultState = {
   nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
   noAttachmentLinks: false,
+  showFeaturesPanel: false,
 
   // Nasty stuff
   pleromaBackend: true,
diff --git a/static/config.json b/static/config.json
index 24e26696f..204b5fc7c 100644
--- a/static/config.json
+++ b/static/config.json
@@ -19,5 +19,6 @@
   "loginMethod": "password",
   "webPushNotifications": false,
   "noAttachmentLinks": false,
-  "nsfwCensorImage": ""
+  "nsfwCensorImage": "",
+  "showFeaturesPanel": true
 }

From ced29a64827ee4f34c71776cb217188093e7ee58 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 13:18:50 -0800
Subject: [PATCH 31/51] fixing conflicts

---
 src/modules/config.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/modules/config.js b/src/modules/config.js
index eb2df5418..71f71376c 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -30,13 +30,8 @@ const defaultState = {
   interfaceLanguage: browserLocale,
   scopeCopy: undefined, // instance default
   subjectLineBehavior: undefined, // instance default
-<<<<<<< HEAD
-  alwaysShowSubjectInput: undefined // instance default
-=======
   alwaysShowSubjectInput: undefined, // instance default
-  showFeaturesPanel: true,
   postContentType: undefined // instance default
->>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac
 }
 
 const config = {

From 5b52e020e32def19622e3d1df82f93bc716946e2 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 13:20:47 -0800
Subject: [PATCH 32/51] fixing conflicts

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

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 46ca04d88..b4ec8253c 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -29,7 +29,7 @@ const defaultState = {
   nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
   noAttachmentLinks: false,
-  showFeaturesPanel: false,
+  showFeaturesPanel: true,
 
   // Nasty stuff
   pleromaBackend: true,

From 3fb531976ace7d19f05ba90cf9785a0114f89540 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Sat, 9 Feb 2019 11:26:35 +0200
Subject: [PATCH 33/51] Change the async stuff to not render app before theme
 is loaded

---
 src/boot/after_store.js                   | 4 +++-
 src/lib/persisted_state.js                | 2 +-
 src/modules/instance.js                   | 6 ++++--
 src/services/style_setter/style_setter.js | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5693dcc65..60cee1bf1 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -55,7 +55,6 @@ const afterStoreSetup = ({ store, i18n }) => {
           }
 
           copyInstanceOption('nsfwCensorImage')
-          copyInstanceOption('theme')
           copyInstanceOption('background')
           copyInstanceOption('hidePostStats')
           copyInstanceOption('hideUserStats')
@@ -93,6 +92,9 @@ const afterStoreSetup = ({ store, i18n }) => {
             store.dispatch('initializeSocket')
           }
 
+          return store.dispatch('setTheme', config['theme'])
+        })
+        .then(() => {
           const router = new VueRouter({
             mode: 'history',
             routes: routes(store),
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index ccd926334..6f7202cea 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -48,7 +48,7 @@ export default function createPersistedState ({
   return getState(key, storage).then((savedState) => {
     return store => {
       try {
-        if (typeof savedState === 'object') {
+        if (savedState !== null && typeof savedState === 'object') {
           // build user cache
           const usersState = savedState.users || {}
           usersState.usersObject = {}
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 4ad418738..2755e418d 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -63,9 +63,11 @@ const instance = {
         case 'name':
           dispatch('setPageTitle')
           break
-        case 'theme':
-          setPreset(value, commit)
       }
+    },
+    setTheme ({ commit }, themeName) {
+      commit('setInstanceOption', { name: 'theme', value: themeName })
+      return setPreset(themeName, commit)
     }
   }
 }
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 10e7ed9b1..d0b6ccbf3 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -480,7 +480,7 @@ const getThemes = () => {
 }
 
 const setPreset = (val, commit) => {
-  getThemes().then((themes) => {
+  return getThemes().then((themes) => {
     const theme = themes[val] ? themes[val] : themes['pleroma-dark']
     const isV1 = Array.isArray(theme)
     const data = isV1 ? {} : theme.theme

From f75ec48a8029a9c142bb09b3f76b14c956863ea3 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Sat, 9 Feb 2019 04:13:52 -0800
Subject: [PATCH 34/51] Switch into Lodash

---
 package.json                    | 1 -
 src/components/status/status.js | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1bfee49c4..90bf48cf8 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "babel-plugin-lodash": "^3.2.11",
     "chromatism": "^3.0.0",
     "diff": "^3.0.1",
-    "entities": "^1.1.2",
     "karma-mocha-reporter": "^2.2.1",
     "localforage": "^1.5.0",
     "node-sass": "^3.10.1",
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 68d02ce3a..3e6247dfe 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -11,8 +11,7 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p
 import fileType from 'src/services/file_type/file_type.service'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
-import { filter, find } from 'lodash'
-import entities from 'entities'
+import { filter, find, unescape } from 'lodash'
 
 const Status = {
   name: 'Status',
@@ -197,12 +196,12 @@ const Status = {
       }
       if (this.status.summary && this.localCollapseSubjectDefault) {
         return false
-      }
+      } 
       return true
     },
     replySubject () {
       if (!this.status.summary) return ''
-      const decodedSummary = entities.decodeHTML(this.status.summary)
+      const decodedSummary = unescape(this.status.summary)
       const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
             ? this.$store.state.instance.subjectLineBehavior
             : this.$store.state.config.subjectLineBehavior

From 0a435465641da60ccc656cf5a0b79a50132243ae Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Sat, 9 Feb 2019 04:18:38 -0800
Subject: [PATCH 35/51] Switch into Lodash

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

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 3e6247dfe..d29c04915 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -196,7 +196,7 @@ const Status = {
       }
       if (this.status.summary && this.localCollapseSubjectDefault) {
         return false
-      } 
+      }
       return true
     },
     replySubject () {

From 7743e3b277d6d4fb74696e5c76b061c1db594858 Mon Sep 17 00:00:00 2001
From: jo <jo@cutest.tech>
Date: Sat, 9 Feb 2019 20:42:51 +0000
Subject: [PATCH 36/51] Add quick css fix for user profile bg img preview

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

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index ea5b3de55..134f70eff 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -189,5 +189,9 @@
   .name-changer {
     width: 100%;
   }
+
+  .bg {
+    max-width: 100%;
+  }
 }
 </style>

From 4b18989fefba1f80c5788325b0f7e9906b5ac48b Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sat, 9 Feb 2019 23:05:23 -0500
Subject: [PATCH 37/51] #332 - add follow/not follow button to follow list

---
 src/components/follow_list/follow_list.js     |  3 +-
 src/components/follow_list/follow_list.vue    |  3 +-
 src/components/user_card/user_card.js         | 30 +++++++-
 src/components/user_card/user_card.vue        | 57 +++++++++++---
 .../user_card_content/user_card_content.js    | 67 ++---------------
 .../follow_manipulate/follow_manipulate.js    | 74 +++++++++++++++++++
 6 files changed, 158 insertions(+), 76 deletions(-)
 create mode 100644 src/services/follow_manipulate/follow_manipulate.js

diff --git a/src/components/follow_list/follow_list.js b/src/components/follow_list/follow_list.js
index 6d00eb945..acdb216d8 100644
--- a/src/components/follow_list/follow_list.js
+++ b/src/components/follow_list/follow_list.js
@@ -25,7 +25,8 @@ const FollowList = {
     },
     entries () {
       return this.showFollowers ? this.user.followers : this.user.friends
-    }
+    },
+    showActions () { return this.$store.state.users.currentUser.id === this.userId }
   },
   methods: {
     fetchEntries () {
diff --git a/src/components/follow_list/follow_list.vue b/src/components/follow_list/follow_list.vue
index 24ab97d89..7be2e7b77 100644
--- a/src/components/follow_list/follow_list.vue
+++ b/src/components/follow_list/follow_list.vue
@@ -3,7 +3,8 @@
     <user-card
       v-for="entry in entries"
       :key="entry.id" :user="entry"
-      :showFollows="true"
+      :showFollows="!showFollowers"
+      :showActions="showActions"
     />
     <div class="text-center panel-footer">
       <a v-if="error" @click="fetchEntries" class="alert error">
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index ecc36a4dd..a4c84716d 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -1,16 +1,21 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 
 const UserCard = {
   props: [
     'user',
     'showFollows',
-    'showApproval'
+    'showApproval',
+    'showActions'
   ],
   data () {
     return {
-      userExpanded: false
+      userExpanded: false,
+      followRequestInProgress: false,
+      followRequestSent: false,
+      updated: false
     }
   },
   components: {
@@ -18,7 +23,11 @@ const UserCard = {
     UserAvatar
   },
   computed: {
-    currentUser () { return this.$store.state.users.currentUser }
+    currentUser () { return this.$store.state.users.currentUser },
+    following () { return this.updated ? this.updated.following : this.user.following },
+    showFollow () {
+      return this.showActions && (!this.showFollows && !this.following || this.updated && !this.updated.following)
+    }
   },
   methods: {
     toggleUserExpanded () {
@@ -34,6 +43,21 @@ const UserCard = {
     },
     userProfileLink (user) {
       return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
+    },
+    followUser () {
+      this.followRequestInProgress = true
+      requestFollow(this.user, this.$store).then(({ sent, updated }) => {
+        this.followRequestInProgress = false
+        this.followRequestSent = sent
+        this.updated = updated
+      })
+    },
+    unfollowUser () {
+      this.followRequestInProgress = true
+      requestUnfollow(this.user, this.$store).then(({ updated }) => {
+        this.followRequestInProgress = false
+        this.updated = updated
+      })
     }
   }
 }
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 7129430b8..12960c02d 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -7,22 +7,43 @@
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
     <div class="name-and-screen-name" v-else>
-      <div :title="user.name" v-if="user.name_html" class="user-name">
-        <span v-html="user.name_html"></span>
+      <div :title="user.name" class="user-name">
+        <span v-if="user.name_html" v-html="user.name_html"></span>
+        <span v-else>{{ user.name }}</span>
         <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
           {{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }}
         </span>
       </div>
-      <div :title="user.name" v-else class="user-name">
-        {{ user.name }}
-        <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
-          {{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }}
-        </span>
+      <div class="user-link-action">
+        <router-link class='user-screen-name' :to="userProfileLink(user)">
+          @{{user.screen_name}}
+        </router-link>
+        <button 
+          v-if="showFollow" 
+          class="btn btn-default" 
+          @click="followUser" 
+          :disabled="followRequestInProgress"
+          :title="followRequestSent ? $t('user_card.follow_again') : ''"
+        >
+          <template v-if="followRequestInProgress">
+            {{ $t('user_card.follow_progress') }}
+          </template>
+          <template v-else-if="followRequestSent">
+            {{ $t('user_card.follow_sent') }}
+          </template>
+          <template v-else>
+            {{ $t('user_card.follow') }}
+          </template>
+        </button>
+        <button v-if="showActions && showFollows && following" class="btn btn-default" @click="unfollowUser" :disabled="followRequestInProgress">
+          <template v-if="followRequestInProgress">
+            {{ $t('user_card.follow_progress') }}
+          </template>
+          <template v-else>
+            {{ $t('user_card.follow_unfollow') }}
+          </template>
+        </button>
       </div>
-
-      <router-link class='user-screen-name' :to="userProfileLink(user)">
-        @{{user.screen_name}}
-      </router-link>
     </div>
     <div class="approval" v-if="showApproval">
       <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
@@ -42,6 +63,9 @@
   text-align: left;
   width: 100%;
   .user-name {
+    display: flex;
+    justify-content: space-between;
+
     img {
       object-fit: contain;
       height: 16px;
@@ -49,11 +73,20 @@
       vertical-align: middle;
     }
   }
+  
+  .user-link-action {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+
+    button {
+      margin-top: 3px;
+    }
+  }
 }
 
 .follows-you {
   margin-left: 2em;
-  float: right;
 }
 
 .card {
diff --git a/src/components/user_card_content/user_card_content.js b/src/components/user_card_content/user_card_content.js
index 1888f8c6d..7a7b89d49 100644
--- a/src/components/user_card_content/user_card_content.js
+++ b/src/components/user_card_content/user_card_content.js
@@ -1,5 +1,6 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
+import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 export default {
@@ -92,69 +93,17 @@ export default {
   },
   methods: {
     followUser () {
-      const store = this.$store
       this.followRequestInProgress = true
-      store.state.api.backendInteractor.followUser(this.user.id)
-        .then((followedUser) => store.commit('addNewUsers', [followedUser]))
-        .then(() => {
-          // For locked users we just mark it that we sent the follow request
-          if (this.user.locked) {
-            this.followRequestInProgress = false
-            this.followRequestSent = true
-            return
-          }
-
-          if (this.user.following) {
-            // If we get result immediately, just stop.
-            this.followRequestInProgress = false
-            return
-          }
-
-          // But usually we don't get result immediately, so we ask server
-          // for updated user profile to confirm if we are following them
-          // Sometimes it takes several tries. Sometimes we end up not following
-          // user anyway, probably because they locked themselves and we
-          // don't know that yet.
-          // Recursive Promise, it will call itself up to 3 times.
-          const fetchUser = (attempt) => new Promise((resolve, reject) => {
-            setTimeout(() => {
-              store.state.api.backendInteractor.fetchUser({ id: this.user.id })
-                .then((user) => store.commit('addNewUsers', [user]))
-                .then(() => resolve([this.user.following, attempt]))
-                .catch((e) => reject(e))
-            }, 500)
-          }).then(([following, attempt]) => {
-            if (!following && attempt <= 3) {
-              // If we BE reports that we still not following that user - retry,
-              // increment attempts by one
-              return fetchUser(++attempt)
-            } else {
-              // If we run out of attempts, just return whatever status is.
-              return following
-            }
-          })
-
-          return fetchUser(1)
-            .then((following) => {
-              if (following) {
-                // We confirmed and everything its good.
-                this.followRequestInProgress = false
-              } else {
-                // If after all the tries, just treat it as if user is locked
-                this.followRequestInProgress = false
-                this.followRequestSent = true
-              }
-            })
-        })
+      requestFollow(this.user, this.$store).then(({sent}) => {
+        this.followRequestInProgress = false
+        this.followRequestSent = sent
+      })
     },
     unfollowUser () {
-      const store = this.$store
       this.followRequestInProgress = true
-      store.state.api.backendInteractor.unfollowUser(this.user.id)
-        .then((unfollowedUser) => store.commit('addNewUsers', [unfollowedUser]))
-        .then(() => {
-          this.followRequestInProgress = false
-        })
+      requestUnfollow(this.user, this.$store).then(() => {
+        this.followRequestInProgress = false
+      })
     },
     blockUser () {
       const store = this.$store
diff --git a/src/services/follow_manipulate/follow_manipulate.js b/src/services/follow_manipulate/follow_manipulate.js
new file mode 100644
index 000000000..1e9bd6791
--- /dev/null
+++ b/src/services/follow_manipulate/follow_manipulate.js
@@ -0,0 +1,74 @@
+const fetchUser = (attempt, user, store) => new Promise((resolve, reject) => {
+  setTimeout(() => {
+    store.state.api.backendInteractor.fetchUser({ id: user.id })
+      .then((user) => store.commit('addNewUsers', [user]))
+      .then(() => resolve([user.following, attempt]))
+      .catch((e) => reject(e))
+  }, 500)
+}).then(([following, attempt]) => {
+  if (!following && attempt <= 3) {
+    // If we BE reports that we still not following that user - retry,
+    // increment attempts by one
+    return fetchUser(++attempt, user, store)
+  } else {
+    // If we run out of attempts, just return whatever status is.
+    return following
+  }
+})
+
+export const requestFollow = (user, store) => new Promise((resolve, reject) => {
+  store.state.api.backendInteractor.followUser(user.id)
+    .then((updated) => {
+      store.commit('addNewUsers', [updated])
+
+      // For locked users we just mark it that we sent the follow request
+      if (updated.locked) {
+        resolve({
+          sent: true,
+          updated
+        })
+      }
+
+      if (updated.following) {
+        // If we get result immediately, just stop.
+        resolve({
+          sent: false,
+          updated
+        })
+      }
+
+      // But usually we don't get result immediately, so we ask server
+      // for updated user profile to confirm if we are following them
+      // Sometimes it takes several tries. Sometimes we end up not following
+      // user anyway, probably because they locked themselves and we
+      // don't know that yet.
+      // Recursive Promise, it will call itself up to 3 times.
+
+      return fetchUser(1, user, store)
+        .then((following) => {
+          if (following) {
+            // We confirmed and everything's good.
+            resolve({
+              sent: false,
+              updated
+            })
+          } else {
+            // If after all the tries, just treat it as if user is locked
+            resolve({
+              sent: false,
+              updated
+            })
+          }
+        })
+    })
+})
+
+export const requestUnfollow = (user, store) => new Promise((resolve, reject) => {
+  store.state.api.backendInteractor.unfollowUser(user.id)
+    .then((updated) => {
+      store.commit('addNewUsers', [updated])
+      resolve({
+        updated
+      })
+    })
+})

From 7addd408a9fa7f3a3d7966e050feaa162c8f6a5c Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Sun, 10 Feb 2019 12:06:13 -0700
Subject: [PATCH 38/51] Typo

---
 test/unit/specs/services/matcher/matcher.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/specs/services/matcher/matcher.spec.js b/test/unit/specs/services/matcher/matcher.spec.js
index 0b5363b4b..7a2494f07 100644
--- a/test/unit/specs/services/matcher/matcher.spec.js
+++ b/test/unit/specs/services/matcher/matcher.spec.js
@@ -17,7 +17,7 @@ const externalAttn = () => ({
 })
 
 describe('MatcherService', () => {
-  describe.only('mentionMatchesUrl', () => {
+  describe('mentionMatchesUrl', () => {
     it('should match local mention', () => {
       const attention = localAttn()
       const url = 'https://instance.com/users/person'
@@ -60,7 +60,7 @@ describe('MatcherService', () => {
       expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(false)
     })
   })
-  describe.only('extractTagFromUrl', () => {
+  describe('extractTagFromUrl', () => {
     it('should return tag name from valid pleroma url', () => {
       const url = 'https://website.com/tag/photo'
 

From be77707381609e555c565f6ba187318562e57dcf Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Sun, 10 Feb 2019 19:32:01 -0700
Subject: [PATCH 39/51] Fix unit test

---
 .../services/entity_normalizer/entity_normalizer.spec.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index 703fecf1c..6245361ca 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -241,7 +241,7 @@ describe('API Entities normalizer', () => {
         notice: makeMockStatusQvitter({ id: 444 }),
         from_profile: makeMockUserQvitter({ id: 'spurdo' })
       })
-      expect(parseNotification(notif)).to.have.property('id', '123')
+      expect(parseNotification(notif)).to.have.property('id', 123)
       expect(parseNotification(notif)).to.have.property('seen', false)
       expect(parseNotification(notif)).to.have.deep.property('status.id', '444')
       expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
@@ -259,7 +259,7 @@ describe('API Entities normalizer', () => {
         is_seen: 1,
         from_profile: makeMockUserQvitter({ id: 'spurdo' })
       })
-      expect(parseNotification(notif)).to.have.property('id', '123')
+      expect(parseNotification(notif)).to.have.property('id', 123)
       expect(parseNotification(notif)).to.have.property('type', 'like')
       expect(parseNotification(notif)).to.have.property('seen', true)
       expect(parseNotification(notif)).to.have.deep.property('status.id', '4412')

From db465ff839f9ff1eff5ad2bae9c5403f020dc228 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Mon, 11 Feb 2019 00:06:37 -0800
Subject: [PATCH 40/51] Fix max-width of profile banner in setting

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

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 134f70eff..d2381da22 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -178,7 +178,7 @@
   }
 
   .banner {
-    max-width: 400px;
+    max-width: 100%;
   }
 
   .uploading {

From 9959c311a9d0f4aa6c71309564979caf38a037a8 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Mon, 11 Feb 2019 07:38:12 -0700
Subject: [PATCH 41/51] Fix clicking link - open new tab unless tag or mention

---
 src/components/status/status.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 06e4fe934..50198928d 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -299,7 +299,9 @@ const Status = {
             const link = this.generateTagLink(tag)
             this.$router.push(link)
           }
+          return
         }
+        window.open(target.href, '_blank')
       }
     },
     toggleReplying () {

From f3d2e41a9b4908c38a6bcd72b8e1a97611270511 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Mon, 11 Feb 2019 07:45:22 -0700
Subject: [PATCH 42/51] Fix return

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

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 50198928d..0273a5bee 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -298,8 +298,8 @@ const Status = {
           if (tag) {
             const link = this.generateTagLink(tag)
             this.$router.push(link)
+            return
           }
-          return
         }
         window.open(target.href, '_blank')
       }

From 2226f800766f04a552047d6a01df119172afc09e Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Mon, 11 Feb 2019 18:29:56 +0000
Subject: [PATCH 43/51] Update spanish translate - es.json

---
 src/i18n/es.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 29c8aec4c..d14e7a315 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -140,6 +140,7 @@
     "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
     "hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
     "hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
+    "hide_filtered_statuses": "Ocultar estados filtrados",
     "import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
     "import_theme": "Importar tema",
     "inputRadius": "Campos de entrada",

From 4d930c7c2689ece37c58edfba1b62ff50617a4ce Mon Sep 17 00:00:00 2001
From: jared <jaredrmain@gmail.com>
Date: Mon, 11 Feb 2019 23:03:51 -0500
Subject: [PATCH 44/51] 345 - fix long username issue in repeat status

---
 src/components/status/status.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 76daf73a0..aae365d13 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -438,6 +438,8 @@
 
       .user-name {
         font-weight: bold;
+        overflow: hidden;
+        text-overflow: ellipsis;
 
         img {
           width: 14px;

From 493d542d9292f580460ddec78f9083b9fbae99ec Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Tue, 12 Feb 2019 05:10:27 -0500
Subject: [PATCH 45/51] #341 - automatic scroll with repeats/reports

---
 src/components/conversation/conversation.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index c18781de5..93e168d72 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -36,6 +36,13 @@ const conversation = {
     status () {
       return this.statusoid
     },
+    actualId () {
+      if (this.statusoid.retweeted_status) {
+        return this.statusoid.retweeted_status.id
+      } else {
+        return this.statusoid.id
+      }
+    },
     conversation () {
       if (!this.status) {
         return []
@@ -79,7 +86,7 @@ const conversation = {
         const conversationId = this.status.statusnet_conversation_id
         this.$store.state.api.backendInteractor.fetchConversation({id: conversationId})
           .then((statuses) => this.$store.dispatch('addNewStatuses', { statuses }))
-          .then(() => this.setHighlight(this.statusoid.id))
+          .then(() => this.setHighlight(this.actualId))
       } else {
         const id = this.$route.params.id
         this.$store.state.api.backendInteractor.fetchStatus({id})
@@ -91,11 +98,7 @@ const conversation = {
       return this.replies[id] || []
     },
     focused (id) {
-      if (this.statusoid.retweeted_status) {
-        return (id === this.statusoid.retweeted_status.id)
-      } else {
-        return (id === this.statusoid.id)
-      }
+      return id === this.actualId
     },
     setHighlight (id) {
       this.highlight = id

From 25bb80a9820681f44fb6684d7cddd5b3457e4d80 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Tue, 12 Feb 2019 10:35:54 -0500
Subject: [PATCH 46/51] #341 - fix naming

---
 src/components/conversation/conversation.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 93e168d72..2f7852b8b 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -36,7 +36,7 @@ const conversation = {
     status () {
       return this.statusoid
     },
-    actualId () {
+    statusId () {
       if (this.statusoid.retweeted_status) {
         return this.statusoid.retweeted_status.id
       } else {
@@ -86,7 +86,7 @@ const conversation = {
         const conversationId = this.status.statusnet_conversation_id
         this.$store.state.api.backendInteractor.fetchConversation({id: conversationId})
           .then((statuses) => this.$store.dispatch('addNewStatuses', { statuses }))
-          .then(() => this.setHighlight(this.actualId))
+          .then(() => this.setHighlight(this.statusId))
       } else {
         const id = this.$route.params.id
         this.$store.state.api.backendInteractor.fetchStatus({id})
@@ -98,7 +98,7 @@ const conversation = {
       return this.replies[id] || []
     },
     focused (id) {
-      return id === this.actualId
+      return id === this.statusId
     },
     setHighlight (id) {
       this.highlight = id

From 64fab9d7bcd3785506cd5c2a8869eb9162d9e9ad Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Tue, 12 Feb 2019 13:55:00 -0500
Subject: [PATCH 47/51] this fixes #350 - v-model binding issue

---
 src/components/autocomplete_input/autocomplete_input.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/autocomplete_input/autocomplete_input.js b/src/components/autocomplete_input/autocomplete_input.js
index 2a959fd15..404a8cdbc 100644
--- a/src/components/autocomplete_input/autocomplete_input.js
+++ b/src/components/autocomplete_input/autocomplete_input.js
@@ -126,6 +126,7 @@ const AutoCompleteInput = {
         const candidate = this.candidates[this.highlighted]
         const replacement = candidate.utf || (candidate.screen_name + ' ')
         this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
+        this.$emit('input', this.text)
         const el = this.$el.querySelector('textarea') || this.$el.querySelector('input')
         el.focus()
         this.caret = 0

From 2100cb247dd045d87bcae4461a4b3fa364cec3a1 Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Wed, 13 Feb 2019 07:38:13 -0500
Subject: [PATCH 48/51] resolve issue in prop binding

---
 .../autocomplete_input/autocomplete_input.js           | 10 ++++------
 .../autocomplete_input/autocomplete_input.vue          |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/autocomplete_input/autocomplete_input.js b/src/components/autocomplete_input/autocomplete_input.js
index 404a8cdbc..cbe7e6226 100644
--- a/src/components/autocomplete_input/autocomplete_input.js
+++ b/src/components/autocomplete_input/autocomplete_input.js
@@ -24,8 +24,7 @@ const AutoCompleteInput = {
   data () {
     return {
       caret: 0,
-      highlighted: 0,
-      text: this.value
+      highlighted: 0
     }
   },
   computed: {
@@ -42,7 +41,7 @@ const AutoCompleteInput = {
       return (this.wordAtCaret || {}).word || ''
     },
     wordAtCaret () {
-      const word = Completion.wordAtPosition(this.text, this.caret - 1) || {}
+      const word = Completion.wordAtPosition(this.value, this.caret - 1) || {}
       return word
     },
     candidates () {
@@ -113,7 +112,7 @@ const AutoCompleteInput = {
       }
     },
     replace (replacement) {
-      this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
+      this.$emit('input', Completion.replaceWord(this.value, this.wordAtCaret, replacement))
       const el = this.$el.querySelector('textarea')
       el.focus()
       this.caret = 0
@@ -125,8 +124,7 @@ const AutoCompleteInput = {
         e.preventDefault()
         const candidate = this.candidates[this.highlighted]
         const replacement = candidate.utf || (candidate.screen_name + ' ')
-        this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
-        this.$emit('input', this.text)
+        this.$emit('input', Completion.replaceWord(this.value, this.wordAtCaret, replacement))
         const el = this.$el.querySelector('textarea') || this.$el.querySelector('input')
         el.focus()
         this.caret = 0
diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
index 56233535a..3af335626 100644
--- a/src/components/autocomplete_input/autocomplete_input.vue
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -4,8 +4,8 @@
       v-if="multiline"
       ref="textarea"
       rows="1"
-      :value="text" :class="classObj" :id="id" :placeholder="placeholder"
-      @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
+      :value="value" :class="classObj" :id="id" :placeholder="placeholder"
+      @input="$emit('input', $event.target.value), autoResize && resize($event)" 
       @click="setCaret"
       @keyup="setCaret"
       @keydown.down="cycleForward"
@@ -22,8 +22,8 @@
     <input
       v-else
       ref="textarea"
-      :value="text" :class="classObj" :id="id" :placeholder="placeholder"
-      @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" 
+      :value="value" :class="classObj" :id="id" :placeholder="placeholder"
+      @input="$emit('input', $event.target.value), autoResize && resize($event)" 
       @click="setCaret"
       @keyup="setCaret"
       @keydown.down="cycleForward"

From 98c27fd812b53e78457b76a327c0b10011d28e7b Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Wed, 13 Feb 2019 07:38:53 -0500
Subject: [PATCH 49/51] resolve issue related to event handler

---
 .../autocomplete_input/autocomplete_input.vue | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue
index 3af335626..1e26b76bc 100644
--- a/src/components/autocomplete_input/autocomplete_input.vue
+++ b/src/components/autocomplete_input/autocomplete_input.vue
@@ -13,11 +13,11 @@
       @keydown.shift.tab="cycleBackward"
       @keydown.tab="cycleForward"
       @keydown.enter="replaceCandidate"
-      @drop="drop && drop()"
-      @dragover.prevent="dragoverPrevent && dragoverPrevent()"
-      @paste="paste && paste()"
-      @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()"
-      @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()">
+      @drop="drop && drop($event)"
+      @dragover.prevent="dragoverPrevent && dragoverPrevent($event)"
+      @paste="paste && paste($event)"
+      @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter($event)"
+      @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter($event)">
     </textarea>
     <input
       v-else
@@ -31,11 +31,11 @@
       @keydown.shift.tab="cycleBackward"
       @keydown.tab="cycleForward"
       @keydown.enter="replaceCandidate"
-      @drop="drop && drop()"
-      @dragover.prevent="dragoverPrevent && dragoverPrevent()"
-      @paste="paste && paste()"
-      @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()"
-      @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()"/>
+      @drop="drop && drop($event)"
+      @dragover.prevent="dragoverPrevent && dragoverPrevent($event)"
+      @paste="paste && paste($event)"
+      @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter($event)"
+      @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter($event)"/>
     <div style="position:relative;" v-if="candidates">
       <div class="autocomplete-panel">
         <div v-for="candidate in candidates" @click="replace(candidate.utf || (candidate.screen_name + ' '))">

From 19dd36945ab91ad3a1cff9ddbbfadea437b75d6f Mon Sep 17 00:00:00 2001
From: Xiaofeng An <futureweb2020@yandex.com>
Date: Wed, 13 Feb 2019 15:39:37 -0500
Subject: [PATCH 50/51] resolve focus issue in the auto-complete for name field

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

diff --git a/src/components/autocomplete_input/autocomplete_input.js b/src/components/autocomplete_input/autocomplete_input.js
index cbe7e6226..1544e7bb0 100644
--- a/src/components/autocomplete_input/autocomplete_input.js
+++ b/src/components/autocomplete_input/autocomplete_input.js
@@ -113,7 +113,7 @@ const AutoCompleteInput = {
     },
     replace (replacement) {
       this.$emit('input', Completion.replaceWord(this.value, this.wordAtCaret, replacement))
-      const el = this.$el.querySelector('textarea')
+      const el = this.$el.querySelector('textarea') || this.$el.querySelector('input')
       el.focus()
       this.caret = 0
     },

From 688906a61ed195aae911de8248d6209854de14dc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 14 Feb 2019 00:11:11 +0200
Subject: [PATCH 51/51] fix convos

---
 src/components/conversation/conversation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 2f7852b8b..48b8aaaa5 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -9,9 +9,9 @@ const sortById = (a, b) => {
   if (isSeqA && isSeqB) {
     return seqA < seqB ? -1 : 1
   } else if (isSeqA && !isSeqB) {
-    return 1
-  } else if (!isSeqA && isSeqB) {
     return -1
+  } else if (!isSeqA && isSeqB) {
+    return 1
   } else {
     return a.id < b.id ? -1 : 1
   }