fix: rename utils for cleanup

fix: clean outdated storage 15s after map loads

Author: lenisko

src/features/drawer/settings/index.jsx

@@ -23,7 +23,7 @@ import { LocaleSelection } from '@components/inputs/LocaleSelection'
 import { DividerWithMargin } from '@components/StyledDivider'
 import { BoolToggle } from '@components/inputs/BoolToggle'
 import { BasicListButton } from '@components/inputs/BasicListButton'
-import { clearHiddenEntities } from '@utils/pokemon/hiddenPokemon'
+import { clearHiddenEntities } from '@utils/hiddenEntities'
 
 import { DrawerActions } from '../components/Actions'
 import { GeneralSetting } from './General'

src/features/gym/GymPopup.jsx

@@ -37,7 +37,7 @@ import { getTimeUntil } from '@utils/getTimeUntil'
 import { formatInterval } from '@utils/formatInterval'
 import { usePokemonBackgroundVisuals } from '@hooks/usePokemonBackgroundVisuals'
 import { getFormDisplay } from '@utils/getFormDisplay'
-import { addHiddenEntity, showHideSnackbar } from '@utils/pokemon/hiddenPokemon'
+import { addHiddenEntity, showHideSnackbar } from '@utils/hiddenEntities'
 
 import { useWebhook } from './useWebhook'
 

src/features/nest/NestPopup.jsx

@@ -16,7 +16,7 @@ import { setDeepStore } from '@store/useStorage'
 import { getTimeUntil } from '@utils/getTimeUntil'
 import { useAnalytics } from '@hooks/useAnalytics'
 import { Navigation } from '@components/popups/Navigation'
-import { addHiddenEntity, showHideSnackbar } from '@utils/pokemon/hiddenPokemon'
+import { addHiddenEntity, showHideSnackbar } from '@utils/hiddenEntities'
 
 /** @param {number} timeSince */
 const getColor = (timeSince) => {

src/features/pokemon/PokemonPopup.jsx

@@ -33,7 +33,7 @@ import { GET_TAPPABLE_BY_ID } from '@services/queries/tappable'
 import { usePokemonBackgroundVisual } from '@hooks/usePokemonBackgroundVisuals'
 import { BackgroundCard } from '@components/popups/BackgroundCard'
 import { getFormDisplay } from '@utils/getFormDisplay'
-import { addHiddenEntity } from '@utils/pokemon/hiddenPokemon'
+import { addHiddenEntity } from '@utils/hiddenEntities'
 
 const rowClass = { width: 30, fontWeight: 'bold' }
 

src/features/pokestop/PokestopPopup.jsx

@@ -35,7 +35,7 @@ import { useGetAvailable } from '@hooks/useGetAvailable'
 import { parseQuestConditions } from '@utils/parseConditions'
 import { Img } from '@components/Img'
 import { readableProbability } from '@utils/readableProbability'
-import { addHiddenEntity, showHideSnackbar } from '@utils/pokemon/hiddenPokemon'
+import { addHiddenEntity, showHideSnackbar } from '@utils/hiddenEntities'
 import {
   usePokemonBackgroundVisuals,
   usePokemonBackgroundVisual,

src/features/station/StationPopup.jsx

@@ -27,7 +27,7 @@ import { Img, PokemonImg } from '@components/Img'
 import { useFormatStore } from '@store/useFormatStore'
 import { useRelativeTimer } from '@hooks/useRelativeTime'
 import { useAnalytics } from '@hooks/useAnalytics'
-import { addHiddenEntity, showHideSnackbar } from '@utils/pokemon/hiddenPokemon'
+import { addHiddenEntity, showHideSnackbar } from '@utils/hiddenEntities'
 import { BackgroundCard } from '@components/popups/BackgroundCard'
 import { Title } from '@components/popups/Title'
 import {

src/features/tappable/TappablePopup.jsx

@@ -20,7 +20,7 @@ import { StatusIcon } from '@components/StatusIcon'
 import { Title } from '@components/popups/Title'
 
 import { getTimeUntil } from '@utils/getTimeUntil'
-import { addHiddenEntity, showHideSnackbar } from '@utils/pokemon/hiddenPokemon'
+import { addHiddenEntity, showHideSnackbar } from '@utils/hiddenEntities'
 
 import { getTappableDisplaySettings } from './displayRules'
 

src/pages/map/components/Container.jsx

@@ -9,6 +9,7 @@ import { ScanOnDemand } from '@features/scanner'
 import { WebhookMarker, WebhookAreaSelection } from '@features/webhooks'
 import { ActiveWeather } from '@features/weather'
 import { timeCheck } from '@utils/timeCheck'
+import { cleanupHiddenEntities } from '@utils/hiddenEntities'
 
 import { Effects } from './Effects'
 import { DataView } from './Data'
@@ -38,6 +39,14 @@ const MAX_BOUNDS = /** @type {[[number, number], [number, number]]} */ ([
 export function Container() {
   const { location, zoom } = useStorage.getState()
 
+  // Cleanup hidden entities 15 seconds after map loads
+  React.useEffect(() => {
+    const timer = setTimeout(() => {
+      cleanupHiddenEntities(useMemory.setState)
+    }, 15000)
+    return () => clearTimeout(timer)
+  }, [])
+
   return (
     <MapContainer
       tap={false}

src/store/useMemory.js

@@ -2,7 +2,7 @@
 
 import { create } from 'zustand'
 
-import { getHiddenEntitySet } from '@utils/pokemon/hiddenPokemon'
+import { getHiddenEntitySet } from '@utils/hiddenEntities'
 
 /**
  * TODO: Finish this

src/utils/pokemon/hiddenPokemon.js src/utils/hiddenEntities.jssrc/utils/pokemon/hiddenPokemon.js renamed to src/utils/hiddenEntities.js

@@ -1,7 +1,7 @@
 // @ts-check
 
-const STORAGE_KEY = 'pokemon-hide-list'
-const SNACKBAR_COUNT_KEY = 'pokemon-hide-snackbar-count'
+const STORAGE_KEY = 'hidden-entities'
+const SNACKBAR_COUNT_KEY = 'hidden-entities-snackbar-count'
 const MAX_AGE_MS = 60 * 60 * 1000 // 1 hour
 const MAX_SNACKBAR_SHOWS = 3
 
@@ -10,7 +10,7 @@ const MAX_SNACKBAR_SHOWS = 3
  */
 
 /**
- * Load hidden Pokemon entries from localStorage
+ * Load hidden entries from localStorage
  * @returns {HiddenEntry[]}
  */
 function loadEntries() {
@@ -25,7 +25,7 @@ function loadEntries() {
 }
 
 /**
- * Save hidden Pokemon entries to localStorage
+ * Save hidden entries to localStorage
  * @param {HiddenEntry[]} entries
  */
 function saveEntries(entries) {
@@ -47,12 +47,12 @@ function cleanOldEntries(entries) {
 }
 
 /**
- * Add an entity ID to the hidden list with timestamp, cleaning old entries
+ * Add an entity ID to the hidden list with timestamp
  * @param {string | number} id
  * @returns {Set<string | number>} Updated hideList Set
  */
 export function addHiddenEntity(id) {
-  const entries = cleanOldEntries(loadEntries())
+  const entries = loadEntries()
   if (!entries.some((e) => e.id === id)) {
     entries.push({ id, ts: Date.now() })
   }
@@ -61,15 +61,28 @@ export function addHiddenEntity(id) {
 }
 
 /**
- * Get the current hidden entity Set from localStorage (cleaned)
+ * Get the current hidden entity Set from localStorage
  * @returns {Set<string | number>}
  */
 export function getHiddenEntitySet() {
-  const entries = cleanOldEntries(loadEntries())
-  saveEntries(entries) // persist cleaned list
+  const entries = loadEntries()
   return new Set(entries.map((e) => e.id))
 }
 
+/**
+ * Clean outdated hidden entries (older than 1 hour) from localStorage
+ * Updates both localStorage and the in-memory hideList
+ * @param {(state: { hideList: Set<string | number> }) => void} setState
+ */
+export function cleanupHiddenEntities(setState) {
+  const entries = loadEntries()
+  const cleaned = cleanOldEntries(entries)
+  if (cleaned.length !== entries.length) {
+    saveEntries(cleaned)
+    setState({ hideList: new Set(cleaned.map((e) => e.id)) })
+  }
+}
+
 /** @type {{ current: number | null }} */
 const snackbarTimer = { current: null }