Sync Develop to Main for the last time

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
         run: yarn masterfile
 
       - name: Lint
-        run: yarn eslint
+        run: yarn lint
 
       - name: Prettier
         run: yarn prettier

.github/workflows/release.yml

@@ -22,6 +22,8 @@ jobs:
         run: yarn --prefer-offline
         env:
           HUSKY: 0
+      - name: Lint app
+        run: yarn lint
       - name: Build app
         run: yarn build
       - name: Release

.gitignore

@@ -86,6 +86,7 @@ server/src/models/queries/*
 # Cache
 server/.cache/*
 !/server/.cache/.gitkeep
+.eslintcache
 
 # Misc
 ts-check.js

CHANGELOG.md

@@ -1,10 +1,55 @@
+## [1.41.2-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.41.2-develop.4...v1.41.2-develop.5) (2026-04-19)
+
+
+### Bug Fixes
+
+* perms cleanup ([c513936](https://github.com/WatWowMap/ReactMap/commit/c513936fe84f5c863644fe90555de73c723d7a44))
+
+## [1.41.2-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.41.2-develop.3...v1.41.2-develop.4) (2026-04-04)
+
+
+### Bug Fixes
+
+* restore drawer sublist scroll positions ([8950dd5](https://github.com/WatWowMap/ReactMap/commit/8950dd56745be7ee591ccfffe6e97b6cfafb34fc))
+
+## [1.41.2-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.41.2-develop.2...v1.41.2-develop.3) (2026-04-03)
+
+
+### Bug Fixes
+
+* weather update consistency ([184ac2f](https://github.com/WatWowMap/ReactMap/commit/184ac2fa3fbc372d896f70bf36277fa1dd2e6a22))
+
+## [1.41.2-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.41.2-develop.1...v1.41.2-develop.2) (2026-04-03)
+
+
+### Bug Fixes
+
+* keep drawer scroll position ([a242e84](https://github.com/WatWowMap/ReactMap/commit/a242e842acaf9f5526491c7a294b8a677979b48f))
+* properly set default discord auth as none ([3670810](https://github.com/WatWowMap/ReactMap/commit/3670810193e1c74bcd8352825083c069b33b1bff))
+
+## [1.41.2-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.41.1...v1.41.2-develop.1) (2026-03-26)
+
+
+### Bug Fixes
+
+* change scan-on-demand dialog to notification ([b77145d](https://github.com/WatWowMap/ReactMap/commit/b77145dd8e037f0916d72c6a84e76fbb9584bde8))
+* **pokestops:** align incident blocker visibility across markers and popups ([8acf245](https://github.com/WatWowMap/ReactMap/commit/8acf245983402e9e14ef78f628fae217c1e23000))
+* weather icon uses wrong time of day for wild ([5944452](https://github.com/WatWowMap/ReactMap/commit/594445268ca027b8f2b1d9c8edce70208b23c49d))
+
 ## [1.41.1](https://github.com/WatWowMap/ReactMap/compare/v1.41.0...v1.41.1) (2026-03-15)
 
 
 ### Bug Fixes
 
 * workflow git creds ([e5dc6f9](https://github.com/WatWowMap/ReactMap/commit/e5dc6f90d14fa1afb8a75bb9bdb2246213ff1c88))
 
+# [1.41.0-develop.12](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.11...v1.41.0-develop.12) (2026-03-15)
+
+
+### Bug Fixes
+
+* weather icon uses wrong time of day for wild ([5944452](https://github.com/WatWowMap/ReactMap/commit/594445268ca027b8f2b1d9c8edce70208b23c49d))
+
 # [1.41.0](https://github.com/WatWowMap/ReactMap/compare/v1.40.1...v1.41.0) (2026-03-15)
 
 

config/local.example.json

@@ -84,7 +84,8 @@
         "redirectUri": "http://localhost:8080/auth/discord/callback",
         "allowedGuilds": [],
         "blockedGuilds": [],
-        "allowedUsers": []
+        "allowedUsers": [],
+        "clientPrompt": "none"
       }
     ],
     "areaRestrictions": [

config/multi-domain-example/local.json

@@ -82,7 +82,8 @@
         "redirectUri": "http://localhost:8080/auth/discord/callback",
         "allowedGuilds": [],
         "blockedGuilds": [],
-        "allowedUsers": []
+        "allowedUsers": [],
+        "clientPrompt": "none"
       }
     ],
     "alwaysEnabledPerms": ["map"],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.41.1",
+  "version": "1.41.2-develop.5",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
@@ -47,7 +47,7 @@
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
-      "eslint \"**/*.{js,jsx}\" --fix"
+      "eslint --cache --fix"
     ],
     "**/*": [
       "prettier --write --ignore-unknown"
@@ -99,7 +99,7 @@
   },
   "dependencies": {
     "@apollo/client": "3.11.4",
-    "@apollo/server": "5.4.0",
+    "@apollo/server": "5.5.0",
     "@as-integrations/express5": "1.1.2",
     "@emotion/react": "11.14.0",
     "@emotion/styled": "11.13.0",
@@ -211,7 +211,7 @@
     "rollup-plugin-delete": "^2.0.0",
     "semantic-release": "^22",
     "typescript": "5.5.4",
-    "vite": "^6.4.1",
+    "vite": "^6.4.2",
     "vite-plugin-checker": "0.7.2"
   },
   "resolutions": {

packages/config/lib/mutations.js

@@ -315,6 +315,9 @@ const applyMutations = (config) => {
   config.authentication.strategies = config.authentication.strategies.map(
     (strategy) => ({
       ...strategy,
+      ...(strategy.type === 'discord'
+        ? { clientPrompt: strategy.clientPrompt ?? 'none' }
+        : {}),
       allowedGuilds: Array.isArray(strategy.allowedGuilds)
         ? strategy.allowedGuilds.flatMap(replaceAliases)
         : [],

packages/locales/lib/human/en.json

@@ -623,6 +623,7 @@
   "show_size_indicator": "Show Size Indicator",
   "size": "Size",
   "gold_stop": "Gold Stop",
+  "gold_stop_block": "Blocked due to a gold stop",
   "profile_backups": "Profile Swapping",
   "new_backup": "New Backup",
   "create": "Create",

packages/types/lib/augmentations.d.ts

@@ -32,6 +32,7 @@ declare global {
 declare module 'express-session' {
   interface SessionData {
     tutorial: boolean
+    discordPromptRetry?: string
   }
 }
 

packages/types/lib/scanner.d.ts

@@ -214,7 +214,8 @@ export interface Pokestop {
   showcase_pokemon_id?: number
   showcase_ranking_standard?: number
   showcase_rankings?: ShowcaseDetails | string
-  hasShowcase: boolean
+  incident_blocker_display_type: number | null
+  incident_blocker_expire_timestamp: number | null
 }
 
 export type FullPokestop = FullModel<Pokestop, PokestopModel.Pokestop>

packages/vite-plugins/package.json

@@ -16,6 +16,6 @@
     "@rm/logger": "*"
   },
   "devDependencies": {
-    "vite": "^6.4.1"
+    "vite": "^6.4.2"
   }
 }

server/src/graphql/typeDefs/scanner.graphql

@@ -147,7 +147,9 @@ type Pokestop {
   power_up_level: Int
   power_up_points: Int
   power_up_end_timestamp: Int
-  hasShowcase: Boolean
+  showcase_expiry: Int
+  incident_blocker_display_type: Int
+  incident_blocker_expire_timestamp: Int
 }
 
 type PokemonShinyStats {

server/src/models/Pokestop.js

@@ -720,6 +720,41 @@ class Pokestop extends Model {
     fields.forEach((field) => (target[field] = source[field]))
   }
 
+  static getIncidentDisplayType(incident, isMad, hasMultiInvasions) {
+    return isMad && !hasMultiInvasions
+      ? MAD_GRUNT_MAP[incident.grunt_type] || 8
+      : incident.display_type
+  }
+
+  static getIncidentBlocker(incidents, isMad, hasMultiInvasions) {
+    const blocker = {
+      displayType: 0,
+      expireTimestamp: 0,
+    }
+
+    ;(incidents || []).forEach((incident) => {
+      const displayType = this.getIncidentDisplayType(
+        incident,
+        isMad,
+        hasMultiInvasions,
+      )
+      // Showcase expiry is tracked separately on the client so local timer
+      // updates can fall through to the next hidden blocker without a refetch.
+      if (
+        displayType === 7 &&
+        incident.incident_expire_timestamp > blocker.expireTimestamp
+      ) {
+        blocker.displayType = 7
+        blocker.expireTimestamp = incident.incident_expire_timestamp
+      }
+    })
+
+    return {
+      displayType: blocker.displayType || null,
+      expireTimestamp: blocker.expireTimestamp || null,
+    }
+  }
+
   // filters and removes unwanted data
   static secondaryFilter(
     queryResults,
@@ -734,7 +769,18 @@ class Pokestop extends Model {
     const filteredResults = []
     for (let i = 0; i < queryResults.length; i += 1) {
       const pokestop = queryResults[i]
-      const filtered = { hasShowcase: pokestop.showcase_expiry > ts }
+      const canViewIncidentMetadata = perms.eventStops || perms.invasions
+      const incidentBlocker = canViewIncidentMetadata
+        ? this.getIncidentBlocker(pokestop.invasions, isMad, hasMultiInvasions)
+        : null
+      const filtered = {
+        showcase_expiry: canViewIncidentMetadata
+          ? pokestop.showcase_expiry || null
+          : null,
+        incident_blocker_display_type: incidentBlocker?.displayType || null,
+        incident_blocker_expire_timestamp:
+          incidentBlocker?.expireTimestamp || null,
+      }
 
       this.fieldAssigner(filtered, pokestop, [
         'id',
@@ -790,10 +836,11 @@ class Pokestop extends Model {
               event.display_type === 9
                 ? pokestop.showcase_ranking_standard
                 : null,
-            display_type:
-              isMad && !hasMultiInvasions
-                ? MAD_GRUNT_MAP[event.grunt_type] || 8
-                : event.display_type,
+            display_type: this.getIncidentDisplayType(
+              event,
+              isMad,
+              hasMultiInvasions,
+            ),
           }))
           .filter((event) =>
             event.showcase_pokemon_id

server/src/routes/authRouter.js

@@ -18,22 +18,61 @@ const loadAuthStrategies = () => {
         : 'post'
     if (strategy.enabled) {
       const name = strategy.name ?? `${strategy.type}-${i}`
-      const callbackOptions = {}
-      const authenticateOptions = {
-        failureRedirect: '/',
-        successRedirect: '/',
-      }
-      if (strategy.type === 'discord') {
-        callbackOptions.prompt = strategy.clientPrompt
+      const isDiscordPromptRetry = (req) =>
+        strategy.type === 'discord' && req.session.discordPromptRetry === name
+      const getAuthenticateOptions = (req, includeRedirects = false) => {
+        const options = includeRedirects
+          ? {
+              failureRedirect: '/',
+              successRedirect: '/',
+            }
+          : {}
+
+        if (
+          strategy.type === 'discord' &&
+          strategy.clientPrompt &&
+          !isDiscordPromptRetry(req)
+        ) {
+          options.prompt = strategy.clientPrompt
+        }
+
+        return options
       }
-      authRouter[method](
-        `/${name}`,
-        passport.authenticate(name, authenticateOptions),
+
+      authRouter[method](`/${name}`, (req, res, next) =>
+        passport.authenticate(name, getAuthenticateOptions(req, true))(
+          req,
+          res,
+          next,
+        ),
       )
-      authRouter[method](`/${name}/callback`, async (req, res, next) =>
-        passport.authenticate(
+      authRouter[method](`/${name}/callback`, async (req, res, next) => {
+        if (
+          strategy.type === 'discord' &&
+          strategy.clientPrompt === 'none' &&
+          !isDiscordPromptRetry(req) &&
+          typeof req.query.error === 'string'
+        ) {
+          req.session.discordPromptRetry = name
+          log.debug(
+            TAGS.auth,
+            'Discord silent auth needs user interaction, retrying with approval page',
+          )
+          return res.redirect(`${req.baseUrl}/${name}/callback`)
+        }
+
+        if (
+          strategy.type === 'discord' &&
+          isDiscordPromptRetry(req) &&
+          (typeof req.query.code === 'string' ||
+            typeof req.query.error === 'string')
+        ) {
+          delete req.session.discordPromptRetry
+        }
+
+        return passport.authenticate(
           name,
-          callbackOptions,
+          getAuthenticateOptions(req),
           async (err, user, info) => {
             if (err) {
               return next(err)
@@ -67,8 +106,8 @@ const loadAuthStrategies = () => {
               }
             }
           },
-        )(req, res, next),
-      )
+        )(req, res, next)
+      })
       log.info(
         TAGS.auth,
         `${method.toUpperCase()} /auth/${name}/callback route initialized`,

server/src/ui/drawer.js

@@ -52,14 +52,14 @@ function drawer(req, perms) {
           }
         : BLOCKED,
     pokestops:
-      (perms.pokestops || perms.lures || perms.quests || perms.invasions) &&
+      (perms.pokestops || perms.quests || perms.invasions || perms.lures) &&
       state.db.models.Pokestop
         ? {
             allPokestops: perms.pokestops || BLOCKED,
-            lures: perms.lures || BLOCKED,
-            eventStops: perms.eventStops || BLOCKED,
             quests: perms.quests || BLOCKED,
             invasions: perms.invasions || BLOCKED,
+            eventStops: perms.eventStops || BLOCKED,
+            lures: perms.lures || BLOCKED,
             arEligible: perms.pokestops || BLOCKED,
           }
         : BLOCKED,