From d0541e3741d39f2a5c72d53f248c1e9f84e4ed70 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 7 Feb 2020 16:13:29 +0100
Subject: [PATCH] Hide promoted events on overview only if we already have them
 through participations

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/Home.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index 7e64ffd10..df9e55bf7 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -37,10 +37,10 @@
         <h3 class="title">
           {{ $t("Upcoming") }}
         </h3>
-        <b-loading :active.sync="$apollo.loading"></b-loading>
+        <b-loading :active.sync="$apollo.loading" />
         <div v-for="row of goingToEvents" class="upcoming-events" :key="row[0]">
           <span class="date-component-container" v-if="isInLessThanSevenDays(row[0])">
-            <date-component :date="row[0]"></date-component>
+            <date-component :date="row[0]" />
             <h3 class="subtitle"
               v-if="isToday(row[0])">
               {{ $tc('You have one event today.', row[1].length, {count: row[1].length}) }}
@@ -71,7 +71,7 @@
         <h3 class="title">
           {{ $t("Last week") }}
         </h3>
-        <b-loading :active.sync="$apollo.loading"></b-loading>
+        <b-loading :active.sync="$apollo.loading" />
         <div>
             <EventListCard
                     v-for="participation in lastWeekEvents"
@@ -83,7 +83,7 @@
       </section>
       <section class="events-featured">
         <h3 class="title">{{ $t('Featured events') }}</h3>
-        <b-loading :active.sync="$apollo.loading"></b-loading>
+        <b-loading :active.sync="$apollo.loading" />
         <div v-if="filteredFeaturedEvents.length > 0" class="columns is-multiline">
           <div class="column is-one-third-desktop" v-for="event in filteredFeaturedEvents.slice(0, 6)" :key="event.uuid">
             <EventCard
@@ -261,9 +261,11 @@ export default class Home extends Vue {
     return res;
   }
 
+  /**
+   * Return all events from server excluding the ones shown as participating
+   */
   get filteredFeaturedEvents() {
-    if (!this.currentUser.isLoggedIn || !this.currentActor.id) return this.events;
-    return this.events.filter(event => event.organizerActor && event.organizerActor.id !== this.currentActor.id);
+    return this.events.filter(({ id }) => !this.currentUserParticipations.map(({ event: { id } }) => id).includes(id));
   }
 
   geoLocalize() {