srxl/akkoma-fe
1
0
Fork 1
forked from AkkomaGang/akkoma-fe
Code Pull requests Activity

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

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

Closes #460

See merge request pleroma/pleroma-fe!715
This commit is contained in:
HJ 2019-03-27 20:55:24 +00:00
commit e2e3a65c44
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/conversation/conversation.js
View file

@ -101,9 +101,9 @@ const conversation = {
this.$store.dispatch('addNewStatuses', { statuses: ancestors }) this.$store.dispatch('addNewStatuses', { statuses: ancestors })
this.$store.dispatch('addNewStatuses', { statuses: descendants }) this.$store.dispatch('addNewStatuses', { statuses: descendants })
set(this, 'converationStatusIds', [].concat( set(this, 'converationStatusIds', [].concat(
ancestors.map(_ => _.id), ancestors.map(_ => _.id).filter(_ => _ !== this.statusId),
this.statusId, this.statusId,
descendants.map(_ => _.id))) descendants.map(_ => _.id).filter(_ => _ !== this.statusId)))
}) })
.then(() => this.setHighlight(this.statusId)) .then(() => this.setHighlight(this.statusId))
} else { } else {