From 1455e1f9d50dc85b4467f410e6119480b6d1ebf1 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 15:29:24 -0400
Subject: [PATCH 1/6] eliminate expandable prop in favor of inConversation

---
 src/components/conversation/conversation.vue | 1 -
 src/components/status/status.js              | 1 -
 src/components/status/status.vue             | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index c3bbb597..ff5b8168 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -13,7 +13,6 @@
       :key="status.id"
       :inlineExpanded="collapsable"
       :statusoid="status"
-      :expandable='!isExpanded'
       :focused="focused(status.id)"
       :inConversation="isExpanded"
       :highlight="getHighlight()"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index ff8cbe18..a47b22a7 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -18,7 +18,6 @@ const Status = {
   name: 'Status',
   props: [
     'statusoid',
-    'expandable',
     'inConversation',
     'focused',
     'highlight',
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 43c3030e..495d088d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -52,7 +52,7 @@
                 <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-                <template v-if="expandable && !isPreview">
+                <template v-if="!inConversation && !isPreview">
                   <a href="#" @click.prevent="toggleExpanded" title="Expand">
                     <i class="button-icon icon-plus-squared"></i>
                   </a>

From 3adfbc0357742ff69c15ceebb0eb0d3339459536 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 15:30:36 -0400
Subject: [PATCH 2/6] expanded is always false, eliminate it

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

diff --git a/src/components/status/status.js b/src/components/status/status.js
index a47b22a7..c873d407 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -30,7 +30,6 @@ const Status = {
   data () {
     return {
       replying: false,
-      expanded: false,
       unmuted: false,
       userExpanded: false,
       preview: null,
@@ -160,7 +159,7 @@ const Status = {
       if (this.$store.state.config.replyVisibility === 'all') {
         return false
       }
-      if (this.inlineExpanded || this.expanded || this.inConversation || !this.isReply) {
+      if (this.inlineExpanded || this.inConversation || !this.isReply) {
         return false
       }
       if (this.status.user.id === this.$store.state.users.currentUser.id) {

From 1a3799bfacd70fc51bc58a5a8b7ac2c88f9ed7dd Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 16:16:43 -0400
Subject: [PATCH 3/6] fix wrong inlineExpanded

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

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index ff5b8168..877d65ec 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -11,7 +11,7 @@
       @goto="setHighlight"
       @toggleExpanded="toggleExpanded"
       :key="status.id"
-      :inlineExpanded="collapsable"
+      :inlineExpanded="collapsable && isExpanded"
       :statusoid="status"
       :focused="focused(status.id)"
       :inConversation="isExpanded"

From 44a18eb8380bc7094c722df5aaadb29d45074dbe Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 16:17:29 -0400
Subject: [PATCH 4/6] make it short

---
 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 c873d407..d5895832 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -159,7 +159,7 @@ const Status = {
       if (this.$store.state.config.replyVisibility === 'all') {
         return false
       }
-      if (this.inlineExpanded || this.inConversation || !this.isReply) {
+      if (this.inConversation || !this.isReply) {
         return false
       }
       if (this.status.user.id === this.$store.state.users.currentUser.id) {

From 134b1894d69074c0b51814888faa57c09f610e99 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 16:41:12 -0400
Subject: [PATCH 5/6] =?UTF-8?q?status=20attention=20doesn=E2=80=99t=20have?=
 =?UTF-8?q?=20relationship=20entities?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 d5895832..123caf16 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -173,7 +173,7 @@ const Status = {
         if (this.status.user.id === this.status.attentions[i].id) {
           continue
         }
-        if (checkFollowing && this.status.attentions[i].following) {
+        if (checkFollowing && this.$store.getters.findUser(this.status.attentions[i].id).following) {
           return false
         }
         if (this.status.attentions[i].id === this.$store.state.users.currentUser.id) {

From 917e82e8eedb231cee0b1f6e95ac9c5dbba03e35 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 21:36:55 -0400
Subject: [PATCH 6/6] Revert "eliminate expandable prop in favor of
 inConversation"

This reverts commit 1455e1f9d50dc85b4467f410e6119480b6d1ebf1.
---
 src/components/conversation/conversation.vue | 1 +
 src/components/status/status.js              | 1 +
 src/components/status/status.vue             | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 877d65ec..d04ff722 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -13,6 +13,7 @@
       :key="status.id"
       :inlineExpanded="collapsable && isExpanded"
       :statusoid="status"
+      :expandable='!isExpanded'
       :focused="focused(status.id)"
       :inConversation="isExpanded"
       :highlight="getHighlight()"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 123caf16..c01cfe79 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -18,6 +18,7 @@ const Status = {
   name: 'Status',
   props: [
     'statusoid',
+    'expandable',
     'inConversation',
     'focused',
     'highlight',
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 495d088d..43c3030e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -52,7 +52,7 @@
                 <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-                <template v-if="!inConversation && !isPreview">
+                <template v-if="expandable && !isPreview">
                   <a href="#" @click.prevent="toggleExpanded" title="Expand">
                     <i class="button-icon icon-plus-squared"></i>
                   </a>