prevent showing pinned statuses twice
This commit is contained in:
parent
4827e4d972
commit
7f9feacd26
3 changed files with 11 additions and 2 deletions
|
@ -11,7 +11,8 @@ const Timeline = {
|
||||||
'userId',
|
'userId',
|
||||||
'tag',
|
'tag',
|
||||||
'embedded',
|
'embedded',
|
||||||
'count'
|
'count',
|
||||||
|
'excludedStatusIds'
|
||||||
],
|
],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
@ -39,6 +40,13 @@ const Timeline = {
|
||||||
body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []),
|
body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []),
|
||||||
footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : [])
|
footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : [])
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
statuses () {
|
||||||
|
if (this.excludedStatusIds && this.excludedStatusIds.length > 0) {
|
||||||
|
return this.timeline.visibleStatuses && this.timeline.visibleStatuses.filter(status => !this.excludedStatusIds.includes(status.id))
|
||||||
|
} else {
|
||||||
|
return this.timeline.visibleStatuses
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<div :class="classes.body">
|
<div :class="classes.body">
|
||||||
<div class="timeline">
|
<div class="timeline">
|
||||||
<conversation
|
<conversation
|
||||||
v-for="status in timeline.visibleStatuses"
|
v-for="status in statuses"
|
||||||
:key="status.id"
|
:key="status.id"
|
||||||
class="status-fadein"
|
class="status-fadein"
|
||||||
:statusoid="status"
|
:statusoid="status"
|
||||||
|
|
|
@ -75,6 +75,7 @@
|
||||||
timeline-name="media"
|
timeline-name="media"
|
||||||
:timeline="media"
|
:timeline="media"
|
||||||
:user-id="userId"
|
:user-id="userId"
|
||||||
|
:excludedStatusIds="user.pinnedStatuseIds"
|
||||||
/>
|
/>
|
||||||
<Timeline
|
<Timeline
|
||||||
v-if="isUs"
|
v-if="isUs"
|
||||||
|
|
Loading…
Reference in a new issue