WatWowMap · TurtIeSocks · Dec 23, 2022 · Dec 4, 2022 · Dec 4, 2022 · Dec 6, 2022
diff --git a/.configref b/.configref
@@ -1 +1 @@
-18398
+18711
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -17,10 +17,10 @@ jobs:
           fetch-depth: 2
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v32
+        uses: tj-actions/changed-files@v19
         with:
           files: |
-            server/src/configs/*
+            server/src/configs/default.json
       - name: Setup Node.js environment
         if: steps.changed-files.outputs.any_changed == 'true'
         uses: actions/setup-node@v3
@@ -35,9 +35,14 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         run: |
           yarn gen-env-config
+      - name: Configure git
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: |
+          git config --global user.name "turtlesocks-bot"
+          git config --global user.email "turtlesocks-bot@users.noreply.github.com"
       - name: Commit and push changes
         if: steps.changed-files.outputs.any_changed == 'true'
-        uses: devops-infra/action-commit-push@v0.9.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          commit_message: Sync character count for config ref file
+        run: |
+          git add --all
+          git commit --message "Sync CI/CD Config Items"
+          git push
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.7.2",
+  "version": "1.7.5",
   "description": "React based frontend map.",
   "main": "ReactMap.js",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",
@@ -74,7 +74,7 @@
     "config": "^3.3.6",
     "discord.js": "^12.5.3",
     "dotenv": "^10.0.0",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "express-mysql-session": "^2.1.6",
     "express-rate-limit": "^5.2.6",
     "express-session": "^1.17.1",

diff --git a/public/base-locales/en.json b/public/base-locales/en.json
@@ -49,6 +49,7 @@
   "slider_def_iv": "Defense",
   "slider_sta_iv": "Stamina",
   "slider_level": "Level",
+  "slider_size": "Size",
   "abbreviation_level": "L",
   "lvl": "Lvl",
   "cap": "Cap",
@@ -282,11 +283,12 @@
   "quests_subtitle": "Shows quest reward and task information",
   "raids_subtitle": "Shows all raid info including the raid boss, eggs, expire time, and moveset",
   "scan_cells_subtitle": "Shows the last time a S2 cell was scanned by a device",
-  "scanAreas_subtitle": "Shows available scan areas polygons",
+  "scan_areas_subtitle": "Shows available scan areas polygons",
   "spawnpoints_subtitle": "Shows spawnpoints and their estimated despawn time",
   "stats_subtitle": "Shows Pokémon stats and levels",
   "submission_cells_subtitle": "Shows information useful for submitting new POIs",
   "weather_subtitle": "Shows in game weather info for each cell",
+  "scanner_subtitle": "Interact directly with the scanner in various ways",
   "user_profile": "User Profile",
   "candy": "Candy",
   "show_ex_badge": "Show EX Badge",
@@ -423,6 +425,7 @@
   "auto": "Auto",
   "webhooks_subtitle": "Manage your alerts directly from the map for these bots",
   "webhooks": "Alerts",
+  "scanner": "Scanner Actions",
   "everything_individually": "Add Individual Alerts",
   "individually": "individually",
   "join": "Join",
@@ -561,5 +564,13 @@
   "seen_lure_wild": "Lure Spawn",
   "seen_wild": "Wild Spawn",
   "event_stops": "Event Stops",
-  "event_stop_timers": "Event Stop Timers"
+  "event_stop_timers": "Event Stop Timers",
+  "size_0": "Any",
+  "size_1": "XXS",
+  "size_2": "XS",
+  "size_3": "M",
+  "size_4": "XL",
+  "size_5": "XXL",
+  "show_size_indicator": "Show Size Indicator",
+  "size": "Size"
 }
diff --git a/public/base-locales/es.json b/public/base-locales/es.json
@@ -263,7 +263,7 @@
   "quests_subtitle": "Muestra la información de las misiones",
   "raids_subtitle": "Muestra la información de las Incursiones",
   "scan_cells_subtitle": "Muestra la última vez que una celda S2 fue escaneada por un dispositivo",
-  "scanAreas_subtitle": "Muestra los polígonos de áreas de escaneo disponibles",
+  "scan_areas_subtitle": "Muestra los polígonos de áreas de escaneo disponibles",
   "spawnpoints_subtitle": "Muestra las ubicaciones de los spawns y las horas de expiración",
   "stats_subtitle": "Muestra las estadísticas de los Pokémon",
   "submissionCells_subtitle": "Muestra información útil para enviar nuevos POIs",
@@ -556,4 +556,4 @@
   "seen_lure_encounter": "Encuentro de señuelos",
   "seen_lure_wild": "Engendro de señuelo",
   "seen_wild": "Engendro salvaje"
-}
+}
diff --git a/public/base-locales/fr.json b/public/base-locales/fr.json
@@ -269,7 +269,7 @@
   "quests_subtitle": "Affiche les récompenses de quêtes et tâches",
   "raids_subtitle": "Affiche les informations de raids y compris les Boss et leurs attaques, Oeufs et heure d'expiration",
   "scan_cells_subtitle": "Affiche la dernière fois que la cellule S2 a été scannée",
-  "scanAreas_subtitle": "Affiche les zones de scan",
+  "scan_areas_subtitle": "Affiche les zones de scan",
   "spawnpoints_subtitle": "Affiche les points d'apparition et les heures d'expiration estimées",
   "stats_subtitle": "Affiche les Stats et Niveaux des Pokémon",
   "submissionCells_subtitle": "Affiche les informations utiles à la création de nouveaux Points d'Intérêts",

diff --git a/public/base-locales/hi.json b/public/base-locales/hi.json
@@ -0,0 +1 @@
+{}
diff --git a/public/base-locales/id.json b/public/base-locales/id.json
@@ -0,0 +1 @@
+{}
diff --git a/public/base-locales/it.json b/public/base-locales/it.json
@@ -330,7 +330,7 @@
   "quests_subtitle": "Mostra la ricompensa della missione e le informazioni sull'attività",
   "raids_subtitle": "Mostra tutte le informazioni sul raid, inclusi il boss del raid, le uova, l'ora di scadenza e il moveset",
   "s2cells_subtitle": "Mostra l'ultima volta che una cella S2 è stata scansionata da un dispositivo",
-  "scanAreas_subtitle": "Mostra i poligoni delle aree di scansione disponibili",
+  "scan_areas_subtitle": "Mostra i poligoni delle aree di scansione disponibili",
   "spawnpoints_subtitle": "Mostra i punti di spawn e il loro tempo di despawn stimato",
   "stats_subtitle": "Mostra le statistiche e i livelli dei Pokémon",
   "submission_cells_subtitle": "Mostra informazioni utili per inviare nuovi POI",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "Incontro di richiamo",
   "seen_lure_wild": "Esca Spawn",
   "seen_wild": "Progenie selvatica"
-}
+}
diff --git a/public/base-locales/ja.json b/public/base-locales/ja.json
@@ -294,7 +294,7 @@
   "quests_subtitle": "クエストの報酬とタスク情報を表示します",
   "raids_subtitle": "レイドボス、エッグ、有効期限、ムーブセットを含むすべてのレイド情報を表示します",
   "s2cells_subtitle": "S2セルがデバイスによって最後にスキャンされた時刻を示します",
-  "scanAreas_subtitle": "使用可能なスキャン領域のポリゴンを表示します",
+  "scan_areas_subtitle": "使用可能なスキャン領域のポリゴンを表示します",
   "spawnpoints_subtitle": "スポーンポイントとその推定デスポーン時間を表示します",
   "stats_subtitle": "ポケモンの統計とレベルを表示します",
   "submission_cells_subtitle": "新しいPOIの送信に役立つ情報を表示します",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "ルアーエンカウンター",
   "seen_lure_wild": "ルアースポーン",
   "seen_wild": "ワイルドスポーン"
-}
+}
diff --git a/public/base-locales/ko.json b/public/base-locales/ko.json
@@ -362,7 +362,7 @@
   "quests_subtitle": "퀘스트 보상 및 작업 정보 표시",
   "raids_subtitle": "레이드 보스, 알, 만료 시간 및 이동 세트를 포함한 모든 레이드 정보를 표시합니다.",
   "s2cells_subtitle": "장치가 S2 셀을 마지막으로 스캔한 시간을 표시합니다.",
-  "scanAreas_subtitle": "사용 가능한 스캔 영역 폴리곤을 표시합니다.",
+  "scan_areas_subtitle": "사용 가능한 스캔 영역 폴리곤을 표시합니다.",
   "spawnpoints_subtitle": "스폰 지점과 예상 디스폰 시간을 표시합니다.",
   "stats_subtitle": "포켓몬 통계 및 레벨 표시",
   "submission_cells_subtitle": "새 POI 제출에 유용한 정보 표시",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "루어 인카운터",
   "seen_lure_wild": "루어 스폰",
   "seen_wild": "와일드 스폰"
-}
+}
diff --git a/public/base-locales/nl.json b/public/base-locales/nl.json
@@ -269,7 +269,7 @@
   "quests_subtitle": "Toont quest reward en task informatie",
   "raids_subtitle": "Toont alle raid informatie inclusief de raid boss, eggs, vervaltijd, en moveset",
   "scan_cells_subtitle": "Toont de laatste tijd een S2 cell was bijgewerkt door een scanner.",
-  "scanAreas_subtitle": "Toont beschikbare scan gebieden polygons",
+  "scan_areas_subtitle": "Toont beschikbare scan gebieden polygons",
   "spawnpoints_subtitle": "Toont spawnpoints en hun geschatte despawntijd",
   "stats_subtitle": "Toont Pokémon Statistieken en levels",
   "submission_cells_subtitle": "Toont informatie die nuttig is voor het indienen van nieuwe POIs",
@@ -559,4 +559,4 @@
   "seen_lure_encounter": "Ontmoeting met lokken",
   "seen_lure_wild": "lokken spawn",
   "seen_wild": "Wilde spawn"
-}
+}
diff --git a/public/base-locales/pl.json b/public/base-locales/pl.json
@@ -277,7 +277,7 @@
   "quests_subtitle": "Pokazuje nagrodę oraz informację o zadaniu",
   "raids_subtitle": "Pokazuje dane raidu, takie jak informacja o bossie, jajku, czasie zakończenia czy atakach bossa",
   "scan_cells_subtitle": "Pokazuje czas ostatniego skanowania komórki S2 przez urządzenie",
-  "scanAreas_subtitle": "Pokazuje dostępne obszary skanowania",
+  "scan_areas_subtitle": "Pokazuje dostępne obszary skanowania",
   "spawnpoints_subtitle": "Pokazuje spawnpointy oraz ich przybliżone czasy despawnu",
   "stats_subtitle": "Pokazuje statystyki i poziomy Pokemona",
   "submissionCells_subtitle": "Pokazuje informacje przydatne przy zgłaszaniu nowych portali",

diff --git a/public/base-locales/pt-br.json b/public/base-locales/pt-br.json
@@ -268,7 +268,7 @@
   "quests_subtitle": "Mostra a recompensa da missão e informações sobre a tarefa",
   "raids_subtitle": "Mostra todas as informações da invasão, incluindo o chefe da invasão, ovos, tempo de expiração e moveset",
   "s2cells_subtitle": "Mostra a última vez que uma célula S2 foi lida por um dispositivo",
-  "scanAreas_subtitle": "Mostra os polígonos das áreas de digitalização disponíveis",
+  "scan_areas_subtitle": "Mostra os polígonos das áreas de digitalização disponíveis",
   "spawnpoints_subtitle": "Mostra pontos de spawn e seu tempo estimado de despawn",
   "stats_subtitle": "Mostra estatísticas e níveis do Pokémon",
   "submission_cells_subtitle": "Mostra informações úteis para o envio de novos POIs",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "Encontro de atração",
   "seen_lure_wild": "Lure Spawn",
   "seen_wild": "Cria Selvagem"
-}
+}
diff --git a/public/base-locales/ru.json b/public/base-locales/ru.json
@@ -294,7 +294,7 @@
   "quests_subtitle": "Показывает награду за квест и информацию о задании",
   "raids_subtitle": "Показывает всю информацию о рейде, включая рейдового босса, яйца, время действия и набор приемов.",
   "s2cells_subtitle": "Показывает, когда в последний раз ячейка S2 сканировалась устройством.",
-  "scanAreas_subtitle": "Показывает доступные полигоны областей сканирования",
+  "scan_areas_subtitle": "Показывает доступные полигоны областей сканирования",
   "spawnpoints_subtitle": "Показывает точки появления и их примерное время исчезновения.",
   "stats_subtitle": "Показывает статистику и уровни покемонов",
   "submission_cells_subtitle": "Показывает информацию, полезную для отправки новых POI",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "Приманка",
   "seen_lure_wild": "Приманка Спаун",
   "seen_wild": "Дикое отродье"
-}
+}
diff --git a/public/base-locales/sv.json b/public/base-locales/sv.json
@@ -267,7 +267,7 @@
   "quests_subtitle": "Visar uppdragsbelöning och uppgiftsinformation",
   "raids_subtitle": "Visar all raidinformation inklusive raidbossen, ägg, utgångstid och moveset",
   "s2cells_subtitle": "Visar senaste gången en S2-cell skannades av en enhet",
-  "scanAreas_subtitle": "Visar tillgängliga skanningsområdens polygoner",
+  "scan_areas_subtitle": "Visar tillgängliga skanningsområdens polygoner",
   "spawnpoints_subtitle": "Visar spawnpoints och deras beräknade despawn-tid",
   "stats_subtitle": "Visar Pokémon-statistik och nivåer",
   "submission_cells_subtitle": "Visar information som är användbar för att skicka in nya sevärdheter",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "Lure Encounter",
   "seen_lure_wild": "Lure Spawn",
   "seen_wild": "Wild Spawn"
-}
+}
diff --git a/public/base-locales/th.json b/public/base-locales/th.json
@@ -267,7 +267,7 @@
   "quests_subtitle": "แสดงรางวัลภารกิจและข้อมูลภารกิจ",
   "raids_subtitle": "แสดงข้อมูลการจู่โจมทั้งหมดรวมถึงหัวหน้าการโจมตี ไข่ เวลาหมดอายุ และชุดเคลื่อนไหว",
   "s2cells_subtitle": "แสดงครั้งสุดท้ายที่อุปกรณ์ S2 สแกนเซลล์",
-  "scanAreas_subtitle": "แสดงพื้นที่สแกนที่มีรูปหลายเหลี่ยม",
+  "scan_areas_subtitle": "แสดงพื้นที่สแกนที่มีรูปหลายเหลี่ยม",
   "spawnpoints_subtitle": "แสดงจุดเกิดและเวลาวางไข่โดยประมาณ",
   "stats_subtitle": "แสดงสถิติโปเกมอนและระดับ",
   "submission_cells_subtitle": "แสดงข้อมูลที่เป็นประโยชน์ในการส่ง POI ใหม่",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "ล่อเผชิญหน้า",
   "seen_lure_wild": "วางไข่ล่อ",
   "seen_wild": "วางไข่ป่า"
-}
+}
diff --git a/public/base-locales/zh-tw.json b/public/base-locales/zh-tw.json
@@ -268,7 +268,7 @@
   "quests_subtitle": "顯示任務獎勵和任務信息",
   "raids_subtitle": "顯示所有突襲信息，包括突襲首領、雞蛋、過期時間和移動設置",
   "s2cells_subtitle": "顯示設備上次掃描 S2 單元的時間",
-  "scanAreas_subtitle": "顯示可用的掃描區域多邊形",
+  "scan_areas_subtitle": "顯示可用的掃描區域多邊形",
   "spawnpoints_subtitle": "顯示出生點及其估計的消失時間",
   "stats_subtitle": "顯示神奇寶貝的統計數據和等級",
   "submission_cells_subtitle": "顯示對提交新 POI 有用的信息",
@@ -527,4 +527,4 @@
   "seen_lure_encounter": "誘惑遭遇",
   "seen_lure_wild": "引誘產卵",
   "seen_wild": "野生菌種"
-}
+}
diff --git a/server/src/configs/custom-environment-variables.json b/server/src/configs/custom-environment-variables.json
@@ -315,7 +315,11 @@
         "__format": "number"
       },
       "geoJsonFileName": "MAP_GENERAL_GEO_JSON_FILE_NAME",
-      "attributionPrefix": "MAP_GENERAL_ATTRIBUTION_PREFIX"
+      "attributionPrefix": "MAP_GENERAL_ATTRIBUTION_PREFIX",
+      "menuOrder": {
+        "__name": "MAP_GENERAL_MENU_ORDER",
+        "__format": "json"
+      }
     },
     "localeSelection": {
       "__name": "MAP_LOCALE_SELECTION",
@@ -661,6 +665,10 @@
         "__name": "CLIENT_SIDE_OPTIONS_POKEMON_LINK_GLOBAL_AND_ADVANCED",
         "__format": "boolean"
       },
+      "showSizeIndicator": {
+        "__name": "CLIENT_SIDE_OPTIONS_POKEMON_SHOW_SIZE_INDICATOR",
+        "__format": "boolean"
+      },
       "glow": {
         "__name": "CLIENT_SIDE_OPTIONS_POKEMON_GLOW",
         "__format": "json"
@@ -925,6 +933,14 @@
         "cp": {
           "__name": "DEFAULT_FILTERS_POKEMON_GLOBAL_VALUES_CP",
           "__format": "json"
+        },
+        "xxs": {
+          "__name": "DEFAULT_FILTERS_POKEMON_GLOBAL_VALUES_XXS",
+          "__format": "boolean"
+        },
+        "xxl": {
+          "__name": "DEFAULT_FILTERS_POKEMON_GLOBAL_VALUES_XXL",
+          "__format": "boolean"
         }
       }
     },

diff --git a/server/src/configs/default.json b/server/src/configs/default.json
@@ -117,21 +117,35 @@
       "submissionZoom": 15,
       "activeWeatherZoom": 13,
       "geoJsonFileName": "areas.json",
-      "attributionPrefix": "<a href='https://github.com/WatWowMap/ReactMap' target='_blank' rel='noreferrer'>ReactMap</a>"
+      "attributionPrefix": "<a href='https://github.com/WatWowMap/ReactMap' target='_blank' rel='noreferrer'>ReactMap</a>",
+      "menuOrder": [
+        "gyms",
+        "nests",
+        "pokestops",
+        "pokemon",
+        "wayfarer",
+        "scanAreas",
+        "weather",
+        "admin",
+        "settings"
+      ]
     },
     "localeSelection": [
       "en",
       "de",
       "es",
       "fr",
+      "hi",
+      "id",
       "it",
       "ja",
       "ko",
       "nl",
       "pl",
       "ru",
       "sv",
-      "th"
+      "th",
+      "tr"
     ],
     "customRoutes": {
       "discordAuthUrl": "/auth/discord/callback",
@@ -327,6 +341,7 @@
       "showDexNumInPopup": false,
       "pvpMega": false,
       "linkGlobalAndAdvanced": false,
+      "showSizeIndicator": false,
       "glow": [
         {
           "name": "Hundo",
@@ -497,7 +512,9 @@
         "cp": [
           10,
           5000
-        ]
+        ],
+        "xxs": false,
+        "xxl": false
       }
     },
     "portals": {

diff --git a/server/src/graphql/poracleTypes.js b/server/src/graphql/poracleTypes.js
@@ -120,6 +120,8 @@ module.exports = gql`
     min_time: Int
     rarity: Int
     max_rarity: Int
+    size: Int
+    max_size: Int
     pvp_ranking_worst: Int
     pvp_ranking_best: Int
     pvp_ranking_min_cp: Int