Sync Dev To Main

CHANGELOG.md

@@ -1,3 +1,74 @@
+# [1.38.0-develop.6](https://github.com/WatWowMap/ReactMap/compare/v1.38.0-develop.5...v1.38.0-develop.6) (2025-09-10)
+
+
+### Bug Fixes
+
+* audit ([66b07e9](https://github.com/WatWowMap/ReactMap/commit/66b07e93e35373c46b6f4deae01e0583bfb3d697))
+
+# [1.38.0-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.38.0-develop.4...v1.38.0-develop.5) (2025-09-08)
+
+
+### Bug Fixes
+
+* remove invasion and kecleon icons if showcase overrides ([5cf6123](https://github.com/WatWowMap/ReactMap/commit/5cf6123f05e2265e21701e883b26cbf3cf996b36))
+
+# [1.38.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.38.0-develop.3...v1.38.0-develop.4) (2025-08-30)
+
+
+### Bug Fixes
+
+* disable routes by default ([7e8ed3b](https://github.com/WatWowMap/ReactMap/commit/7e8ed3bc6f726fc75e7cadf5bca60ab7ad211e3f))
+* showcase range is 500m ([9da523b](https://github.com/WatWowMap/ReactMap/commit/9da523b14ba8a86f1d802769dbb605eecfc04636))
+
+# [1.38.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.38.0-develop.2...v1.38.0-develop.3) (2025-08-27)
+
+
+### Bug Fixes
+
+* discord clientReady event ([330df39](https://github.com/WatWowMap/ReactMap/commit/330df3924f67640e48f5b54e6e799aee237c3489))
+
+# [1.38.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.38.0-develop.1...v1.38.0-develop.2) (2025-08-27)
+
+
+### Features
+
+* fallback gym defender info using old columns in db ([d794ea0](https://github.com/WatWowMap/ReactMap/commit/d794ea0ffdb1322fbfca93684480b9b12f05cdb8))
+
+# [1.38.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.37.1-develop.3...v1.38.0-develop.1) (2025-08-27)
+
+
+### Bug Fixes
+
+* remove 300m range ([e6e1651](https://github.com/WatWowMap/ReactMap/commit/e6e1651e98283b5eadce343f8789a29313273d10)), closes [#526](https://github.com/WatWowMap/ReactMap/issues/526)
+
+
+### Features
+
+* better location error UI ([2ce02e9](https://github.com/WatWowMap/ReactMap/commit/2ce02e9d275ebe7ccb2fcdc275e1f41511576402))
+* showcase ranges for remote joining ([5d2b792](https://github.com/WatWowMap/ReactMap/commit/5d2b792aa758efbb373be9b580cf8c20f9258a4a))
+
+## [1.37.1-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.37.1-develop.2...v1.37.1-develop.3) (2025-08-16)
+
+
+### Bug Fixes
+
+* typo ([56a2272](https://github.com/WatWowMap/ReactMap/commit/56a227210481e3548989174b1db3bf40717c2d70))
+
+## [1.37.1-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.37.1-develop.1...v1.37.1-develop.2) (2025-08-11)
+
+
+### Bug Fixes
+
+* invasion size by rocket Pokemon when confirmed lineups ([f1a9cba](https://github.com/WatWowMap/ReactMap/commit/f1a9cbacea0d830b478ef740bfb9bbbe893eb047))
+
+## [1.37.1-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.37.0...v1.37.1-develop.1) (2025-08-11)
+
+
+### Bug Fixes
+
+* exclude leaders and Giovanni from confirmed available rocket Pokemon ([85e6408](https://github.com/WatWowMap/ReactMap/commit/85e6408578923bb9f35ec6c08cd9fd195f7b9059))
+* secondaryFilter should also exclude leaders and Giovanni pokemon ([08696af](https://github.com/WatWowMap/ReactMap/commit/08696af1feeff9553ef1dfbe5b8596e05be0cdcd))
+
 # [1.37.0](https://github.com/WatWowMap/ReactMap/compare/v1.36.0...v1.37.0) (2025-08-11)
 
 

config/custom-environment-variables.json

@@ -721,10 +721,6 @@
         "__name": "CLIENT_SIDE_OPTIONS_GYMS_INTERACTION_RANGES",
         "__format": "boolean"
       },
-      "300mRange": {
-        "__name": "CLIENT_SIDE_OPTIONS_GYMS_300M_RANGE",
-        "__format": "boolean"
-      },
       "customRange": {
         "__name": "CLIENT_SIDE_OPTIONS_GYMS_CUSTOM_RANGE",
         "__format": "number"

config/default.json

@@ -349,7 +349,6 @@
       "clustering": true,
       "raidTimers": false,
       "interactionRanges": false,
-      "300mRange": false,
       "customRange": 0,
       "showExBadge": false,
       "showArBadge": false,
@@ -559,7 +558,7 @@
       "enabled": false
     },
     "routes": {
-      "enabled": true
+      "enabled": false
     },
     "scanAreas": {
       "enabled": false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.37.0",
+  "version": "1.38.0-develop.6",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
@@ -208,12 +208,13 @@
     "rollup-plugin-delete": "^2.0.0",
     "semantic-release": "^22",
     "typescript": "5.5.4",
-    "vite": "^6.2.6",
+    "vite": "^6.3.6",
     "vite-plugin-checker": "0.7.2"
   },
   "resolutions": {
     "got": ">=11.8.5",
-    "dot-prop": ">=4.2.1"
+    "dot-prop": ">=4.2.1",
+    "tmp": ">=0.2.4"
   },
   "engines": {
     "node": ">=18",

packages/config/.configref

@@ -1 +1 @@
-25577
+25552

packages/locales/lib/human/de.json

@@ -558,7 +558,6 @@
   "scan_areas_options": "Optionen für Scanbereiche",
   "historic_rarity": "Historische Seltenheit",
   "poi": "Wayspots",
-  "300m_range": "300m Radius",
   "lure_range": "Lockmodulradius",
   "custom_range": "individueller Radius",
   "tap_to_toggle": "Tippen zum Umschalten",
@@ -799,5 +798,9 @@
   "filters": "Filter",
   "active": "aktiv",
   "inactive": "inaktiv",
-  "bread_time_window": "Du kannst von 6Uhr bis 21Uhr an Dyna-Kämpfen teilnehmen."
+  "bread_time_window": "Du kannst von 6Uhr bis 21Uhr an Dyna-Kämpfen teilnehmen.",
+  "rsvp_0": "ohne RSVP",
+  "rsvp_1": "RSVP",
+  "rsvp_2": "nur_RSVP",
+  "rsvp_changes": "RSVP Änderungen"
 }

packages/locales/lib/human/en.json

@@ -560,6 +560,10 @@
   "lc_feetUnit": "feet",
   "lc_popup": "You are within {distance} {unit} from this point",
   "lc_outsideMapBoundsMsg": "You seem located outside the boundaries of the map",
+  "location_error_default": "Unable to retrieve your location",
+  "location_error_permission_denied": "Location access denied. Please enable location permissions in your browser.",
+  "location_error_position_unavailable": "Your location is currently unavailable. Please try again later.",
+  "location_error_timeout": "Location request timed out. Please try again.",
   "no_alerts": "No Alerts Found",
   "loading_settings": "Loading Settings",
   "refresh_to_continue": "Please refresh before continuing",
@@ -587,8 +591,8 @@
   "scan_areas_options": "Scan Areas Options",
   "historic_rarity": "Historic Rarity",
   "poi": "Points of Interest",
-  "300m_range": "300m Range",
   "lure_range": "Lure Range",
+  "showcase_range": "Showcase Range",
   "custom_range": "Custom Range",
   "tap_to_toggle": "Tap To Toggle",
   "power_up": "Power Up",
@@ -822,6 +826,10 @@
   "active": "Active",
   "inactive": "Inactive",
   "bread_time_window": "You can take on Max Battles between 6AM and 9PM.",
+  "rsvp_0": "no rsvp",
+  "rsvp_1": "rsvp",
+  "rsvp_2": "rsvp_only",
+  "rsvp_changes": "RSVP changes",
   "expert_basic_syntax": "Basic Syntax 🔎",
   "expert_clause_description": "The fundamental building block of a filter is a clause. A clause consists of a prefix (what you're filtering), followed by a value or a range.",
   "expert_format_description": "The basic format is: [Prefix][Value] or [Prefix][MinValue]-[MaxValue]",

packages/locales/lib/human/es.json

@@ -514,7 +514,6 @@
   "scan_areas_options": "Opciones de escaneo de áreas",
   "historic_rarity": "Rareza histórica",
   "poi": "Puntos de interés",
-  "300m_range": "Rango de 300m",
   "lure_range": "Rango de módulo cebo",
   "custom_range": "Rango personalizado",
   "tap_to_toggle": "Toca para alternar",
@@ -618,5 +617,9 @@
   "hide_editor": "Ocultar Editor",
   "reported_error": "Este error ha sido reportado al servidor con el identificador",
   "dark_mode": "Modo Oscuro",
-  "bread_time_window": "Puedes acceder a los Combates Max de 6h a 21h."
+  "bread_time_window": "Puedes acceder a los Combates Max de 6h a 21h.",
+  "rsvp_0": "no rsvp",
+  "rsvp_1": "rsvp",
+  "rsvp_2": "rsvp_only",
+  "rsvp_changes": "RSVP cambios"
 }

packages/locales/lib/human/fr.json

@@ -542,7 +542,6 @@
   "scan_areas_options": "Options des zones de scan",
   "historic_rarity": "Rareté historique",
   "poi": "POI",
-  "300m_range": "Portée 300m",
   "lure_range": "Distance des Leurres",
   "tap_to_toggle": "Appuyez pour basculer",
   "power_up": "Boost",
@@ -774,5 +773,9 @@
   "weather_audio": "Son de météo",
   "active": "Actif",
   "inactive": "Inactif",
-  "bread_time_window": "Tu peux participer à des Combats Dynamax entre 6h et 21h."
+  "bread_time_window": "Tu peux participer à des Combats Dynamax entre 6h et 21h.",
+  "rsvp_0": "no rsvp",
+  "rsvp_1": "rsvp",
+  "rsvp_2": "rsvp_only",
+  "rsvp_changes": "RSVP changements"
 }

packages/locales/lib/human/nl.json

@@ -469,5 +469,9 @@
   "webhook_advanced_save_width": 2,
   "login_button": 5,
   "join_button": 5,
-  "all": "Alle"
+  "all": "Alle",
+  "rsvp_0": "no rsvp",
+  "rsvp_1": "rsvp",
+  "rsvp_2": "rsvp_only",
+  "rsvp_changes": "RSVP veranderingen"
 }

packages/locales/lib/human/pl.json

@@ -1,6 +1,5 @@
 {
   "%": "%",
-  "300m_range": "Zasięg 300m",
   "abbreviation_level": "L",
   "access": "Dostęp",
   "access_denied": "Brak dostępu",
@@ -523,6 +522,10 @@
   "route_type": "Typ scieżki",
   "routes": "Scieżki",
   "routes_subtitle": "Wyświetl scieżki w grze i związane z nimi informacje na mapie",
+  "rsvp_0": "no rsvp",
+  "rsvp_1": "rsvp",
+  "rsvp_2": "rsvp_only",
+  "rsvp_changes": "RSVP zmiany",
   "s2_cell_level": "Poziom {{level}} S2 Cell",
   "s2_cell_limit_0": "Próbowałeś wygenerować więcej niż 20 000 komórek ({{variable_0}})",
   "s2cells": "Komórki S2",

packages/types/lib/poracle.d.ts

@@ -66,6 +66,7 @@ export interface PoracleRaid {
   distance: number
   template: string
   team: number
+  rsvp_changes: number
   gym_id: string
   form: number
   move: number
@@ -84,6 +85,7 @@ export interface PoracleEgg {
   distance: number
   template: string
   team: number
+  rsvp_changes: number
   gym_id: string
   description: string
 }

server/src/graphql/typeDefs/poracle.graphql

@@ -61,6 +61,7 @@ type PoracleRaid {
   distance: Int
   template: String
   team: Int
+  rsvp_changes: Int
   gym_id: String
   form: Int
   move: Int
@@ -80,6 +81,7 @@ type PoracleEgg {
   distance: Int
   template: String
   team: Int
+  rsvp_changes: Int
   gym_id: String
   description: String
 }

server/src/models/Pokestop.js

@@ -805,40 +805,49 @@ class Pokestop extends Model {
         filtered.invasions = pokestop.invasions.filter((invasion) => {
           const info = state.event.invasions[invasion.grunt_type]
           if (!info) return false
-          if (
-            info.firstReward &&
-            (hasConfirmed && invasion.confirmed
-              ? filters[
-                  `a${invasion.slot_1_pokemon_id}-${invasion.slot_1_form}`
-                ]
-              : info.encounters.first.some(
-                  (poke) => !!filters[`a${poke.id}-${poke.form}`],
-                ))
-          )
-            return true
 
-          if (
-            info.secondReward &&
-            (hasConfirmed && invasion.confirmed
-              ? filters[
-                  `a${invasion.slot_2_pokemon_id}-${invasion.slot_2_form}`
-                ]
-              : info.encounters.second.some(
-                  (poke) => !!filters[`a${poke.id}-${poke.form}`],
-                ))
-          )
-            return true
-          if (
-            info.thirdReward &&
-            (hasConfirmed && invasion.confirmed
-              ? filters[
-                  `a${invasion.slot_3_pokemon_id}-${invasion.slot_3_form}`
-                ]
-              : info.encounters.third.some(
-                  (poke) => !!filters[`a${poke.id}-${poke.form}`],
-                ))
-          )
-            return true
+          // Check if this is a team leader or Giovanni (grunt types 41-44)
+          const isLeaderOrGiovanni =
+            invasion.grunt_type >= 41 && invasion.grunt_type <= 44
+
+          // For team leaders and Giovanni, skip Pokemon-based filtering
+          if (!isLeaderOrGiovanni) {
+            if (
+              info.firstReward &&
+              (hasConfirmed && invasion.confirmed
+                ? filters[
+                    `a${invasion.slot_1_pokemon_id}-${invasion.slot_1_form}`
+                  ]
+                : info.encounters.first.some(
+                    (poke) => !!filters[`a${poke.id}-${poke.form}`],
+                  ))
+            )
+              return true
+
+            if (
+              info.secondReward &&
+              (hasConfirmed && invasion.confirmed
+                ? filters[
+                    `a${invasion.slot_2_pokemon_id}-${invasion.slot_2_form}`
+                  ]
+                : info.encounters.second.some(
+                    (poke) => !!filters[`a${poke.id}-${poke.form}`],
+                  ))
+            )
+              return true
+            if (
+              info.thirdReward &&
+              (hasConfirmed && invasion.confirmed
+                ? filters[
+                    `a${invasion.slot_3_pokemon_id}-${invasion.slot_3_form}`
+                  ]
+                : info.encounters.third.some(
+                    (poke) => !!filters[`a${poke.id}-${poke.form}`],
+                  ))
+            )
+              return true
+          }
+
           return (
             filters[`i${invasion.grunt_type}`] ||
             (filters.onlyAllPokestops &&
@@ -1554,6 +1563,9 @@ class Pokestop extends Model {
         case 'rocketPokemon':
           if (hasConfirmed) {
             rewards.forEach((reward) => {
+              // Exclude team leaders (41-43) and Giovanni (44)
+              if (reward.grunt_type >= 41 && reward.grunt_type <= 44) return
+
               const fullGrunt = state.event.invasions[reward.grunt_type]
               if (fullGrunt?.firstReward) {
                 finalList.add(

server/src/services/DiscordClient.js

@@ -29,7 +29,7 @@ class DiscordClient extends AuthClient {
       intents: ['GuildMessages', 'GuildMembers', 'Guilds'],
     })
 
-    this.client.on('ready', (c) => {
+    this.client.on('clientReady', (c) => {
       this.log.info(`Logged in as ${c.user?.tag || 'Unknown??'}!`)
       c.user.setPresence({
         activities: [