From 68e08e93ac8f038e0567550ce8316ebecb0d8fe4 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Wed, 27 Dec 2023 13:21:49 -0500
Subject: [PATCH 1/2] Revert "fix: v2 golbat api fixes"

This reverts commit 5ba46e20961174310ce2963a245003e257ed05a8.
---
 server/src/models/Pokemon.js                  | 22 ++++---------------
 .../src/services/filters/pokemon/Backend.js   |  5 +----
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/server/src/models/Pokemon.js b/server/src/models/Pokemon.js
index 370407ded..e78812ecb 100644
--- a/server/src/models/Pokemon.js
+++ b/server/src/models/Pokemon.js
@@ -243,24 +243,10 @@ class Pokemon extends Model {
           const [id, form] = key.split('-', 2).map(Number)
           return { id, form }
         })
-
-      if (globalFilter.filterKeys.size) {
-        filters.push(
-          ...globalFilter.buildApiFilter(
-            globalFilter.mods.onlyLinkGlobal ? pokemon : undefined,
-          ),
-        )
-      }
-      if (onlyZeroIv)
-        filters.push({
-          iv: { min: 0, max: 0 },
-          pokemon: globalFilter.mods.onlyLinkGlobal ? pokemon : [],
-        })
-      if (onlyHundoIv)
-        filters.push({
-          iv: { min: 100, max: 100 },
-          pokemon: globalFilter.mods.onlyLinkGlobal ? pokemon : [],
-        })
+      if (!globalFilter.mods.onlyLinkGlobal) pokemon.push({ id: -1 }) // add everything else
+      filters.push(...globalFilter.buildApiFilter(pokemon))
+      if (onlyZeroIv) filters.push({ iv: { min: 0, max: 0 }, pokemon })
+      if (onlyHundoIv) filters.push({ iv: { min: 100, max: 100 }, pokemon })
     }
     /** @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
index 54321e04b..23ba0cac5 100644
--- a/server/src/services/filters/pokemon/Backend.js
+++ b/server/src/services/filters/pokemon/Backend.js
@@ -282,10 +282,7 @@ module.exports = class PkmnBackend {
     if (this.mods.onlyLegacy) {
       return dnfifyIvFilter(adv, pokemon)
     }
-    if (
-      (!this.filterKeys.size || (!this.perms.iv && !this.perms.pvp)) &&
-      this.id !== 'global'
-    ) {
+    if (!this.filterKeys.size || (!this.perms.iv && !this.perms.pvp)) {
       return [{ pokemon, iv: { min: -1, max: 100 } }]
     }
     const results = /** @type {import('../../../types').DnfFilter[]} */ ([])

From 6927b9c3825d2ac8957e5de83e997045c16b3833 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Wed, 27 Dec 2023 13:48:47 -0500
Subject: [PATCH 2/2] fix: don't add global filter in a spot

---
 server/src/services/filters/pokemon/Backend.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/services/filters/pokemon/Backend.js b/server/src/services/filters/pokemon/Backend.js
index 23ba0cac5..1d7a38d02 100644
--- a/server/src/services/filters/pokemon/Backend.js
+++ b/server/src/services/filters/pokemon/Backend.js
@@ -259,7 +259,8 @@ module.exports = class PkmnBackend {
 
   /**
    * Build the API filter for Golbat
-   * @returns {import('../../../types').DnfFilter[]}
+   * @param {import('@rm/types').FilterId[]} [pokemon]
+   * @returns {import('@rm/types').DnfFilter[]}
    */
   buildApiFilter(pokemon = undefined) {
     const {
@@ -282,7 +283,10 @@ module.exports = class PkmnBackend {
     if (this.mods.onlyLegacy) {
       return dnfifyIvFilter(adv, pokemon)
     }
-    if (!this.filterKeys.size || (!this.perms.iv && !this.perms.pvp)) {
+    if (
+      this.id !== 'global' &&
+      (!this.filterKeys.size || (!this.perms.iv && !this.perms.pvp))
+    ) {
       return [{ pokemon, iv: { min: -1, max: 100 } }]
     }
     const results = /** @type {import('../../../types').DnfFilter[]} */ ([])