fix: remove excludeList - no longer needed

WatWowMap · Jan 18, 2024 · bc3adba · bc3adba
1 parent d51408d
commit bc3adba
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 202 deletions.
diff --git a/src/components/QueryData.jsx b/src/components/QueryData.jsx
@@ -141,9 +141,6 @@ function QueryData({ category, timeout }) {
     if (active) {
       timeout.current.setupTimeout(refetch)
       return () => {
-        useMemory.setState((prev) => ({
-          excludeList: prev.excludeList.length ? [] : prev.excludeList,
-        }))
         timeout.current.off()
       }
     }

diff --git a/src/components/popups/Gym.jsx b/src/components/popups/Gym.jsx
@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next'
 import { useSyncData } from '@components/layout/dialogs/webhooks/hooks'
 import { useMemory } from '@hooks/useMemory'
 import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
+import { setDeepStore, useStorage } from '@hooks/useStorage'
 import useWebhook from '@hooks/useWebhook'
 import Utility from '@services/Utility'
 import ErrorBoundary from '@components/ErrorBoundary'
@@ -193,22 +193,7 @@ const DropdownOptions = ({
 
   const handleExclude = (key) => {
     handleClose()
-    useStorage.setState((prev) => ({
-      filters: {
-        ...prev.filters,
-        gyms: {
-          ...prev.filters.gyms,
-          filter: {
-            ...prev.filters.gyms.filter,
-            [key]: {
-              ...prev.filters.gyms.filter[key],
-              enabled: false,
-            },
-          },
-        },
-      },
-    }))
-    useMemory.setState((prev) => ({ excludeList: [...prev.excludeList, key] }))
+    setDeepStore(`filters.gyms.filter.${key}.enabled`, false)
   }
 
   const excludeTeam = () => handleExclude(`t${team_id}-0`)

diff --git a/src/components/popups/Nest.jsx b/src/components/popups/Nest.jsx
@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next'
 
 import { useMemory } from '@hooks/useMemory'
 import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
+import { setDeepStore } from '@hooks/useStorage'
 import Utility from '@services/Utility'
 import ErrorBoundary from '@components/ErrorBoundary'
 import NestSubmission from '@components/layout/dialogs/NestSubmission'
@@ -74,22 +74,7 @@ export default function NestPopup({
   const handleExclude = () => {
     setAnchorEl(null)
     const key = `${pokemon_id}-${pokemon_form}`
-    useStorage.setState((prev) => ({
-      filters: {
-        ...prev.filters,
-        nests: {
-          ...prev.filters.nests,
-          filter: {
-            ...prev.filters.nests.filter,
-            [key]: {
-              ...prev.filters.nests.filter[key],
-              enabled: false,
-            },
-          },
-        },
-      },
-    }))
-    useMemory.setState((prev) => ({ excludeList: [...prev.excludeList, key] }))
+    setDeepStore(`filters.nests.filter.${key}.enabled`, false)
   }
 
   const options = [

diff --git a/src/components/popups/Pokemon.jsx b/src/components/popups/Pokemon.jsx
@@ -19,7 +19,7 @@ import {
 import { useTranslation } from 'react-i18next'
 
 import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { setDeepStore, useStorage } from '@hooks/useStorage'
 import Utility from '@services/Utility'
 import ErrorBoundary from '@components/ErrorBoundary'
 import { TextWithIcon } from '@components/layout/general/Img'
@@ -187,26 +187,9 @@ const Header = ({
 
   const handleExclude = () => {
     setAnchorEl(null)
-    const key = `${pokemon_id}-${form}`
     if (filters?.pokemon?.filter) {
-      useStorage.setState((prev) => ({
-        filters: {
-          ...prev.filters,
-          pokemon: {
-            ...prev.filters.pokemon,
-            filter: {
-              ...prev.filters.pokemon.filter,
-              [key]: {
-                ...prev.filters.pokemon.filter[key],
-                enabled: false,
-              },
-            },
-          },
-        },
-      }))
-      useMemory.setState((prev) => ({
-        excludeList: [...prev.excludeList, key],
-      }))
+      const key = `${pokemon_id}-${form}`
+      setDeepStore(`filters.pokemon.filter.${key}.enabled`, false)
     }
   }
 

diff --git a/src/components/popups/Pokestop.jsx b/src/components/popups/Pokestop.jsx
@@ -20,7 +20,7 @@ import { useTranslation, Trans } from 'react-i18next'
 import ErrorBoundary from '@components/ErrorBoundary'
 import { Check, Help } from '@components/layout/general/Icons'
 import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { setDeepStore, useStorage } from '@hooks/useStorage'
 import Utility from '@services/Utility'
 import { getBadge } from '@services/functions/getBadge'
 import getRewardInfo from '@services/functions/getRewardInfo'
@@ -328,24 +328,8 @@ const MenuActions = ({
     useMemory.setState((prev) => ({ hideList: new Set(prev.hideList).add(id) }))
   }
 
-  const setState = (key) => {
-    useStorage.setState((prev) => ({
-      filters: {
-        ...prev.filters,
-        pokestops: {
-          ...prev.filters.pokestops,
-          filter: {
-            ...prev.filters.pokestops.filter,
-            [key]: {
-              ...prev.filters.pokestops.filter[key],
-              enabled: false,
-            },
-          },
-        },
-      },
-    }))
-    useMemory.setState((prev) => ({ excludeList: [...prev.excludeList, key] }))
-  }
+  const setState = (key) =>
+    setDeepStore(`filters.pokestops.filter.${key}.enabled`, false)
 
   const excludeLure = () => {
     setAnchorEl(null)

diff --git a/src/components/tiles/Gym.jsx b/src/components/tiles/Gym.jsx
@@ -42,7 +42,6 @@ const GymTile = (gym) => {
   const [
     hasRaid,
     hasHatched,
-    excludeTeam,
     inTimerList,
     interactionRangeZoom,
     gymIconUrl,
@@ -52,7 +51,7 @@ const GymTile = (gym) => {
     audio,
   ] = useMemory((s) => {
     const newTs = Date.now() / 1000
-    const { excludeList, timerList, config, Icons, Audio } = s
+    const { timerList, config, Icons, Audio } = s
     const { filters, userSettings } = useStorage.getState()
 
     const filledSlots =
@@ -65,18 +64,13 @@ const GymTile = (gym) => {
     const eggFilterId = `e${gym.raid_level}`
 
     const hasRaidInternal =
-      gym.raid_end_timestamp >= newTs &&
-      gym.raid_level > 0 &&
-      (gym.raid_battle_timestamp >= newTs
-        ? !excludeList.includes(eggFilterId)
-        : !excludeList.includes(raidFilterId))
+      gym.raid_end_timestamp >= newTs && gym.raid_level > 0
     const hasHatchedInternal =
       gym.raid_end_timestamp >= newTs && gym.raid_battle_timestamp <= newTs
 
     return [
       hasRaidInternal,
       hasHatchedInternal,
-      excludeList.includes(`t${gym.team_id}-0`),
       timerList.includes(gym.id),
       config.general.interactionRangeZoom,
       Icons.getGyms(
@@ -172,60 +166,58 @@ const GymTile = (gym) => {
     })
   }
   return (
-    !excludeTeam && (
-      <Marker
-        ref={setMarkerRef}
-        position={[gym.lat, gym.lon]}
-        icon={gymMarker({
-          showDiamond,
-          showExBadge,
-          showArBadge,
-          showRaidLevel,
-          opacity,
-          gymIconUrl,
-          gymIconSize,
-          raidIconUrl,
-          raidIconSize,
-          ...gym,
-        })}
-      >
-        <Popup position={[gym.lat, gym.lon]}>
-          <PopupContent
-            hasRaid={hasRaid}
-            hasHatched={hasHatched}
-            raidIconUrl={raidIconUrl}
-            {...gym}
-          />
-        </Popup>
-        {showTimer && (
-          <ToolTipWrapper timers={[timerToDisplay]} offset={[0, 5]} />
-        )}
-        {showInteractionRange && (
-          <Circle
-            center={[gym.lat, gym.lon]}
-            radius={80}
-            color={getColor(gym.team_id)}
-            weight={0.5}
-          />
-        )}
-        {show300mCircles && (
-          <Circle
-            center={[gym.lat, gym.lon]}
-            radius={300}
-            color={getColor(gym.team_id)}
-            weight={0.5}
-          />
-        )}
-        {!!customRange && (
-          <Circle
-            center={[gym.lat, gym.lon]}
-            radius={customRange}
-            color={getColor(gym.team_id)}
-            weight={0.5}
-          />
-        )}
-      </Marker>
-    )
+    <Marker
+      ref={setMarkerRef}
+      position={[gym.lat, gym.lon]}
+      icon={gymMarker({
+        showDiamond,
+        showExBadge,
+        showArBadge,
+        showRaidLevel,
+        opacity,
+        gymIconUrl,
+        gymIconSize,
+        raidIconUrl,
+        raidIconSize,
+        ...gym,
+      })}
+    >
+      <Popup position={[gym.lat, gym.lon]}>
+        <PopupContent
+          hasRaid={hasRaid}
+          hasHatched={hasHatched}
+          raidIconUrl={raidIconUrl}
+          {...gym}
+        />
+      </Popup>
+      {showTimer && (
+        <ToolTipWrapper timers={[timerToDisplay]} offset={[0, 5]} />
+      )}
+      {showInteractionRange && (
+        <Circle
+          center={[gym.lat, gym.lon]}
+          radius={80}
+          color={getColor(gym.team_id)}
+          weight={0.5}
+        />
+      )}
+      {show300mCircles && (
+        <Circle
+          center={[gym.lat, gym.lon]}
+          radius={300}
+          color={getColor(gym.team_id)}
+          weight={0.5}
+        />
+      )}
+      {!!customRange && (
+        <Circle
+          center={[gym.lat, gym.lon]}
+          radius={customRange}
+          color={getColor(gym.team_id)}
+          weight={0.5}
+        />
+      )}
+    </Marker>
   )
 }
 

diff --git a/src/components/tiles/Nest.jsx b/src/components/tiles/Nest.jsx
@@ -22,10 +22,9 @@ const NestTile = (nest) => {
   const size = useStorage(
     (s) => s.filters.nests.filter[internalId]?.size || 'md',
   )
-  const [excluded, iconUrl, iconSize] = useMemory((s) => {
-    const { Icons, excludeList } = s
+  const [iconUrl, iconSize] = useMemory((s) => {
+    const { Icons } = s
     return [
-      excludeList.includes(internalId),
       Icons.getPokemon(nest.pokemon_id, nest.pokemon_form),
       Icons.getSize('nest', size),
     ]
@@ -42,9 +41,6 @@ const NestTile = (nest) => {
       }),
     [iconUrl, iconSize, nest.pokemon_id, recent],
   )
-  if (excluded) {
-    return null
-  }
 
   return (
     <>