diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 20:55:24 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 20:55:24 +0000 |
| commit | e2e3a65c44c1bd73d3d727333e6163e9b0d07653 (patch) | |
| tree | a33bb1dbdf1bc9cb08154b2cac4bca455842d1c6 /src | |
| parent | 86696167b78b4f171ae60973e4a59e8ee59419b2 (diff) | |
| parent | 31a71ee3eee06b552e17ffe8485977c3e910f093 (diff) | |
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 (limited to 'src')
| -rw-r--r-- | src/components/conversation/conversation.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index e806be8e..a2fef3f8 100644 --- 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 { |