prevent showing pinned statuses twice

3 files changed, 11 insertions, 2 deletions

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 5e24bd15..55602c7b 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -11,7 +11,8 @@ const Timeline = {
     'userId',
     'tag',
     'embedded',
-    'count'
+    'count',
+    'excludedStatusIds'
   ],
   data () {
     return {
@@ -39,6 +40,13 @@ const Timeline = {
         body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []),
         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: {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 1fc52083..623f65d7 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -29,7 +29,7 @@
     <div :class="classes.body">
       <div class="timeline">
         <conversation
-          v-for="status in timeline.visibleStatuses"
+          v-for="status in statuses"
           :key="status.id"
           class="status-fadein"
           :statusoid="status"
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 4ea0a869..1723cffa 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -75,6 +75,7 @@
           timeline-name="media"
           :timeline="media"
           :user-id="userId"
+          :excludedStatusIds="user.pinnedStatuseIds"
         />
         <Timeline
           v-if="isUs"