From 289326855caa5e763439f89f2829c430056e79c3 Mon Sep 17 00:00:00 2001
From: wakarimasen <wakarimasen@airmail.cc>
Date: Sun, 5 Mar 2017 16:31:01 +0100
Subject: Add focused prop to status

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

(limited to 'src/components/conversation/conversation.js')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ecc76e71..524737fd 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -47,6 +47,9 @@ const conversation = {
           .then((status) => this.$store.dispatch('addNewStatuses', { statuses: [status] }))
           .then(() => this.fetchConversation())
       }
+    },
+    focused: function(id) {
+      return (id == this.statusoid.id)
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 51160f0fdb068f0c9a1133fe66286467b1f4fd78 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 5 Mar 2017 20:36:22 +0100
Subject: Style fixes.

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

(limited to 'src/components/conversation/conversation.js')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 524737fd..a598b521 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -48,8 +48,8 @@ const conversation = {
           .then(() => this.fetchConversation())
       }
     },
-    focused: function(id) {
-      return (id == this.statusoid.id)
+    focused: function (id) {
+      return (id === this.statusoid.id)
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 9d56721533d46cbd88db8e64edb8d6fddf61298e Mon Sep 17 00:00:00 2001
From: wakarimasen <wakarimasen@airmail.cc>
Date: Mon, 6 Mar 2017 16:21:11 +0100
Subject: Highlight original notice when expanding retweets

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

(limited to 'src/components/conversation/conversation.js')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index a598b521..769893d3 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -49,7 +49,11 @@ const conversation = {
       }
     },
     focused: function (id) {
-      return (id === this.statusoid.id)
+      if (!!this.statusoid.retweeted_status) {
+        return (id === this.statusoid.retweeted_status.id)
+      } else {
+        return (id === this.statusoid.id)
+      }
     }
   }
 }
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 101a0e14..bc9d6e6c 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -32,7 +32,7 @@ const Status = {
       return !!this.$store.state.users.currentUser
     },
     muted () { return !this.unmuted && this.status.user.muted },
-    isReply () { return !!this.statusoid.in_reply_to_status_id }
+    isReply () { return !!this.status.in_reply_to_status_id }
   },
   components: {
     Attachment,
-- 
cgit v1.2.3-70-g09d2


From bde12418433f3ae9d2ad3781343f334caf58cc95 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 8 Mar 2017 17:58:49 +0100
Subject: eslint fixes.

---
 src/components/conversation/conversation.js | 2 +-
 test/unit/specs/modules/statuses.spec.js    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/components/conversation/conversation.js')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 769893d3..281b0183 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -49,7 +49,7 @@ const conversation = {
       }
     },
     focused: function (id) {
-      if (!!this.statusoid.retweeted_status) {
+      if (this.statusoid.retweeted_status) {
         return (id === this.statusoid.retweeted_status.id)
       } else {
         return (id === this.statusoid.id)
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index b1581e03..891423ca 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -1,6 +1,7 @@
 import { cloneDeep } from 'lodash'
 import { defaultState, mutations, findMaxId, prepareStatus, statusType } from '../../../../src/modules/statuses.js'
 
+// eslint-disable-next-line camelcase
 const makeMockStatus = ({id, text, is_post_verb = true}) => {
   return {
     id,
-- 
cgit v1.2.3-70-g09d2