fix: search raid before hatching

WatWowMap · Dec 10, 2024 · 060d4ac · 060d4ac
1 parent 03df84e
commit 060d4ac
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/server/src/models/Gym.js b/server/src/models/Gym.js
@@ -535,11 +535,7 @@ class Gym extends Model {
       .whereIn(isMad ? 'pokemon_id' : 'raid_pokemon_id', pokemonIds)
       .limit(config.getSafe('api.searchResultsLimit'))
       .orderBy('distance')
-      .andWhere(
-        isMad ? 'start' : 'raid_battle_timestamp',
-        '<=',
-        isMad ? this.knex().fn.now() : ts,
-      )
+      .andWhere('raid_pokemon_id', '>', 0)
       .andWhere(
         isMad ? 'end' : 'raid_end_timestamp',
         '>=',