Merge branch 'fix/highlight-expanded-retweets' into 'develop'

Highlight original notice when expanding retweets

See merge request !43

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)
+      }
     }
   }
 }

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,