fix: attempt to keep available/masterfile more in sync

Author: TurtIeSocks

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