diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 55602c7be7..7c8a761a80 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -12,7 +12,7 @@ const Timeline = { 'tag', 'embedded', 'count', - 'excludedStatusIds' + 'pinnedStatusIds' ], data () { return { @@ -42,8 +42,8 @@ const Timeline = { } }, statuses () { - if (this.excludedStatusIds && this.excludedStatusIds.length > 0) { - return this.timeline.visibleStatuses && this.timeline.visibleStatuses.filter(status => !this.excludedStatusIds.includes(status.id)) + if (this.pinnedStatusIds && this.pinnedStatusIds.length > 0) { + return this.timeline.visibleStatuses && this.timeline.visibleStatuses.filter(status => !this.pinnedStatusIds.includes(status.id)) } else { return this.timeline.visibleStatuses } diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 1723cffa8f..81c63d7eae 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -34,6 +34,7 @@ :timeline="timeline" :timeline-name="'user'" :user-id="userId" + :pinned-status-ids="user.pinnedStatuseIds" />