Merge pull request #1021 from Gattaca1/toggle-rocket-grunts-and-leaders

[Feature Request]: Exclude rocket grunt toggle & exclude rocket leader toggle
WatWowMap · Jun 22, 2024 · c1be413 · c1be413
2 parents b7e3ed6 + 8f851ba
commit c1be413
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 5 deletions.
diff --git a/packages/locales/lib/human/de.json b/packages/locales/lib/human/de.json
@@ -585,6 +585,8 @@
   "delete": "löschen",
   "name": "Name",
   "only_confirmed": "nur bestätigte",
+  "only_exclude_grunts": "Grunzer ausschließen",
+  "only_exclude_leaders": "EAnführer ausschließen",
   "rocket_pokemon": "Crypto-Pokemon",
   "decoy": "Täusch-Rüpel",
   "s2_cell_limit_0": "Sie haben versucht, mehr als 20.000 Zellen zu generieren ({{variable_0}})",
@@ -759,4 +761,4 @@
   "locale_instructions_8": "Warte bis die Pull-Anfrage überprüft und gemerged wurde.",
   "enter_translation": "Übersetzung eingeben",
   "individual_filters": "Teilweise gefiltert"
-}
+}
diff --git a/packages/locales/lib/human/en.json b/packages/locales/lib/human/en.json
@@ -615,6 +615,8 @@
   "delete": "Delete",
   "name": "Name",
   "only_confirmed": "Only Confirmed",
+  "only_exclude_grunts": "Exclude  Grunts",
+  "only_exclude_leaders": "Exclude Leaders",
   "rocket_pokemon": "Rocket Pokémon",
   "decoy": "Decoy",
   "s2_cell_limit_0": "You attempted to generate more than 20,000 cells ({{variable_0}})",
@@ -783,4 +785,4 @@
   "locale_instructions_8": "Wait for the pull request to be reviewed and merged",
   "enter_translation": "Enter Translation",
   "individual_filters": "Partially Filtered"
-}
+}
diff --git a/packages/locales/lib/human/es.json b/packages/locales/lib/human/es.json
@@ -544,6 +544,8 @@
   "delete": "Eliminar",
   "name": "Nombre",
   "only_confirmed": "Solo confirmados",
+  "only_exclude_grunts": "Excluir gruñidos",
+  "only_exclude_leaders": "Excluir a los dirigentes",
   "rocket_pokemon": "Pokémon del Equipo Rocket",
   "decoy": "Señuelo",
   "s2_cell_limit_0": "Has intentado generar más de 20,000 celdas ({{variable_0}})",
@@ -616,4 +618,4 @@
   "hide_editor": "Ocultar Editor",
   "reported_error": "Este error ha sido reportado al servidor con el identificador",
   "dark_mode": "Modo Oscuro"
-}
+}
diff --git a/packages/locales/lib/human/fr.json b/packages/locales/lib/human/fr.json
@@ -571,6 +571,8 @@
   "delete": "Supprimer",
   "name": "Nom",
   "only_confirmed": "Confirmé seulement",
+  "only_exclude_grunts": "Exclure les grognements",
+  "only_exclude_leaders": "Exclure les dirigeants",
   "rocket_pokemon": "Pokémon Rocket",
   "decoy": "Leurre",
   "s2_cell_limit_0": "Vous avez essayé de générer plus de 20 000 cellules ({{variable_0}})",
@@ -770,4 +772,4 @@
   "team_audio": "Son d’équipe",
   "type_audio": "Son de type",
   "weather_audio": "Son de météo"
-}
+}
diff --git a/packages/locales/lib/human/pl.json b/packages/locales/lib/human/pl.json
@@ -395,6 +395,8 @@
   "online": "Online",
   "only_available": "Dostępne",
   "only_confirmed": "Tylko potwierdzone",
+  "only_exclude_grunts": "Wykluczyć chrząknięcia",
+  "only_exclude_leaders": "Wykluczyć liderów",
   "only_global": "Tylko globalne",
   "only_show_available": "Pokaż tylko dostępne",
   "opacity_five_minutes": "Przezroczystość po 5 minutach",
@@ -767,4 +769,4 @@
   "zero_iv": "0% IV",
   "zoom_in": "Przybliż",
   "zoom_out": "Oddal"
-}
+}
diff --git a/server/src/configs/custom-environment-variables.json b/server/src/configs/custom-environment-variables.json
@@ -993,6 +993,14 @@
         "__name": "DEFAULT_FILTERS_POKESTOPS_CONFIRMED",
         "__format": "boolean"
       },
+      "excludeGrunts": {
+        "__name": "DEFAULT_FILTERS_POKESTOPS_EXCLUDE_GRUNTS",
+        "__format": "boolean"
+      },
+      "excludeLeaders": {
+        "__name": "DEFAULT_FILTERS_POKESTOPS_EXCLUDE_LEADERS",
+        "__format": "boolean"
+      },
       "items": {
         "__name": "DEFAULT_FILTERS_POKESTOPS_ITEMS",
         "__format": "boolean"

diff --git a/server/src/configs/default.json b/server/src/configs/default.json
@@ -483,6 +483,8 @@
       "showcasePokemon": true,
       "questSet": "both",
       "confirmed": false,
+      "excludeGrunts": false,
+      "excludeLeaders": false,
       "items": true,
       "megaEnergy": true,
       "candy": true,

diff --git a/server/src/models/Pokestop.js b/server/src/models/Pokestop.js
@@ -135,6 +135,8 @@ class Pokestop extends Model {
         onlyEventStops,
         onlyConfirmed,
         onlyAreas = [],
+        onlyExcludeGrunts,
+        onlyExcludeLeaders,
       },
     } = args
     const midnight = getUserMidnight(args)
@@ -573,6 +575,19 @@ class Pokestop extends Model {
                   )
                 }
               })
+              if (onlyExcludeGrunts) {
+                invasion.whereNotIn(
+                  isMad ? 'character_display' : 'character',
+                  Event.rocketGruntIDs,
+                )
+              }
+
+              if (onlyExcludeLeaders) {
+                invasion.whereNotIn(
+                  isMad ? 'character_display' : 'character',
+                  Event.rocketLeaderIDs,
+                )
+              }
             })
           } else {
             stops.orWhere((invasion) => {

diff --git a/server/src/services/EventManager.js b/server/src/services/EventManager.js
@@ -325,6 +325,23 @@ class EventManager {
       try {
         const newInvasions = await fetch(endpoint).then((res) => res.json())
         if (newInvasions) {
+          this.rocketGruntIDs = Object.keys(newInvasions)
+            .filter(
+              (key) =>
+                newInvasions[key].grunt &&
+                newInvasions[key].grunt.includes('Grunt'),
+            )
+            .map(Number)
+
+          this.rocketLeaderIDs = Object.keys(newInvasions)
+            .filter(
+              (key) =>
+                newInvasions[key].grunt &&
+                (newInvasions[key].grunt.includes('Executive') ||
+                  newInvasions[key].grunt.includes('Giovanni')),
+            )
+            .map(Number)
+
           this.invasions = newInvasions
         }
       } catch (e) {

diff --git a/server/src/services/filters/builder/base.js b/server/src/services/filters/builder/base.js
@@ -91,6 +91,12 @@ function buildDefaultFilters(perms) {
             confirmed: perms.invasions
               ? defaultFilters.pokestops.confirmed
               : undefined,
+            excludeGrunts: perms.invasions
+              ? defaultFilters.pokestops.excludeGrunts
+              : undefined,
+            excludeLeaders: perms.invasions
+              ? defaultFilters.pokestops.excludeLeaders
+              : undefined,
             invasions: perms.invasions
               ? defaultFilters.pokestops.invasions
               : undefined,

diff --git a/src/features/drawer/pokestops/Invasions.jsx b/src/features/drawer/pokestops/Invasions.jsx
@@ -24,6 +24,16 @@ const BaseInvasion = () => {
           label="only_confirmed"
         />
       )}
+      <BoolToggle
+        inset
+        field="filters.pokestops.excludeGrunts"
+        label="only_exclude_grunts"
+      />
+      <BoolToggle
+        inset
+        field="filters.pokestops.excludeLeaders"
+        label="only_exclude_leaders"
+      />
       {confirmedEnabled || hasConfirmed ? (
         <MultiSelectorList tabKey="invasions">
           <SelectorListMemo