WatWowMap · TurtIeSocks · Nov 9, 2022 · Nov 9, 2022
diff --git a/public/base-locales/en.json b/public/base-locales/en.json
@@ -558,5 +558,7 @@
   "seen_nearby_cell": "Seen in this Cell",
   "seen_lure_encounter": "Lure Encounter",
   "seen_lure_wild": "Lure Spawn",
-  "seen_wild": "Wild Spawn"
-}
+  "seen_wild": "Wild Spawn",
+  "event_stops": "Event Stops",
+  "event_stop_timers": "Event Stop Timers"
+}
diff --git a/server/src/configs/default.json b/server/src/configs/default.json
@@ -300,6 +300,7 @@
       "clustering": true,
       "invasionTimers": false,
       "lureTimers": false,
+      "eventStopTimers": false,
       "interactionRanges": false,
       "lureRange": false,
       "madQuestText": false,
@@ -419,6 +420,7 @@
       "levels": "all",
       "lures": true,
       "quests": true,
+      "eventStops": false,
       "questSet": "both",
       "items": true,
       "megaEnergy": true,

diff --git a/server/src/models/Pokestop.js b/server/src/models/Pokestop.js
@@ -70,6 +70,7 @@ module.exports = class Pokestop extends Model {
         onlyInvasions,
         onlyArEligible,
         onlyAllPokestops,
+        onlyEventStops,
         onlyAreas = [],
       },
       ts,
@@ -515,11 +516,24 @@ module.exports = class Pokestop extends Model {
             ar.where(isMad ? 'is_ar_scan_eligible' : 'ar_scan_eligible', 1)
           })
         }
+        if (onlyEventStops && pokestopPerms) {
+          stops.orWhere((event) => {
+            event
+              .where('display_type', 7)
+              .andWhere('character', 0)
+              .andWhere(
+                multiInvasionMs ? 'expiration_ms' : 'expiration',
+                '>=',
+                safeTs * (multiInvasionMs ? 1000 : 1),
+              )
+          })
+        }
       })
     } else if (onlyLevels !== 'all' && hasPowerUp) {
       query.andWhere('power_up_level', onlyLevels)
     }
     const results = await query
+
     const normalized = isMad
       ? this.mapMAD(results, safeTs)
       : this.mapRDM(results, safeTs)
@@ -571,16 +585,25 @@ module.exports = class Pokestop extends Model {
           'power_up_level',
           'power_up_end_timestamp',
         ])
+        if (filters.onlyEventStops) {
+          filtered.invasions = pokestop.invasions.filter(
+            (invasion) => !invasion.grunt_type,
+          )
+        }
       }
       if (
         perms.invasions &&
         (filters.onlyAllPokestops || filters.onlyInvasions)
       ) {
-        filtered.invasions = filters.onlyAllPokestops
-          ? pokestop.invasions
-          : pokestop.invasions.filter(
-              (invasion) => filters[`i${invasion.grunt_type}`],
-            )
+        filtered.invasions = [
+          ...(Array.isArray(filtered.invasions) ? filtered.invasions : []),
+          ...(filters.onlyAllPokestops
+            ? pokestop.invasions
+            : pokestop.invasions.filter(
+                (invasion) =>
+                  invasion.grunt_type && filters[`i${invasion.grunt_type}`],
+              )),
+        ]
       }
       if (
         perms.lures &&
@@ -715,7 +738,10 @@ module.exports = class Pokestop extends Model {
           }
         })
       }
-      if (invasion.grunt_type && invasion.incident_expire_timestamp >= ts) {
+      if (
+        typeof invasion.grunt_type === 'number' &&
+        invasion.incident_expire_timestamp >= ts
+      ) {
         filtered[result.id].invasions.push(invasion)
       }
       filtered[result.id].quests.push(quest)
@@ -755,7 +781,10 @@ module.exports = class Pokestop extends Model {
       if (altQuest.quest_reward_type) {
         filtered[result.id].quests.push(altQuest)
       }
-      if (invasion.grunt_type && invasion.incident_expire_timestamp >= ts) {
+      if (
+        typeof invasion.grunt_type === 'number' &&
+        invasion.incident_expire_timestamp >= ts
+      ) {
         filtered[result.id].invasions.push(invasion)
       }
     }
@@ -1070,11 +1099,17 @@ module.exports = class Pokestop extends Model {
     } else {
       queries.invasions = this.query()
         .distinct(isMad ? 'incident_grunt_type AS grunt_type' : 'grunt_type')
+        .where(
+          isMad ? 'incident_grunt_type AS grunt_type' : 'grunt_type',
+          '>',
+          0,
+        )
         .where(
           isMad ? 'incident_expiration' : 'incident_expire_timestamp',
           '>=',
           isMad ? this.knex().fn.now() : ts,
         )
+
         .orderBy('grunt_type')
     }
     // invasions

diff --git a/server/src/services/defaultFilters/buildDefaultFilters.js b/server/src/services/defaultFilters/buildDefaultFilters.js
@@ -64,6 +64,9 @@ module.exports = function buildDefault(perms, available, dbModels) {
               ? defaultFilters.pokestops.levels
               : undefined,
             lures: perms.lures ? defaultFilters.pokestops.lures : undefined,
+            eventStops: perms.pokestops
+              ? defaultFilters.pokestops.eventStops
+              : undefined,
             quests: perms.quests ? defaultFilters.pokestops.quests : undefined,
             showQuestSet: defaultFilters.pokestops.questSet,
             invasions: perms.invasions

diff --git a/server/src/services/ui/clientOptions.js b/server/src/services/ui/clientOptions.js
@@ -26,6 +26,7 @@ module.exports = function clientOptions(perms) {
       clustering: { type: 'bool', perm: ['pokestops', 'quests', 'invasions'] },
       invasionTimers: { type: 'bool', perm: ['invasions'] },
       lureTimers: { type: 'bool', perm: ['lures'] },
+      eventStopTimers: { type: 'bool', perm: ['pokestops'] },
       interactionRanges: { type: 'bool', perm: ['pokestops'] },
       lureRange: { type: 'bool', perm: ['lures'] },
       hasQuestIndicator: { type: 'bool', perm: ['quests'] },

diff --git a/src/components/Map.jsx b/src/components/Map.jsx
@@ -203,6 +203,7 @@ export default function Map({
                     (filters[category].lures && value.lures) ||
                     (filters[category].invasions && value.invasions) ||
                     (filters[category].quests && value.quests) ||
+                    (filters[category].eventStops && value.eventStops) ||
                     (filters[category].arEligible && value.arEligible)) &&
                   !webhookMode
                 ) {

diff --git a/src/components/markers/pokestop.jsx b/src/components/markers/pokestop.jsx
@@ -42,12 +42,16 @@ export default function stopMarker(
   if (hasInvasion) {
     const { invasions } = pokestop
     invasions.forEach((invasion) => {
-      filterId = `i${invasion.grunt_type}`
-      invasionIcons.unshift(Icons.getInvasions(invasion.grunt_type))
-      invasionSizes.unshift(Icons.getSize('invasion', filters.filter[filterId]))
-      popupYOffset += rewardMod.offsetY - 1
-      popupX += invasionMod.popupX
-      popupY += invasionMod.popupY
+      if (invasion.grunt_type) {
+        filterId = `i${invasion.grunt_type}`
+        invasionIcons.unshift(Icons.getInvasions(invasion.grunt_type))
+        invasionSizes.unshift(
+          Icons.getSize('invasion', filters.filter[filterId]),
+        )
+        popupYOffset += rewardMod.offsetY - 1
+        popupX += invasionMod.popupX
+        popupY += invasionMod.popupY
+      }
     })
   }
   if (hasQuest && !(hasInvasion && invasionMod?.removeQuest)) {

diff --git a/src/components/popups/Pokestop.jsx b/src/components/popups/Pokestop.jsx
@@ -48,7 +48,10 @@ export default function PokestopPopup({
     )
   }, [])
 
-  const plainPokestop = !hasLure && !hasQuest && !hasInvasion
+  const hasEventInvasion = invasions?.some((invasion) => !invasion.grunt_type)
+
+  const plainPokestop =
+    !hasLure && !hasQuest && !hasInvasion && !hasEventInvasion
 
   return (
     <ErrorBoundary noRefresh style={{}} variant="h5">
@@ -142,7 +145,7 @@ export default function PokestopPopup({
                     />
                   </>
                 )}
-                {hasInvasion && (
+                {(hasInvasion || hasEventInvasion) && (
                   <>
                     {(hasQuest || hasLure) && (
                       <Divider light flexItem className="popup-divider" />

diff --git a/src/components/tiles/Pokestop.jsx b/src/components/tiles/Pokestop.jsx
@@ -34,6 +34,7 @@ const PokestopTile = ({
     item.invasions &&
     item.invasions.some(
       (invasion) =>
+        invasion.grunt_type &&
         !excludeList.includes(`i${invasion.grunt_type}`) &&
         invasion.incident_expire_timestamp > newTs,
     )
@@ -50,6 +51,17 @@ const PokestopTile = ({
   if ((showTimer || userSettings.lureTimers) && hasLure) {
     timers.push(item.lure_expire_timestamp)
   }
+  if (
+    (showTimer || userSettings.eventStopTimers) &&
+    !hasInvasion &&
+    item.invasions?.length
+  ) {
+    item.invasions.forEach((invasion) => {
+      if (!invasion.grunt_type) {
+        timers.push(invasion.incident_expire_timestamp)
+      }
+    })
+  }
 
   useMarkerTimer(
     timers.length ? Math.min(...timers) : null,
@@ -66,7 +78,10 @@ const PokestopTile = ({
       (hasQuest && perms.quests) ||
         (hasLure && perms.lures) ||
         (hasInvasion && perms.invasions) ||
-        ((filters.allPokestops || item.ar_scan_eligible) && perms.allPokestops),
+        ((filters.allPokestops ||
+          item.ar_scan_eligible ||
+          filters.eventStops) &&
+          perms.allPokestops),
     ) && (
       <Marker
         ref={(m) => {

diff --git a/src/services/Query.js b/src/services/Query.js
@@ -64,7 +64,9 @@ export default class Query {
     const permObj = {
       Lures: filters.lures && perms.lures,
       Quests: filters.quests && perms.quests,
-      Invasions: filters.invasions && perms.invasions,
+      Invasions:
+        (filters.invasions && perms.invasions) ||
+        (filters.eventStops && perms.allPokestops),
     }
     let query = 'get'