Merge pull request #466 from WatWowMap/bug-fixes

Bug fixes

Author: TurtIeSocks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "React based frontend map.",
   "main": "ReactMap.mjs",
   "author": "TurtIeSocks <[email protected]>",

server/src/configs/default.json

@@ -354,7 +354,8 @@
       "joinGymBadgeTable": false,
       "hideOldQuests": false,
       "maxConnections": 10,
-      "startupDelayMs": 1000
+      "startupDelayMs": 1000,
+      "availableRetryCount": 5
     },
     "schemas": [
       {

server/src/models/Pokestop.js

@@ -605,7 +605,7 @@ module.exports = class Pokestop extends Model {
       }
     })
 
-    if (finalList.length === 0) {
+    if (finalList.size === 0) {
       return fetchQuests()
     }
 
@@ -754,7 +754,7 @@ module.exports = class Pokestop extends Model {
       getAreaSql(query, perms.areaRestrictions, isMad)
     }
     const results = await query
-    const mapped = results.map(q => ({ ...q, with_ar: true }))
+    const mapped = results.map(q => ({ ...q, with_ar: q.with_ar ?? true }))
 
     if (hasAltQuests) {
       const altQuestQuery = this.query()

server/src/services/EventManager.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-promise-executor-return */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-console */
 const { promises: fs } = require('fs')
@@ -16,6 +17,7 @@ module.exports = class EventManager {
     this.uicons = []
     this.baseUrl = 'https://raw.githubusercontent.com/WatWowMap/wwm-uicons/main/'
     this.webhookObj = {}
+    this.pokestopTry = 1
 
     setTimeout(async () => {
       // Set initials, comes with a timeout just to make sure all databases get configured first
@@ -24,9 +26,11 @@ module.exports = class EventManager {
       this.available.nests = await Db.getAvailable('Nest')
       this.available.pokemon = await Db.getAvailable('Pokemon')
       this.available.pokestops = await Db.getAvailable('Pokestop')
-      while (!this.available.pokestops.length) {
-        console.log('Trying again...')
+      while (!this.available.pokestops.length && this.pokestopTry <= config.database.settings.availableRetryCount) {
+        console.log(`[EVENT] No pokestops found, trying again in 1 second (attempt ${this.pokestopTry} / ${config.database.settings.availableRetryCount})`)
+        await new Promise(resolve => setTimeout(resolve, 1000))
         this.available.pokestops = await Db.getAvailable('Pokestop')
+        this.pokestopTry += 1
       }
       await this.getMasterfile()
       await this.getInvasions()

server/src/services/config.js

@@ -73,6 +73,10 @@ if (hasLittle) {
   config.api.pvp.leagueObj.little = hasLittle.littleCupRules ? 500 : { little: false, cap: 500 }
 }
 
+if (!config.authentication.strategies.length || !config.authentication.strategies.find(strategy => strategy.enabled)) {
+  config.authentication.alwaysEnabledPerms = Object.keys(config.authentication.perms)
+}
+
 // Map manual areas
 config.manualAreas = Object.fromEntries(config.manualAreas.map(area => [area.name, area]))