Merge branch 'develop' into client-restructure

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.30.0-develop.17](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.16...v1.30.0-develop.17) (2024-03-05)
+
+
+### Bug Fixes
+
+* attempt to keep available/masterfile more in sync ([1961af3](https://github.com/WatWowMap/ReactMap/commit/1961af3e3f1953c19f330bec3d191a3b6ef5dca3))
+
+# [1.30.0-develop.16](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.15...v1.30.0-develop.16) (2024-03-04)
+
+
+### Bug Fixes
+
+* 0iv/100iv overrides in a specific scenario ([aebebf1](https://github.com/WatWowMap/ReactMap/commit/aebebf10f86a0562fd4eb098fbe0cf364453dc4b))
+
 # [1.30.0-develop.15](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.14...v1.30.0-develop.15) (2024-03-02)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.30.0-develop.15",
+  "version": "1.30.0-develop.17",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",

packages/locales/lib/human/fr.json

@@ -694,5 +694,47 @@
   "search_rocket_pokemon": "Recherche Pokémon de Sbire",
   "main": "Principal",
   "extra": "Extra",
-  "select": "Sélection"
+  "select": "Sélection",
+  "searching": "recherche...",
+  "no_options": "Pas d'options...",
+  "and": "ET",
+  "or": "OU",
+  "only_global": "Seulement Global",
+  "global_caption": "Ignore tous les autres filtres",
+  "global_and_individual": "Filtres Global & Individuel",
+  "gender_filters_all": "Les genres s'appliquent à tous",
+  "and_caption": "Filtres combinés",
+  "or_caption": "Filtres indépendants",
+  "filter_help": "Aide des filtres",
+  "kilometers": "Kilomètres",
+  "miles": "Miles",
+  "distance_unit": "Unité de Distance",
+  "data_management": "Gestion des données",
+  "reset_or_manage_text": "Vous pouvez soit réinitialiser tous vos filtres, soit accéder à la gestion des données pour réinitialiser les filtres de certaines catégories seulement.",
+  "reset_audio": "Réinitialiser Audio",
+  "reset_all": "Réinitialiser Tout",
+  "reset_icons": "Réinitialiser Icônes",
+  "reset_position": "Réinitialiser Position",
+  "reset_ui": "Réinitialiser UI",
+  "reset_options": "Réinitialiser Options",
+  "reset_menus": "Réinitialiser Menus",
+  "reset_settings": "Réinitialiser Paramètres",
+  "reset_general_title": "Général",
+  "reset_filters_title": "Filtres",
+  "reset_assets": "Assets",
+  "reset_pokemon": "Réinitialiser Pokémon",
+  "reset_pokestops": "Réinitialiser PokéStops",
+  "reset_gyms": "Réinitialiser Arènes",
+  "reset_nests": "Réinitialiser Nids",
+  "reset_portals": "Réinitialiser Portails",
+  "reset_routes": "Réinitialiser Routes",
+  "reset_scan_areas": "Réinitialiser Villes",
+  "reset_scan_cells": "Réinitialiser Cellules de Scan",
+  "reset_devices": "Réinitialiser Appareils",
+  "reset_weather": "Réinitialiser Météo",
+  "reset_s2cells": "Réinitialiser Cellules S2",
+  "reset_spawnpoints": "Réinitialiser Points d'apparition",
+  "reset_submission_cells": "Réinitialiser Wayfarer",
+  "hisuian": "de Hisui",
+  "spacial_rend_range": "Portée Spatio-Rift"
 }

server/src/routes/rootRouter.js

@@ -225,9 +225,6 @@ rootRouter.get('/api/settings', async (req, res, next) => {
       if (settings.user.perms.nests && api.queryOnSessionInit.nests) {
         Event.setAvailable('nests', 'Nest', Db, false)
       }
-      if (Object.values(api.queryOnSessionInit).some(Boolean)) {
-        Event.addAvailable()
-      }
     }
 
     res.status(200).json(settings)

server/src/services/EventManager.js

@@ -104,6 +104,7 @@ class EventManager {
 
       return 0
     })
+    this.addAvailable(category)
   }
 
   /**
@@ -342,46 +343,51 @@ class EventManager {
     try {
       const newMf = await generate(true, historical, dbRarity)
       this.masterfile = newMf ?? this.masterfile
-      this.addAvailable()
+      this.addAllAvailable()
     } catch (e) {
       log.warn(HELPERS.event, 'Failed to generate latest masterfile:\n', e)
     }
   }
 
-  addAvailable() {
-    Object.entries(this.available).forEach(([c, entries]) => {
-      const category = /** @type {keyof EventManager['available']} */ (c)
-      entries.forEach((item) => {
-        if (!Number.isNaN(parseInt(item.charAt(0)))) {
-          const [id, form] = item.split('-')
-          if (!this.masterfile.pokemon[id]) {
-            this.masterfile.pokemon[id] = {
-              name: '',
-              pokedexId: +id,
-              types: [],
-              quickMoves: [],
-              chargedMoves: [],
-              defaultFormId: +form,
-              forms: {},
-              genId: 0,
-            }
-            log.warn(HELPERS.event, `Added ${id} to Pokemon, seems suspicious`)
-          }
-          if (!this.masterfile.pokemon[id].forms) {
-            this.masterfile.pokemon[id].forms = {}
-          }
-          if (!this.masterfile.pokemon[id].forms[form]) {
-            this.masterfile.pokemon[id].forms[form] = { name: '*', category }
-            log.info(
-              HELPERS.event,
-              `Added ${this.masterfile.pokemon[id].name} Key: ${item} to masterfile. (${category})`,
-            )
+  /** @param {keyof EventManager['available']} category */
+  addAvailable(category) {
+    this.available[category].forEach((item) => {
+      if (!Number.isNaN(parseInt(item.charAt(0)))) {
+        const [id, form] = item.split('-')
+        if (!this.masterfile.pokemon[id]) {
+          this.masterfile.pokemon[id] = {
+            name: '',
+            pokedexId: +id,
+            types: [],
+            quickMoves: [],
+            chargedMoves: [],
+            defaultFormId: +form,
+            forms: {},
+            genId: 0,
           }
+          log.warn(HELPERS.event, `Added ${id} to Pokemon, seems suspicious`)
         }
-      })
+        if (!this.masterfile.pokemon[id].forms) {
+          this.masterfile.pokemon[id].forms = {}
+        }
+        if (!this.masterfile.pokemon[id].forms[form]) {
+          this.masterfile.pokemon[id].forms[form] = { name: '*', category }
+          log.info(
+            HELPERS.event,
+            `Added ${this.masterfile.pokemon[id].name} Key: ${item} to masterfile. (${category})`,
+          )
+        }
+      }
     })
   }
 
+  addAllAvailable() {
+    Object.keys(this.available).forEach(
+      (/** @type {keyof EventManager['available']} */ category) =>
+        this.addAvailable(category),
+    )
+  }
+
   async getWebhooks() {
     const apis = await Promise.allSettled(
       config

server/src/services/filters/pokemon/Backend.js

@@ -360,15 +360,15 @@ module.exports = class PkmnBackend {
       !this.mods.mem ||
       filterRTree(pokemon, this.perms.areaRestrictions, this.mods.onlyAreas)
     ) {
+      if (
+        (this.mods.onlyHundoIv && pokemon.iv === 100) ||
+        (this.mods.onlyZeroIv && pokemon.iv === 0)
+      )
+        return true
       if (
         !this.mods.onlyLinkGlobal ||
         (this.pokemon === pokemon.pokemon_id && this.form === pokemon.form)
       ) {
-        if (
-          (this.mods.onlyHundoIv && pokemon.iv === 100) ||
-          (this.mods.onlyZeroIv && pokemon.iv === 0)
-        )
-          return true
         if (!this.expertFilter || !this.expertGlobal) return true
         if (this.expertFilter(pokemon)) {
           return true