pleroma-fe

commit: e2e3a65c44c1bd73d3d727333e6163e9b0d07653
parent: 86696167b78b4f171ae60973e4a59e8ee59419b2
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Wed, 27 Mar 2019 20:55:24 +0000

Merge branch 'fix/convos-masto' into 'develop'

Apparently, MastoAPI gives status in ancestors if you try opening a repeat...

Closes #460

See merge request pleroma/pleroma-fe!715
Diffstat:
M
src/components/conversation/conversation.js
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
@@ -101,9 +101,9 @@ const conversation = {
             this.$store.dispatch('addNewStatuses', { statuses: ancestors })
             this.$store.dispatch('addNewStatuses', { statuses: descendants })
             set(this, 'converationStatusIds', [].concat(
-              ancestors.map(_ => _.id),
+              ancestors.map(_ => _.id).filter(_ => _ !== this.statusId),
               this.statusId,
-              descendants.map(_ => _.id)))
+              descendants.map(_ => _.id).filter(_ => _ !== this.statusId)))
           })
           .then(() => this.setHighlight(this.statusId))
       } else {