From a63eeca66a674a8cd8f643c5d423989e9e7dddfe Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 22:57:51 +0200 Subject: [PATCH 01/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6194ddda8..b52cebd0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reactmap", - "version": "1.38.0-develop.3", + "version": "1.38.0-develop.4", "private": true, "description": "React based frontend map.", "license": "MIT", From b3e7d15e916896a15fd8e647de6246062cb0778e Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:26:38 +0200 Subject: [PATCH 02/16] Update de.json --- packages/locales/lib/human/de.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/locales/lib/human/de.json b/packages/locales/lib/human/de.json index 183759413..832364c77 100644 --- a/packages/locales/lib/human/de.json +++ b/packages/locales/lib/human/de.json @@ -798,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" } From ecb5d18a8d214b3396d3db756325f64c24ca51f9 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:29:12 +0200 Subject: [PATCH 03/16] Update en.json --- packages/locales/lib/human/en.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/locales/lib/human/en.json b/packages/locales/lib/human/en.json index e319efea0..a47dbf825 100644 --- a/packages/locales/lib/human/en.json +++ b/packages/locales/lib/human/en.json @@ -826,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]", From 137507cbe9bee0a153f79cac44cfa2d250d40186 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:29:40 +0200 Subject: [PATCH 04/16] Update en.json --- packages/locales/lib/human/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/locales/lib/human/en.json b/packages/locales/lib/human/en.json index a47dbf825..50693178a 100644 --- a/packages/locales/lib/human/en.json +++ b/packages/locales/lib/human/en.json @@ -826,7 +826,7 @@ "active": "Active", "inactive": "Inactive", "bread_time_window": "You can take on Max Battles between 6AM and 9PM.", - "rsvp_0": "no_rsvp", + "rsvp_0": "no rsvp", "rsvp_1": "rsvp", "rsvp_2": "rsvp_only", "rsvp_changes": "RSVP changes", From b3de76340b414c7eabccc654f4086d372af58802 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:32:51 +0200 Subject: [PATCH 05/16] Update es.json --- packages/locales/lib/human/es.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/locales/lib/human/es.json b/packages/locales/lib/human/es.json index 94fad28d1..cf3057354 100644 --- a/packages/locales/lib/human/es.json +++ b/packages/locales/lib/human/es.json @@ -617,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" } From 2255143e526a8feca0a60d74c114946f87003dc2 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:33:30 +0200 Subject: [PATCH 06/16] Update fr.json --- packages/locales/lib/human/fr.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/locales/lib/human/fr.json b/packages/locales/lib/human/fr.json index 0ea81a066..eec433756 100644 --- a/packages/locales/lib/human/fr.json +++ b/packages/locales/lib/human/fr.json @@ -773,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" } From 217bd129a2597facf8818cf4bdfaebae5499a8b9 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:34:22 +0200 Subject: [PATCH 07/16] Update nl.json --- packages/locales/lib/human/nl.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/locales/lib/human/nl.json b/packages/locales/lib/human/nl.json index b9bf73c57..a2d515522 100644 --- a/packages/locales/lib/human/nl.json +++ b/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" } From 6e1d3696efa5679275d714b204905ea7022b8906 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:34:33 +0200 Subject: [PATCH 08/16] Update fr.json --- packages/locales/lib/human/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/locales/lib/human/fr.json b/packages/locales/lib/human/fr.json index eec433756..fa7addf36 100644 --- a/packages/locales/lib/human/fr.json +++ b/packages/locales/lib/human/fr.json @@ -774,7 +774,7 @@ "active": "Actif", "inactive": "Inactif", "bread_time_window": "Tu peux participer à des Combats Dynamax entre 6h et 21h.", - "rsvp_0": "no_rsvp", + "rsvp_0": "no rsvp", "rsvp_1": "rsvp", "rsvp_2": "rsvp_only", "rsvp_changes": "RSVP changements" From c74b12ada80c176b4d3b9003a47050af0b953b85 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:35:57 +0200 Subject: [PATCH 09/16] Update pl.json --- packages/locales/lib/human/pl.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/locales/lib/human/pl.json b/packages/locales/lib/human/pl.json index 35bca8ed8..ded5abfb8 100644 --- a/packages/locales/lib/human/pl.json +++ b/packages/locales/lib/human/pl.json @@ -517,6 +517,10 @@ "reversible": "Odwrotny", "reward_audio": "Dźwięk nagrody", "reward_icons": "Ikony nagród", + "rsvp_0": "no rsvp", + "rsvp_1": "rsvp", + "rsvp_2": "rsvp_only", + "rsvp_changes": "RSVP zmiany" "rocket_pokemon": "Pokémony Rocket", "route_tags": "Etykiety scieżek", "route_type": "Typ scieżki", From 57eb4404a6b5999620ccb54a98394768283cbf1d Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:37:57 +0200 Subject: [PATCH 10/16] Update pl.json --- packages/locales/lib/human/pl.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/locales/lib/human/pl.json b/packages/locales/lib/human/pl.json index ded5abfb8..a9edc2209 100644 --- a/packages/locales/lib/human/pl.json +++ b/packages/locales/lib/human/pl.json @@ -517,15 +517,15 @@ "reversible": "Odwrotny", "reward_audio": "Dźwięk nagrody", "reward_icons": "Ikony nagród", - "rsvp_0": "no rsvp", - "rsvp_1": "rsvp", - "rsvp_2": "rsvp_only", - "rsvp_changes": "RSVP zmiany" "rocket_pokemon": "Pokémony Rocket", "route_tags": "Etykiety scieżek", "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", From c992a0a662c1a3bf91582a3768a575379ae45482 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:39:17 +0200 Subject: [PATCH 11/16] Update poracle.d.ts --- packages/types/lib/poracle.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/types/lib/poracle.d.ts b/packages/types/lib/poracle.d.ts index 86c78bf89..42f7adc1b 100644 --- a/packages/types/lib/poracle.d.ts +++ b/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 } From 742b07357c8ee58434295663d1d81125ed60d68c Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:42:29 +0200 Subject: [PATCH 12/16] Update poracle.graphql --- server/src/graphql/typeDefs/poracle.graphql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/graphql/typeDefs/poracle.graphql b/server/src/graphql/typeDefs/poracle.graphql index 57291f267..404ac595c 100644 --- a/server/src/graphql/typeDefs/poracle.graphql +++ b/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 } From 74d45a331d57291212c70e022cbb1eabae21bf32 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:51:00 +0200 Subject: [PATCH 13/16] Update Poracle.js --- server/src/services/Poracle.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/server/src/services/Poracle.js b/server/src/services/Poracle.js index 996e70e34..81edc6d64 100644 --- a/server/src/services/Poracle.js +++ b/server/src/services/Poracle.js @@ -223,11 +223,11 @@ class PoracleAPI { if ( major < 4 || - (major === 4 && minor < 6) || - (major === 4 && minor === 6 && patch < 0) + (major === 4 && minor < 8) || + (major === 4 && minor === 8 && patch < 4) ) { throw new Error( - `Poracle must be at least version 4.6.0, current version is ${this.version}`, + `Poracle must be at least version 4.8.4, current version is ${this.version}`, ) } const { providerURL, addressFormat, ...rest } = remoteConfig @@ -796,6 +796,7 @@ class PoracleAPI { exclusive: false, level: 9000, team: 4, + rsvp_changes: 0, gym_id: null, byDistance: false, allMoves: true, @@ -813,11 +814,12 @@ class PoracleAPI { disabled: true, options: [], xs: 6, - sm: 3, + sm: 4, }, - { name: 'template', options: [], xs: 6, sm: 3 }, - { name: 'team', options: [0, 1, 2, 3, 4], xs: 6, sm: 3 }, - { name: 'move', options: [], xs: 6, sm: 3 }, + { name: 'template', options: [], xs: 6, sm: 4 }, + { name: 'team', options: [0, 1, 2, 3, 4], xs: 6, sm: 4 }, + { name: 'move', options: [], xs: 6, sm: 5 }, + { name: 'rsvp_changes', options: [0, 1, 2], xs: 6, sm: 5 }, ], booleans: [ { name: 'clean', xs: 6, sm: 3 }, @@ -869,6 +871,7 @@ class PoracleAPI { exclusive: false, level: 9000, team: 4, + rsvp_changes: 0, gym_id: null, byDistance: false, everything_individually: @@ -884,10 +887,11 @@ class PoracleAPI { disabled: true, options: [], xs: 6, - sm: 4, + sm: 3, }, - { name: 'template', options: [], xs: 6, sm: 4 }, - { name: 'team', options: [0, 1, 2, 3, 4], xs: 6, sm: 4 }, + { name: 'template', options: [], xs: 6, sm: 3 }, + { name: 'team', options: [0, 1, 2, 3, 4], xs: 6, sm: 3 }, + { name: 'rsvp_changes', options: [0, 1, 2], xs: 6, sm: 3 }, ], booleans: [ { name: 'clean', xs: 6, sm: 6 }, From fc955f40e4a4ed4d931d77a008608d5cafab1532 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:57:12 +0200 Subject: [PATCH 14/16] Update WebhookAdv.jsx --- src/features/webhooks/WebhookAdv.jsx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/features/webhooks/WebhookAdv.jsx b/src/features/webhooks/WebhookAdv.jsx index 1885d5c1b..381d65ed4 100644 --- a/src/features/webhooks/WebhookAdv.jsx +++ b/src/features/webhooks/WebhookAdv.jsx @@ -66,6 +66,7 @@ const skipFields = new Set([ 'gym_id', 'slot_changes', 'team', + 'rsvp_changes', 'battle_changes', 'shiny', 'everything_individually', @@ -328,6 +329,15 @@ export function WebhookAdvanced() { ), ) break + case 'rsvp_changes': + option.options.forEach((rsvp_changes) => + menuItems.push( + + {t(`rsvp_${rsvp_changes}`)} + , + ), + ) + break case 'move': menuItems.push( @@ -410,6 +420,8 @@ export function WebhookAdvanced() { return ` ${t('battle_changes_poracle')} ` if (field === 'team' && poracleValues.team !== 4) return t(`team_${poracleValues.team}`) + if (field === 'rsvp_changes' && poracleValues.rsvp_changes !== 0) + return t(`rsvp_${poracleValues.rsvp_changes}`) if ( field === 'everything_individually' && poracleValues.everything_individually From 2c5e9540deb8e06fa6f2cf5caa98c23aa39a4d28 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:58:42 +0200 Subject: [PATCH 15/16] Update webhook.js --- src/services/queries/webhook.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/services/queries/webhook.js b/src/services/queries/webhook.js index fd18c7e27..c8bcf7086 100644 --- a/src/services/queries/webhook.js +++ b/src/services/queries/webhook.js @@ -22,6 +22,7 @@ const Egg = gql` id profile_no team + rsvp_changes template uid description @@ -224,6 +225,7 @@ const Raid = gql` pokemon_id profile_no team + rsvp_changes template uid description From e5858c591867f7f7377c80541a4cecda6efd1b31 Mon Sep 17 00:00:00 2001 From: ReuschelCGN <82573872+ReuschelCGN@users.noreply.github.com> Date: Fri, 29 Aug 2025 00:07:31 +0200 Subject: [PATCH 16/16] Update pl.json --- packages/locales/lib/human/pl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/locales/lib/human/pl.json b/packages/locales/lib/human/pl.json index a9edc2209..077c4b17b 100644 --- a/packages/locales/lib/human/pl.json +++ b/packages/locales/lib/human/pl.json @@ -525,7 +525,7 @@ "rsvp_0": "no rsvp", "rsvp_1": "rsvp", "rsvp_2": "rsvp_only", - "rsvp_changes": "RSVP zmiany" + "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",