Skip to content

Commit bc3adba

Browse files
TurtIeSocksTurtIeSocks
committed
fix: remove excludeList - no longer needed
1 parent d51408d commit bc3adba

12 files changed

Lines changed: 98 additions & 202 deletions

File tree

‎src/components/QueryData.jsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ function QueryData({ category, timeout }) {
141141
if (active) {
142142
timeout.current.setupTimeout(refetch)
143143
return () => {
144-
useMemory.setState((prev) => ({
145-
excludeList: prev.excludeList.length ? [] : prev.excludeList,
146-
}))
147144
timeout.current.off()
148145
}
149146
}

‎src/components/popups/Gym.jsx‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next'
1717
import { useSyncData } from '@components/layout/dialogs/webhooks/hooks'
1818
import { useMemory } from '@hooks/useMemory'
1919
import { useLayoutStore } from '@hooks/useLayoutStore'
20-
import { useStorage } from '@hooks/useStorage'
20+
import { setDeepStore, useStorage } from '@hooks/useStorage'
2121
import useWebhook from '@hooks/useWebhook'
2222
import Utility from '@services/Utility'
2323
import ErrorBoundary from '@components/ErrorBoundary'
@@ -193,22 +193,7 @@ const DropdownOptions = ({
193193

194194
const handleExclude = (key) => {
195195
handleClose()
196-
useStorage.setState((prev) => ({
197-
filters: {
198-
...prev.filters,
199-
gyms: {
200-
...prev.filters.gyms,
201-
filter: {
202-
...prev.filters.gyms.filter,
203-
[key]: {
204-
...prev.filters.gyms.filter[key],
205-
enabled: false,
206-
},
207-
},
208-
},
209-
},
210-
}))
211-
useMemory.setState((prev) => ({ excludeList: [...prev.excludeList, key] }))
196+
setDeepStore(`filters.gyms.filter.${key}.enabled`, false)
212197
}
213198

214199
const excludeTeam = () => handleExclude(`t${team_id}-0`)

‎src/components/popups/Nest.jsx‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next'
1515

1616
import { useMemory } from '@hooks/useMemory'
1717
import { useLayoutStore } from '@hooks/useLayoutStore'
18-
import { useStorage } from '@hooks/useStorage'
18+
import { setDeepStore } from '@hooks/useStorage'
1919
import Utility from '@services/Utility'
2020
import ErrorBoundary from '@components/ErrorBoundary'
2121
import NestSubmission from '@components/layout/dialogs/NestSubmission'
@@ -74,22 +74,7 @@ export default function NestPopup({
7474
const handleExclude = () => {
7575
setAnchorEl(null)
7676
const key = `${pokemon_id}-${pokemon_form}`
77-
useStorage.setState((prev) => ({
78-
filters: {
79-
...prev.filters,
80-
nests: {
81-
...prev.filters.nests,
82-
filter: {
83-
...prev.filters.nests.filter,
84-
[key]: {
85-
...prev.filters.nests.filter[key],
86-
enabled: false,
87-
},
88-
},
89-
},
90-
},
91-
}))
92-
useMemory.setState((prev) => ({ excludeList: [...prev.excludeList, key] }))
77+
setDeepStore(`filters.nests.filter.${key}.enabled`, false)
9378
}
9479

9580
const options = [

‎src/components/popups/Pokemon.jsx‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
import { useTranslation } from 'react-i18next'
2020

2121
import { useMemory } from '@hooks/useMemory'
22-
import { useStorage } from '@hooks/useStorage'
22+
import { setDeepStore, useStorage } from '@hooks/useStorage'
2323
import Utility from '@services/Utility'
2424
import ErrorBoundary from '@components/ErrorBoundary'
2525
import { TextWithIcon } from '@components/layout/general/Img'
@@ -187,26 +187,9 @@ const Header = ({
187187

188188
const handleExclude = () => {
189189
setAnchorEl(null)
190-
const key = `${pokemon_id}-${form}`
191190
if (filters?.pokemon?.filter) {
192-
useStorage.setState((prev) => ({
193-
filters: {
194-
...prev.filters,
195-
pokemon: {
196-
...prev.filters.pokemon,
197-
filter: {
198-
...prev.filters.pokemon.filter,
199-
[key]: {
200-
...prev.filters.pokemon.filter[key],
201-
enabled: false,
202-
},
203-
},
204-
},
205-
},
206-
}))
207-
useMemory.setState((prev) => ({
208-
excludeList: [...prev.excludeList, key],
209-
}))
191+
const key = `${pokemon_id}-${form}`
192+
setDeepStore(`filters.pokemon.filter.${key}.enabled`, false)
210193
}
211194
}
212195

‎src/components/popups/Pokestop.jsx‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { useTranslation, Trans } from 'react-i18next'
2020
import ErrorBoundary from '@components/ErrorBoundary'
2121
import { Check, Help } from '@components/layout/general/Icons'
2222
import { useMemory } from '@hooks/useMemory'
23-
import { useStorage } from '@hooks/useStorage'
23+
import { setDeepStore, useStorage } from '@hooks/useStorage'
2424
import Utility from '@services/Utility'
2525
import { getBadge } from '@services/functions/getBadge'
2626
import getRewardInfo from '@services/functions/getRewardInfo'
@@ -328,24 +328,8 @@ const MenuActions = ({
328328
useMemory.setState((prev) => ({ hideList: new Set(prev.hideList).add(id) }))
329329
}
330330

331-
const setState = (key) => {
332-
useStorage.setState((prev) => ({
333-
filters: {
334-
...prev.filters,
335-
pokestops: {
336-
...prev.filters.pokestops,
337-
filter: {
338-
...prev.filters.pokestops.filter,
339-
[key]: {
340-
...prev.filters.pokestops.filter[key],
341-
enabled: false,
342-
},
343-
},
344-
},
345-
},
346-
}))
347-
useMemory.setState((prev) => ({ excludeList: [...prev.excludeList, key] }))
348-
}
331+
const setState = (key) =>
332+
setDeepStore(`filters.pokestops.filter.${key}.enabled`, false)
349333

350334
const excludeLure = () => {
351335
setAnchorEl(null)

‎src/components/tiles/Gym.jsx‎

Lines changed: 54 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const GymTile = (gym) => {
4242
const [
4343
hasRaid,
4444
hasHatched,
45-
excludeTeam,
4645
inTimerList,
4746
interactionRangeZoom,
4847
gymIconUrl,
@@ -52,7 +51,7 @@ const GymTile = (gym) => {
5251
audio,
5352
] = useMemory((s) => {
5453
const newTs = Date.now() / 1000
55-
const { excludeList, timerList, config, Icons, Audio } = s
54+
const { timerList, config, Icons, Audio } = s
5655
const { filters, userSettings } = useStorage.getState()
5756

5857
const filledSlots =
@@ -65,18 +64,13 @@ const GymTile = (gym) => {
6564
const eggFilterId = `e${gym.raid_level}`
6665

6766
const hasRaidInternal =
68-
gym.raid_end_timestamp >= newTs &&
69-
gym.raid_level > 0 &&
70-
(gym.raid_battle_timestamp >= newTs
71-
? !excludeList.includes(eggFilterId)
72-
: !excludeList.includes(raidFilterId))
67+
gym.raid_end_timestamp >= newTs && gym.raid_level > 0
7368
const hasHatchedInternal =
7469
gym.raid_end_timestamp >= newTs && gym.raid_battle_timestamp <= newTs
7570

7671
return [
7772
hasRaidInternal,
7873
hasHatchedInternal,
79-
excludeList.includes(`t${gym.team_id}-0`),
8074
timerList.includes(gym.id),
8175
config.general.interactionRangeZoom,
8276
Icons.getGyms(
@@ -172,60 +166,58 @@ const GymTile = (gym) => {
172166
})
173167
}
174168
return (
175-
!excludeTeam && (
176-
<Marker
177-
ref={setMarkerRef}
178-
position={[gym.lat, gym.lon]}
179-
icon={gymMarker({
180-
showDiamond,
181-
showExBadge,
182-
showArBadge,
183-
showRaidLevel,
184-
opacity,
185-
gymIconUrl,
186-
gymIconSize,
187-
raidIconUrl,
188-
raidIconSize,
189-
...gym,
190-
})}
191-
>
192-
<Popup position={[gym.lat, gym.lon]}>
193-
<PopupContent
194-
hasRaid={hasRaid}
195-
hasHatched={hasHatched}
196-
raidIconUrl={raidIconUrl}
197-
{...gym}
198-
/>
199-
</Popup>
200-
{showTimer && (
201-
<ToolTipWrapper timers={[timerToDisplay]} offset={[0, 5]} />
202-
)}
203-
{showInteractionRange && (
204-
<Circle
205-
center={[gym.lat, gym.lon]}
206-
radius={80}
207-
color={getColor(gym.team_id)}
208-
weight={0.5}
209-
/>
210-
)}
211-
{show300mCircles && (
212-
<Circle
213-
center={[gym.lat, gym.lon]}
214-
radius={300}
215-
color={getColor(gym.team_id)}
216-
weight={0.5}
217-
/>
218-
)}
219-
{!!customRange && (
220-
<Circle
221-
center={[gym.lat, gym.lon]}
222-
radius={customRange}
223-
color={getColor(gym.team_id)}
224-
weight={0.5}
225-
/>
226-
)}
227-
</Marker>
228-
)
169+
<Marker
170+
ref={setMarkerRef}
171+
position={[gym.lat, gym.lon]}
172+
icon={gymMarker({
173+
showDiamond,
174+
showExBadge,
175+
showArBadge,
176+
showRaidLevel,
177+
opacity,
178+
gymIconUrl,
179+
gymIconSize,
180+
raidIconUrl,
181+
raidIconSize,
182+
...gym,
183+
})}
184+
>
185+
<Popup position={[gym.lat, gym.lon]}>
186+
<PopupContent
187+
hasRaid={hasRaid}
188+
hasHatched={hasHatched}
189+
raidIconUrl={raidIconUrl}
190+
{...gym}
191+
/>
192+
</Popup>
193+
{showTimer && (
194+
<ToolTipWrapper timers={[timerToDisplay]} offset={[0, 5]} />
195+
)}
196+
{showInteractionRange && (
197+
<Circle
198+
center={[gym.lat, gym.lon]}
199+
radius={80}
200+
color={getColor(gym.team_id)}
201+
weight={0.5}
202+
/>
203+
)}
204+
{show300mCircles && (
205+
<Circle
206+
center={[gym.lat, gym.lon]}
207+
radius={300}
208+
color={getColor(gym.team_id)}
209+
weight={0.5}
210+
/>
211+
)}
212+
{!!customRange && (
213+
<Circle
214+
center={[gym.lat, gym.lon]}
215+
radius={customRange}
216+
color={getColor(gym.team_id)}
217+
weight={0.5}
218+
/>
219+
)}
220+
</Marker>
229221
)
230222
}
231223

‎src/components/tiles/Nest.jsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ const NestTile = (nest) => {
2222
const size = useStorage(
2323
(s) => s.filters.nests.filter[internalId]?.size || 'md',
2424
)
25-
const [excluded, iconUrl, iconSize] = useMemory((s) => {
26-
const { Icons, excludeList } = s
25+
const [iconUrl, iconSize] = useMemory((s) => {
26+
const { Icons } = s
2727
return [
28-
excludeList.includes(internalId),
2928
Icons.getPokemon(nest.pokemon_id, nest.pokemon_form),
3029
Icons.getSize('nest', size),
3130
]
@@ -42,9 +41,6 @@ const NestTile = (nest) => {
4241
}),
4342
[iconUrl, iconSize, nest.pokemon_id, recent],
4443
)
45-
if (excluded) {
46-
return null
47-
}
4844

4945
return (
5046
<>

0 commit comments

Comments
 (0)