fix: filtering edge cases

WatWowMap · Jan 4, 2024 · a1b1580 · a1b1580
1 parent d6f04e0
commit a1b1580
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/server/src/models/Pokemon.js b/server/src/models/Pokemon.js
@@ -257,16 +257,13 @@ class Pokemon extends Model {
       ) {
         filters.push(...globalFilter.buildApiFilter(pokemon))
       }
+      const globalPokes = globalFilter.mods.onlyLinkGlobal
+        ? [...pokemon, { id: -1 }]
+        : pokemon
       if (onlyZeroIv)
-        filters.push({
-          iv: { min: 0, max: 0 },
-          pokemon: globalFilter.mods.onlyLinkGlobal ? [{ id: -1 }] : pokemon,
-        })
+        filters.push({ iv: { min: 0, max: 0 }, pokemon: globalPokes })
       if (onlyHundoIv)
-        filters.push({
-          iv: { min: 100, max: 100 },
-          pokemon: globalFilter.mods.onlyLinkGlobal ? [{ id: -1 }] : pokemon,
-        })
+        filters.push({ iv: { min: 100, max: 100 }, pokemon: globalPokes })
     }
     /** @type {import("../types").Pokemon[]} */
     const results = await this.evalQuery(

diff --git a/server/src/services/filters/pokemon/Backend.js b/server/src/services/filters/pokemon/Backend.js
@@ -144,7 +144,7 @@ module.exports = class PkmnBackend {
       if (merged) merged = `(${merged})&`
       merged += `G${filter.gender}`
     }
-    log.debug(HELPERS.pokemon, this.id, {
+    log.trace(HELPERS.pokemon, this.id, {
       andStr,
       orStr,
       merged,