Skip to content
Snippets Groups Projects
Commit e2e3a65c authored by HJ's avatar HJ :fire:
Browse files

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
parents 86696167 31a71ee3
No related branches found
No related tags found
No related merge requests found
......@@ -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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment