Sync Dev to Main

.github/workflows/release.yml

@@ -21,3 +21,8 @@ jobs:
 
       - name: Sentry Build
         run: yarn release
+        env:
+          SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
+          SENTRY_DSN: ${{secrets.SENTRY_DSN}}
+          SENTRY_ORG: ${{secrets.SENTRY_ORG}}
+          SENTRY_PROJECT: ${{secrets.SENTRY_PROJECT}}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "React based frontend map.",
   "main": "ReactMap.mjs",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",

public/base-locales/de.json

@@ -551,5 +551,7 @@
   "ultra_beast": "Ultrabestie",
   "quest_condition": "Questbedingung",
   "always_show_labels": "Labels immer anzeigen",
-  "scan_areas_options": "Optionen für Scanbereiche"
+  "scan_areas_options": "Optionen für Scanbereiche",
+  "tap_to_toggle": "Tippen zum Umschalten",
+  "power_up": "Aufladung"
 }

public/base-locales/en.json

@@ -37,7 +37,7 @@
   "generations": "Generations",
   "types": "Types",
   "forms": "Forms",
-  "rarity": "Rarity",
+  "rarity": "Current Rarity",
   "others": "Others",
   "categories": "Categories",
   "rank": "Rank",
@@ -546,5 +546,17 @@
   "poi_color": "POI Color",
   "quest_condition": "Quest Condition",
   "always_show_labels": "Always Show Labels",
-  "scan_areas_options": "Scan Areas Options"
+  "scan_areas_options": "Scan Areas Options",
+  "historic_rarity": "Historic Rarity",
+  "poi": "Points of Interest",
+  "300m_range": "300m Range",
+  "lure_range": "Lure Range",
+  "tap_to_toggle": "Tap To Toggle",
+  "power_up": "Power Up",
+  "never_alt": "Never",
+  "seen_nearby_stop": "Seen Nearby",
+  "seen_nearby_cell": "Seen in this Cell",
+  "seen_lure_encounter": "Lure Encounter",
+  "seen_lure_wild": "Lure Spawn",
+  "seen_wild": "Wild Spawn"
 }

server/scripts/createLocales.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 const fs = require('fs')
 const path = require('path')
+const { api } = require('../src/services/config')
 
 const fetchJson = require('../src/services/api/fetchJson')
 
@@ -9,6 +10,8 @@ const finalLocalesFolder = path.resolve(__dirname, '../../public/locales')
 const missingFolder = path.resolve(__dirname, '../../public/missing-locales')
 
 const locales = async () => {
+  if (!api.pogoApiEndpoints.translations)
+    console.error('[LOCALES] No translations endpoint')
   const localTranslations = await fs.promises.readdir(appLocalesFolder)
   const englishRef = fs.readFileSync(
     path.resolve(appLocalesFolder, 'en.json'),
@@ -22,7 +25,7 @@ const locales = async () => {
   )
 
   const availableRemote = await fetchJson(
-    'https://raw.githubusercontent.com/WatWowMap/pogo-translations/master/index.json',
+    `${api.pogoApiEndpoints.translations}/index.json`,
   )
 
   await Promise.all(
@@ -41,7 +44,7 @@ const locales = async () => {
       try {
         const hasRemote = availableRemote.includes(locale)
         const remoteFiles = await fetchJson(
-          `https://raw.githubusercontent.com/WatWowMap/pogo-translations/master/static/locales/${
+          `${api.pogoApiEndpoints.translations}/static/locales/${
             hasRemote ? baseName : 'en'
           }.json`,
         )

server/scripts/generateMasterfile.js

@@ -1,57 +1,81 @@
-/* eslint-disable no-console */
-/* eslint-disable no-restricted-syntax */
 const fs = require('fs')
-const path = require('path')
-const { rarity } = require('../src/services/config')
+const { resolve } = require('path')
+const { rarity: customRarity, api } = require('../src/services/config')
 const fetchJson = require('../src/services/api/fetchJson')
 const defaultRarity = require('../src/data/defaultRarity.json')
 
-const getRarityLevel = (id, pkmn) => {
-  let pkmnRarity
-  for (const [tier, pokemon] of Object.entries(defaultRarity)) {
-    if (rarity?.[tier]?.length) {
-      if (rarity[tier].includes(parseInt(id))) {
-        pkmnRarity = tier
-      }
-    } else if (pokemon.includes(parseInt(id))) {
-      pkmnRarity = tier
-    }
+const rarityObj = {}
+Object.entries(defaultRarity).forEach(([tier, pokemon]) => {
+  if (customRarity?.[tier]?.length) {
+    customRarity[tier].forEach((mon) => (rarityObj[mon] = tier))
+  } else {
+    pokemon.forEach((mon) => (rarityObj[mon] = tier))
   }
-  if (pkmn.legendary) pkmnRarity = 'legendary'
-  if (pkmn.mythical) pkmnRarity = 'mythical'
-  if (pkmn.ultraBeast) pkmnRarity = 'ultraBeast'
-  return pkmnRarity
-}
+})
 
-const generate = async (save) => {
+const generate = async (
+  save = false,
+  historicRarity = new Map(),
+  dbRarity = new Map(),
+) => {
   try {
-    const masterfile = await fetchJson(
-      'https://raw.githubusercontent.com/WatWowMap/Masterfile-Generator/master/master-latest-react-map.json',
-    )
+    if (!api.pogoApiEndpoints.masterfile)
+      throw new Error('No masterfile endpoint')
+
+    const masterfile = await fetchJson(api.pogoApiEndpoints.masterfile)
 
-    Object.values(masterfile.pokemon).forEach((pokemon) => {
-      pokemon.rarity = getRarityLevel(pokemon.pokedexId, pokemon)
-      pokemon.types = pokemon.types || []
-      delete pokemon.mythical
-      delete pokemon.legendary
-    })
+    const newMf = {
+      ...masterfile,
+      pokemon: Object.fromEntries(
+        Object.values(masterfile.pokemon).map((pokemon) => {
+          const { legendary, mythical, ultraBeast, ...rest } = pokemon
+          const historic =
+            historicRarity.get(pokemon.pokedexId.toString()) || 'never'
+
+          let rarity =
+            (dbRarity.size
+              ? dbRarity.get(`${pokemon.pokedexId}-${pokemon.defaultFormId}`)
+              : rarityObj[pokemon.pokedexId]) || 'never'
+          if (legendary) rarity = 'legendary'
+          if (mythical) rarity = 'mythical'
+          if (ultraBeast) rarity = 'ultraBeast'
+          if (rarityObj[pokemon.pokedexId] === 'regional') rarity = 'regional'
+
+          const forms = Object.fromEntries(
+            Object.entries(pokemon.forms || {}).map(([formId, form]) => [
+              formId,
+              {
+                ...form,
+                rarity:
+                  +formId === pokemon.defaultFormId
+                    ? rarity
+                    : dbRarity.get(`${pokemon.pokedexId}-${formId}`) || 'never',
+              },
+            ]),
+          )
+          return [pokemon.pokedexId, { ...rest, forms, rarity, historic }]
+        }),
+      ),
+    }
 
     if (save) {
       fs.writeFileSync(
-        path.resolve(`${__dirname}/../src/data/masterfile.json`),
-        JSON.stringify(masterfile, null, 2),
+        resolve(`${__dirname}/../src/data/masterfile.json`),
+        JSON.stringify(newMf, null, 2),
         'utf8',
         () => {},
       )
     }
-    return masterfile
+    return newMf
   } catch (e) {
+    // eslint-disable-next-line no-console
     console.warn('[WARN] Unable to generate new masterfile, using existing.', e)
   }
 }
 
 module.exports.generate = generate
 
 if (require.main === module) {
+  // eslint-disable-next-line no-console
   generate(true).then(() => console.log('Masterfile generated'))
 }

server/src/configs/custom-environment-variables.json

@@ -103,6 +103,10 @@
       "nests": {
         "__name": "API_QUERY_UPDATE_HOURS_NESTS",
         "__format": "number"
+      },
+      "historicalRarity": {
+        "__name": "API_QUERY_UPDATE_HOURS_HISTORICAL_RARITY",
+        "__format": "number"
       }
     },
     "queryOnSessionInit": {
@@ -213,6 +217,11 @@
     "fetchTimeoutMs": {
       "__name": "API_FETCH_TIMEOUT_MS",
       "__format": "number"
+    },
+    "pogoApiEndpoints": {
+      "invasions": "API_POGO_API_ENDPOINTS_INVASIONS",
+      "masterfile": "API_POGO_API_ENDPOINTS_MASTERFILE",
+      "translations": "API_POGO_API_ENDPOINTS_TRANSLATIONS"
     }
   },
   "multiDomains": {
@@ -370,8 +379,7 @@
     "theme": {
       "style": "MAP_THEME_STYLE",
       "primary": "MAP_THEME_PRIMARY",
-      "secondary": "MAP_THEME_SECONDARY",
-      "drawer": "MAP_THEME_DRAWER"
+      "secondary": "MAP_THEME_SECONDARY"
     },
     "clustering": {
       "gyms": {
@@ -529,6 +537,10 @@
         "__name": "CLIENT_SIDE_OPTIONS_GYMS_INTERACTION_RANGES",
         "__format": "boolean"
       },
+      "300mRange": {
+        "__name": "CLIENT_SIDE_OPTIONS_GYMS_300M_RANGE",
+        "__format": "boolean"
+      },
       "showExBadge": {
         "__name": "CLIENT_SIDE_OPTIONS_GYMS_SHOW_EX_BADGE",
         "__format": "boolean"
@@ -563,6 +575,10 @@
         "__name": "CLIENT_SIDE_OPTIONS_POKESTOPS_INTERACTION_RANGES",
         "__format": "boolean"
       },
+      "lureRange": {
+        "__name": "CLIENT_SIDE_OPTIONS_POKESTOPS_LURE_RANGE",
+        "__format": "boolean"
+      },
       "madQuestText": {
         "__name": "CLIENT_SIDE_OPTIONS_POKESTOPS_MAD_QUEST_TEXT",
         "__format": "boolean"
@@ -641,6 +657,10 @@
       "alwaysShowLabels": {
         "__name": "CLIENT_SIDE_OPTIONS_SCAN_AREAS_ALWAYS_SHOW_LABELS",
         "__format": "boolean"
+      },
+      "tapToToggle": {
+        "__name": "CLIENT_SIDE_OPTIONS_SCAN_AREAS_TAP_TO_TOGGLE",
+        "__format": "boolean"
       }
     },
     "weather": {
@@ -668,6 +688,7 @@
         "__name": "DEFAULT_FILTERS_GYMS_ALL_GYMS",
         "__format": "boolean"
       },
+      "levels": "DEFAULT_FILTERS_GYMS_LEVELS",
       "exEligible": {
         "__name": "DEFAULT_FILTERS_GYMS_EX_ELIGIBLE",
         "__format": "boolean"
@@ -736,6 +757,7 @@
         "__name": "DEFAULT_FILTERS_POKESTOPS_ENABLED",
         "__format": "boolean"
       },
+      "levels": "DEFAULT_FILTERS_POKESTOPS_LEVELS",
       "lures": {
         "__name": "DEFAULT_FILTERS_POKESTOPS_LURES",
         "__format": "boolean"
@@ -868,6 +890,18 @@
       "enabled": {
         "__name": "DEFAULT_FILTERS_SUBMISSION_CELLS_ENABLED",
         "__format": "boolean"
+      },
+      "rings": {
+        "__name": "DEFAULT_FILTERS_SUBMISSION_CELLS_RINGS",
+        "__format": "boolean"
+      },
+      "s17Cells": {
+        "__name": "DEFAULT_FILTERS_SUBMISSION_CELLS_S17CELLS",
+        "__format": "boolean"
+      },
+      "s14Cells": {
+        "__name": "DEFAULT_FILTERS_SUBMISSION_CELLS_S14CELLS",
+        "__format": "boolean"
       }
     },
     "weather": {
@@ -1407,6 +1441,20 @@
     }
   },
   "rarity": {
+    "percents": {
+      "uncommon": {
+        "__name": "RARITY_PERCENTS_UNCOMMON",
+        "__format": "number"
+      },
+      "rare": {
+        "__name": "RARITY_PERCENTS_RARE",
+        "__format": "number"
+      },
+      "ultraRare": {
+        "__name": "RARITY_PERCENTS_ULTRA_RARE",
+        "__format": "number"
+      }
+    },
     "common": {
       "__name": "RARITY_COMMON",
       "__format": "json"
@@ -1430,6 +1478,10 @@
     "event": {
       "__name": "RARITY_EVENT",
       "__format": "json"
+    },
+    "never": {
+      "__name": "RARITY_NEVER",
+      "__format": "json"
     }
   },
   "manualAreas": {