Merge pull request #1127 from ReuschelCGN/updates

Mygod · web-flow · commit fe1084777be9 · 2025-09-02T15:22:57.000-07:00
feat: RSVP tracking via api Poracle PR#928
diff --git 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"
 }
diff --git 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]",
diff --git 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"
 }
diff --git 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"
 }
diff --git 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"
 }
diff --git a/packages/locales/lib/human/pl.json b/packages/locales/lib/human/pl.json
@@ -522,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",
diff --git 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
 }
diff --git 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
 }
diff --git 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 },
diff --git 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(
+            <MenuItem key={rsvp_changes} value={rsvp_changes} dense>
+              {t(`rsvp_${rsvp_changes}`)}
+            </MenuItem>,
+          ),
+        )
+        break
       case 'move':
         menuItems.push(
           <MenuItem key={9000} value={9000} dense>
@@ -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
diff --git 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
