From de03eda9f36c7ffdfb8f9f20102c801e01502385 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Jun 2019 23:39:30 +0300
Subject: [PATCH 1/3] fix user search

---
 src/modules/users.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index 739b8b92..22340271 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -356,7 +356,13 @@ const users = {
     },
     searchUsers (store, query) {
       // TODO: Move userSearch api into api.service
-      return userSearchApi.search({query, store: { state: store.rootState }})
+      return userSearchApi.search({
+        query,
+        store: {
+          state: store.rootState,
+          getters: store.rootGetters
+        }
+      })
         .then((users) => {
           store.commit('addNewUsers', users)
           return users

From 2b5ac611c915fc1374cd254c4f5917238316121b Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 17 Jun 2019 23:34:20 -0400
Subject: [PATCH 2/3] apply font smoothing in webkit and firefox

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

diff --git a/src/App.scss b/src/App.scss
index 52a786ad..284fa58b 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -47,6 +47,8 @@ body {
   color: var(--text, $fallback--text);
   max-width: 100vw;
   overflow-x: hidden;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 a {

From 76efbcbe9252106a9bb33b4c3017c15f85c5ac4d Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 18 Jun 2019 16:31:20 +0000
Subject: [PATCH 3/3] Misc fixes: Fix uploads stretching on chrome, fix
 warnings in console

---
 src/components/attachment/attachment.vue    | 1 +
 src/components/avatar_list/avatar_list.vue  | 7 ++++++-
 src/components/conversation/conversation.js | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index c58bebd3..fc9cc7a2 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -68,6 +68,7 @@
     max-height: 200px;
     max-width: 100%;
     display: flex;
+    align-items: center;
     video {
       max-width: 100%;
     }
diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue
index c0238570..343ef529 100644
--- a/src/components/avatar_list/avatar_list.vue
+++ b/src/components/avatar_list/avatar_list.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="avatars">
-    <router-link :to="userProfileLink(user)" class="avatars-item" v-for="user in slicedUsers">
+    <router-link
+      :to="userProfileLink(user)"
+      class="avatars-item"
+      v-for="user in slicedUsers"
+      :key="user.id"
+    >
       <UserAvatar :user="user" class="avatar-small" />
     </router-link>
   </div>
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index b3074590..8ae89421 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -139,6 +139,7 @@ const conversation = {
       return (this.isExpanded) && id === this.status.id
     },
     setHighlight (id) {
+      if (!id) return
       this.highlight = id
       this.$store.dispatch('fetchFavsAndRepeats', id)
     },