Highlight original notice when expanding retweets

2 files changed, 6 insertions, 2 deletions

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,