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
このコミットが含まれているのは:
コミット
e2e3a65c44
|
@ -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 {
|
||||||
|
|
読み込み中…
新しいイシューから参照