fix: showcase filtering

WatWowMap · Jan 27, 2024 · 8c9d08a · 8c9d08a
1 parent fe93cfc
commit 8c9d08a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/server/src/models/Pokestop.js b/server/src/models/Pokestop.js
@@ -207,14 +207,15 @@ class Pokestop extends Model {
       const general = []
       const rocketPokemon = []
       const displayTypes = []
+      let hasShowcase = false
       // preps arrays for interested objects
       Object.keys(args.filters).forEach((pokestop) => {
         switch (pokestop.charAt(0)) {
           case 'o':
             break
           case 'f':
           case 'h':
-            // do nothing
+            hasShowcase = true
             break
           case 'd':
             stardust.push(pokestop.slice(1).split('-')[0])
@@ -254,6 +255,7 @@ class Pokestop extends Model {
             break
         }
       })
+      if (hasShowcase) displayTypes.push('9')
 
       // builds the query
       query.andWhere((stops) => {
@@ -705,8 +707,8 @@ class Pokestop extends Model {
           .filter((event) =>
             isMad && !hasMultiInvasions
               ? MADE_UP_MAD_INVASIONS.includes(event.grunt_type) ||
-                (!event.grunt_type && filters[`b${event.display_type}`])
-              : !event.grunt_type && filters[`b${event.display_type}`],
+                !event.grunt_type
+              : !event.grunt_type,
           )
           .map((event) => ({
             event_expire_timestamp: event.incident_expire_timestamp,
@@ -739,7 +741,7 @@ class Pokestop extends Model {
                 ]
               : event.showcase_pokemon_type_id
               ? filters[`h${event.showcase_pokemon_type_id}`]
-              : true,
+              : filters[`b${event.display_type}`],
           )
       }
       if (