{
+ invasions.forEach((invasion) => {
filterId = `i${invasion.grunt_type}`
invasionIcons.unshift(Icons.getInvasions(invasion.grunt_type))
invasionSizes.unshift(Icons.getSize('invasion', filters.filter[filterId]))
@@ -41,7 +53,7 @@ export default function stopMarker(pokestop, hasQuest, hasLure, hasInvasion, fil
if (hasQuest && !(hasInvasion && invasionMod?.removeQuest)) {
const { quests } = pokestop
- quests.forEach(quest => {
+ quests.forEach((quest) => {
const {
quest_item_id,
item_amount,
@@ -63,33 +75,62 @@ export default function stopMarker(pokestop, hasQuest, hasLure, hasInvasion, fil
switch (quest_reward_type) {
case 2:
questIcons.unshift({
- url: Icons.getRewards(quest_reward_type, quest_item_id, item_amount),
+ url: Icons.getRewards(
+ quest_reward_type,
+ quest_item_id,
+ item_amount,
+ ),
amount: item_amount > 1 && item_amount,
- }); break
+ })
+ break
case 3:
questIcons.unshift({
url: Icons.getRewards(quest_reward_type, stardust_amount),
amount: stardust_amount,
- }); break
+ })
+ break
case 4:
questIcons.unshift({
- url: Icons.getRewards(quest_reward_type, candy_pokemon_id, candy_amount),
+ url: Icons.getRewards(
+ quest_reward_type,
+ candy_pokemon_id,
+ candy_amount,
+ ),
amount: candy_amount,
- }); break
+ })
+ break
case 7:
questIcons.unshift({
- url: Icons.getPokemon(quest_pokemon_id, quest_form_id, 0, quest_gender_id, quest_costume_id, quest_shiny),
- }); break
+ url: Icons.getPokemon(
+ quest_pokemon_id,
+ quest_form_id,
+ 0,
+ quest_gender_id,
+ quest_costume_id,
+ quest_shiny,
+ ),
+ })
+ break
case 9:
questIcons.unshift({
- url: Icons.getRewards(quest_reward_type, xl_candy_pokemon_id, xl_candy_amount),
+ url: Icons.getRewards(
+ quest_reward_type,
+ xl_candy_pokemon_id,
+ xl_candy_amount,
+ ),
amount: xl_candy_amount,
- }); break
+ })
+ break
case 12:
questIcons.unshift({
- url: Icons.getRewards(quest_reward_type, mega_pokemon_id, mega_amount),
+ url: Icons.getRewards(
+ quest_reward_type,
+ mega_pokemon_id,
+ mega_amount,
+ ),
amount: mega_amount,
- }); break
+ })
+ break
default:
questIcons.unshift({ url: Icons.getRewards(quest_reward_type) })
}
@@ -116,7 +157,11 @@ export default function stopMarker(pokestop, hasQuest, hasLure, hasInvasion, fil
transform: 'translateX(-50%)',
}}
/>
- {Boolean(userSettings.showArBadge && ar_scan_eligible && !baseIcon.includes('_ar')) && (
+ {Boolean(
+ userSettings.showArBadge &&
+ ar_scan_eligible &&
+ !baseIcon.includes('_ar'),
+ ) && (
})
- {Boolean(icon.url.includes('stardust') ? !icon.url.endsWith('0.png') : !icon.url.includes('_a') && icon.amount)
- && (
-
- x{icon.amount}
-
- )}
+ {Boolean(
+ icon.url.includes('stardust')
+ ? !icon.url.endsWith('0.png')
+ : !icon.url.includes('_a') && icon.amount,
+ ) && (
+
+ x{icon.amount}
+
+ )}
))}
{invasionIcons.map((icon, i) => (
@@ -169,8 +221,7 @@ export default function stopMarker(pokestop, hasQuest, hasLure, hasInvasion, fil
style={{
width: invasionSizes[i],
height: invasionSizes[i],
- bottom: baseSize * 0.5 * invasionMod.offsetY
- + (invasionSizes[i] * i),
+ bottom: baseSize * 0.5 * invasionMod.offsetY + invasionSizes[i] * i,
left: `${invasionMod.offsetX * 50}%`,
transform: 'translateX(-50%)',
}}
@@ -180,9 +231,15 @@ export default function stopMarker(pokestop, hasQuest, hasLure, hasInvasion, fil
)
return L.divIcon({
- popupAnchor: [popupX - 5, (pokestopMod.manualPopup
- ? pokestopMod.manualPopup - totalInvasionSize * 0.25 - totalQuestSize * 0.1
- : -(baseSize + totalInvasionSize + totalQuestSize) / popupYOffset) + popupY],
+ popupAnchor: [
+ popupX - 5,
+ (pokestopMod.manualPopup
+ ? pokestopMod.manualPopup -
+ totalInvasionSize * 0.25 -
+ totalQuestSize * 0.1
+ : -(baseSize + totalInvasionSize + totalQuestSize) / popupYOffset) +
+ popupY,
+ ],
className: 'pokestop-marker',
html: renderToString(ReactIcon),
})
diff --git a/src/components/markers/portal.js b/src/components/markers/portal.js
index 26a15559b..d0000e44f 100644
--- a/src/components/markers/portal.js
+++ b/src/components/markers/portal.js
@@ -1,7 +1,9 @@
export default function portalMarker(portal, ts, settings) {
return {
- color: ts - portal.imported > 86400 ? settings.oldPortals : settings.newPortals,
- fillColor: ts - portal.imported > 86400 ? settings.oldPortals : settings.newPortals,
+ color:
+ ts - portal.imported > 86400 ? settings.oldPortals : settings.newPortals,
+ fillColor:
+ ts - portal.imported > 86400 ? settings.oldPortals : settings.newPortals,
fillOpacity: 0.25,
}
}
diff --git a/src/components/markers/s2cell.js b/src/components/markers/s2cell.js
index dd383d382..bb8395ad2 100644
--- a/src/components/markers/s2cell.js
+++ b/src/components/markers/s2cell.js
@@ -1,5 +1,5 @@
export default function s2cellMarker(cellUpdated) {
- const ago = (new Date()).getTime() - (cellUpdated * 1000)
+ const ago = new Date().getTime() - cellUpdated * 1000
const value = ago <= 150000 ? 0 : Math.min((ago - 150000) / 750000, 1)
const hue = ((1 - value) * 120).toString(10)
diff --git a/src/components/markers/typeCell.js b/src/components/markers/typeCell.js
index f05eacc8c..51a08aa7a 100644
--- a/src/components/markers/typeCell.js
+++ b/src/components/markers/typeCell.js
@@ -1,20 +1,40 @@
export default function typeStyle(cell, tileStyle, userSettings) {
- const color = tileStyle === 'dark' ? userSettings.darkMapBorder : userSettings.lightMapBorder
- if ((cell.count === 1 && cell.count_gyms < 1)
- || (cell.count === 5 && cell.count_gyms < 2)
- || (cell.count === 19 && cell.count_gyms < 3)) {
+ const color =
+ tileStyle === 'dark'
+ ? userSettings.darkMapBorder
+ : userSettings.lightMapBorder
+ if (
+ (cell.count === 1 && cell.count_gyms < 1) ||
+ (cell.count === 5 && cell.count_gyms < 2) ||
+ (cell.count === 19 && cell.count_gyms < 3)
+ ) {
return {
- fillColor: userSettings.oneStopTillNext, color, opacity: 0.75, fillOpacity: 0.5, weight: 0.75,
+ fillColor: userSettings.oneStopTillNext,
+ color,
+ opacity: 0.75,
+ fillOpacity: 0.5,
+ weight: 0.75,
}
}
- if ((cell.count === 4 && cell.count_gyms < 2) || (cell.count === 18 && cell.count_gyms < 3)) {
+ if (
+ (cell.count === 4 && cell.count_gyms < 2) ||
+ (cell.count === 18 && cell.count_gyms < 3)
+ ) {
return {
- fillColor: userSettings.twoStopsTillNext, color, opacity: 0.75, fillOpacity: 0.5, weight: 0.75,
+ fillColor: userSettings.twoStopsTillNext,
+ color,
+ opacity: 0.75,
+ fillOpacity: 0.5,
+ weight: 0.75,
}
}
if (cell.count >= 20) {
return {
- fillColor: userSettings.noMoreGyms, color, opacity: 0.75, fillOpacity: 0.25, weight: 0.8,
+ fillColor: userSettings.noMoreGyms,
+ color,
+ opacity: 0.75,
+ fillOpacity: 0.25,
+ weight: 0.8,
}
}
return { color, opacity: 0.75, fillOpacity: 0.0, weight: 0.8 }
diff --git a/src/components/markers/weather.jsx b/src/components/markers/weather.jsx
index fe1906157..140d53944 100644
--- a/src/components/markers/weather.jsx
+++ b/src/components/markers/weather.jsx
@@ -3,7 +3,14 @@ import { renderToString } from 'react-dom/server'
import L from 'leaflet'
export default function weatherMarker(weather, Icons, isNight) {
- const { offsetX, offsetY, popupX, popupY, sizeMultiplier, disableColorShift = false } = Icons.getModifiers('weather')
+ const {
+ offsetX,
+ offsetY,
+ popupX,
+ popupY,
+ sizeMultiplier,
+ disableColorShift = false,
+ } = Icons.getModifiers('weather')
return L.divIcon({
iconAnchor: [17 * offsetX, 17 * offsetY],
diff --git a/src/components/popups/Device.jsx b/src/components/popups/Device.jsx
index e5dac4f5a..c1807f9e5 100644
--- a/src/components/popups/Device.jsx
+++ b/src/components/popups/Device.jsx
@@ -45,7 +45,8 @@ const Timer = ({ device, t, ts }) => {
return (
- {t('last_seen')}: {Utility.dayCheck(ts, last_seen)} ({since.str.replace('days', t('days')).replace('day', t('day'))})
+ {t('last_seen')}: {Utility.dayCheck(ts, last_seen)} (
+ {since.str.replace('days', t('days')).replace('day', t('day'))})
)
}
diff --git a/src/components/popups/DevicePoly.jsx b/src/components/popups/DevicePoly.jsx
index 01ed77af1..b3476d4fd 100644
--- a/src/components/popups/DevicePoly.jsx
+++ b/src/components/popups/DevicePoly.jsx
@@ -11,10 +11,7 @@ const DevicePoly = ({ device, color }) => {
if (device.type === 'leveling') {
return (
<>
-
+
{
if (Array.isArray(arrayRoute)) {
return device?.type?.includes('circle')
? arrayRoute.map((polygon, i) => (
- [route.lat, route.lon])}
- pathOptions={{ color }}
- />
- ))
+ [route.lat, route.lon])}
+ pathOptions={{ color }}
+ />
+ ))
: arrayRoute.map((polygon, i) => (
- [route.lat, route.lon])}
- pathOptions={{ color }}
- />
- ))
+ [route.lat, route.lon])}
+ pathOptions={{ color }}
+ />
+ ))
}
return null
}
-const areEqual = (prev, next) => (
- prev.device.type === next.device.type
- && prev.color === next.color
-)
+const areEqual = (prev, next) =>
+ prev.device.type === next.device.type && prev.color === next.color
export default memo(DevicePoly, areEqual)
diff --git a/src/components/popups/Gym.jsx b/src/components/popups/Gym.jsx
index ce291e448..1fce5616a 100644
--- a/src/components/popups/Gym.jsx
+++ b/src/components/popups/Gym.jsx
@@ -1,8 +1,12 @@
-import React, {
- Fragment, useState, useEffect,
-} from 'react'
+import React, { Fragment, useState, useEffect } from 'react'
import {
- Grid, Typography, Icon, Collapse, IconButton, Divider, Dialog,
+ Grid,
+ Typography,
+ Icon,
+ Collapse,
+ IconButton,
+ Divider,
+ Dialog,
} from '@material-ui/core'
import { ExpandMore, Map, MoreVert } from '@material-ui/icons'
import { useTranslation, Trans } from 'react-i18next'
@@ -19,15 +23,25 @@ import BadgeSelection from '../layout/dialogs/BadgeSelection'
import PowerUp from './common/PowerUp'
export default function GymPopup({
- gym, hasRaid, ts, Icons, hasHatched, badge, setBadge,
+ gym,
+ hasRaid,
+ ts,
+ Icons,
+ hasHatched,
+ badge,
+ setBadge,
}) {
const { t } = useTranslation()
- const { perms } = useStatic(state => state.auth)
- const popups = useStore(state => state.popups)
- const setPopups = useStore(state => state.setPopups)
+ const { perms } = useStatic((state) => state.auth)
+ const popups = useStore((state) => state.popups)
+ const setPopups = useStore((state) => state.setPopups)
useEffect(() => {
- Utility.analytics('Popup', `Team ID: ${gym.team_id} Has Raid: ${hasRaid}`, 'Gym')
+ Utility.analytics(
+ 'Popup',
+ `Team ID: ${gym.team_id} Has Raid: ${hasRaid}`,
+ 'Gym',
+ )
}, [])
return (
@@ -40,10 +54,7 @@ export default function GymPopup({
spacing={1}
>
-
+
-
+
-
+
@@ -85,16 +89,12 @@ export default function GymPopup({
justifyContent="center"
spacing={1}
>
-
+
- {Boolean(gym.raid_pokemon_id && gym.raid_battle_timestamp >= ts)
- && }
+ {Boolean(
+ gym.raid_pokemon_id && gym.raid_battle_timestamp >= ts,
+ ) && }
@@ -119,28 +119,31 @@ export default function GymPopup({
)
}
-const MenuActions = ({
- gym, perms, hasRaid, t, badge, setBadge,
-}) => {
- const hideList = useStatic(state => state.hideList)
- const setHideList = useStatic(state => state.setHideList)
- const excludeList = useStatic(state => state.excludeList)
- const setExcludeList = useStatic(state => state.setExcludeList)
- const timerList = useStatic(state => state.timerList)
- const setTimerList = useStatic(state => state.setTimerList)
- const { gymValidDataLimit } = useStatic(state => state.config)
+const MenuActions = ({ gym, perms, hasRaid, t, badge, setBadge }) => {
+ const hideList = useStatic((state) => state.hideList)
+ const setHideList = useStatic((state) => state.setHideList)
+ const excludeList = useStatic((state) => state.excludeList)
+ const setExcludeList = useStatic((state) => state.setExcludeList)
+ const timerList = useStatic((state) => state.timerList)
+ const setTimerList = useStatic((state) => state.setTimerList)
+ const { gymValidDataLimit } = useStatic((state) => state.config)
- const selectedWebhook = useStore(state => state.selectedWebhook)
+ const selectedWebhook = useStore((state) => state.selectedWebhook)
- const filters = useStore(state => state.filters)
- const setFilters = useStore(state => state.setFilters)
+ const filters = useStore((state) => state.filters)
+ const setFilters = useStore((state) => state.setFilters)
const [anchorEl, setAnchorEl] = useState(false)
const [badgeMenu, setBadgeMenu] = useState(false)
const addWebhook = useWebhook({ category: 'quickGym', selectedWebhook })
const {
- id, team_id, raid_pokemon_id, raid_pokemon_form, raid_level, updated,
+ id,
+ team_id,
+ raid_pokemon_id,
+ raid_pokemon_form,
+ raid_level,
+ updated,
} = gym
const handleClick = (event) => {
@@ -205,22 +208,23 @@ const MenuActions = ({
const handleTimer = () => {
setAnchorEl(null)
if (timerList.includes(id)) {
- setTimerList(timerList.filter(x => x !== id))
+ setTimerList(timerList.filter((x) => x !== id))
} else {
setTimerList([...timerList, id])
}
}
- const options = [
- { name: 'hide', action: handleHide },
- ]
+ const options = [{ name: 'hide', action: handleHide }]
if (perms.gyms) {
if (updated > gymValidDataLimit) {
options.push({ name: 'exclude_team', action: excludeTeam })
}
if (perms.gymBadges && filters.gyms?.gymBadges) {
- options.push({ name: 'gym_badge_menu', action: () => handleCloseBadge(true) })
+ options.push({
+ name: 'gym_badge_menu',
+ action: () => handleCloseBadge(true),
+ })
}
}
if (perms.raids && hasRaid) {
@@ -229,11 +233,12 @@ const MenuActions = ({
{ name: 'timer', action: handleTimer },
)
}
- perms.webhooks.forEach(hook => {
+ perms.webhooks.forEach((hook) => {
options.push({
name: (
- {{ category: t('gym') }}{{ name: hook }}
+ {{ category: t('gym') }}
+ {{ name: hook }}
),
action: () => addWebhook(gym),
@@ -243,10 +248,7 @@ const MenuActions = ({
return (
-
+
{
const { url, team_id, name } = gym
- const src = url
- ? url.replace('http://', 'https://')
- : Icons.getTeams(team_id)
+ const src = url ? url.replace('http://', 'https://') : Icons.getTeams(team_id)
return (
-
+
{
)
}
-const RaidImage = ({
- gym, ts, Icons, t,
-}) => {
+const RaidImage = ({ gym, ts, Icons, t }) => {
const {
- raid_level, raid_pokemon_id, raid_pokemon_form, raid_pokemon_gender, raid_pokemon_costume, raid_pokemon_evolution,
- raid_battle_timestamp, raid_is_exclusive,
+ raid_level,
+ raid_pokemon_id,
+ raid_pokemon_form,
+ raid_pokemon_gender,
+ raid_pokemon_costume,
+ raid_pokemon_evolution,
+ raid_battle_timestamp,
+ raid_is_exclusive,
} = gym
- const { pokemon } = useStatic(state => state.masterfile)
+ const { pokemon } = useStatic((state) => state.masterfile)
const src = raid_pokemon_id
? Icons.getPokemon(
- raid_pokemon_id,
- raid_pokemon_form,
- raid_pokemon_evolution,
- raid_pokemon_gender,
- raid_pokemon_costume,
- )
+ raid_pokemon_id,
+ raid_pokemon_form,
+ raid_pokemon_evolution,
+ raid_pokemon_gender,
+ raid_pokemon_costume,
+ )
: Icons.getEggs(raid_level, raid_battle_timestamp < ts, raid_is_exclusive)
const getRaidTypes = (id, form) => {
@@ -317,13 +318,7 @@ const RaidImage = ({
}
return (
-
+
- {(raid_pokemon_id > 0) && getRaidTypes(raid_pokemon_id, raid_pokemon_form).map(type => (
-
- ))}
- {(raid_pokemon_id > 0 && raid_pokemon_gender != 3) && (
+ {raid_pokemon_id > 0 &&
+ getRaidTypes(raid_pokemon_id, raid_pokemon_form).map((type) => (
+
+ ))}
+ {raid_pokemon_id > 0 && raid_pokemon_gender != 3 && (
{raid_pokemon_gender === 1 ? 'male' : 'female'}
@@ -369,9 +365,13 @@ const RaidImage = ({
const GymInfo = ({ gym, t, Icons }) => {
const {
- team_id, available_slots, ex_raid_eligible, ar_scan_eligible, updated,
+ team_id,
+ available_slots,
+ ex_raid_eligible,
+ ar_scan_eligible,
+ updated,
} = gym
- const { gymValidDataLimit } = useStatic(state => state.config)
+ const { gymValidDataLimit } = useStatic((state) => state.config)
return (
{
justifyContent="space-around"
alignItems="center"
>
- {(updated > gymValidDataLimit) && (
-
-
- {t(`team_${team_id}`)}
-
- && (
+ {updated > gymValidDataLimit && (
+
+
+ {t(`team_${team_id}`)}
+
+
+ ) && (
{available_slots} {t('slots')}
- )
- )}
+ )}
{ex_raid_eligible && (
{
)
}
-const RaidInfo = ({
- gym, t, Icons,
-}) => {
- const { moves, pokemon } = useStatic(state => state.masterfile)
+const RaidInfo = ({ gym, t, Icons }) => {
+ const { moves, pokemon } = useStatic((state) => state.masterfile)
const {
- raid_level, raid_pokemon_id, raid_pokemon_form, raid_pokemon_move_1, raid_pokemon_move_2,
+ raid_level,
+ raid_pokemon_id,
+ raid_pokemon_form,
+ raid_pokemon_move_1,
+ raid_pokemon_move_2,
raid_pokemon_evolution,
} = gym
if (!raid_pokemon_id) {
- return (
-
- )
+ return
}
const getRaidName = (raidLevel, id) => {
@@ -471,7 +471,11 @@ const RaidInfo = ({
- {getRaidForm(raid_pokemon_id, raid_pokemon_form, raid_pokemon_evolution)}
+ {getRaidForm(
+ raid_pokemon_id,
+ raid_pokemon_form,
+ raid_pokemon_evolution,
+ )}
{raid_pokemon_move_1 && raid_pokemon_move_1 !== 1 && (
@@ -483,7 +487,9 @@ const RaidInfo = ({
textAlign: 'center',
height: 15,
width: 15,
- backgroundImage: `url(${Icons.getTypes(moves[raid_pokemon_move_1].type)})`,
+ backgroundImage: `url(${Icons.getTypes(
+ moves[raid_pokemon_move_1].type,
+ )})`,
}}
/>
)}
@@ -492,7 +498,7 @@ const RaidInfo = ({
{t(`move_${raid_pokemon_move_1}`)}
- {(raid_pokemon_move_2 && raid_pokemon_move_2 !== 2) && (
+ {raid_pokemon_move_2 && raid_pokemon_move_2 !== 2 && (
)}
@@ -514,13 +522,13 @@ const RaidInfo = ({
)
}
-const Timer = ({
- gym, start, t, hasHatched,
-}) => {
- const target = (start ? gym.raid_battle_timestamp : gym.raid_end_timestamp) * 1000
- const update = () => start || hasHatched || gym.raid_pokemon_id
- ? Utility.getTimeUntil(target, true)
- : Utility.formatInterval(target - gym.raid_battle_timestamp * 1000)
+const Timer = ({ gym, start, t, hasHatched }) => {
+ const target =
+ (start ? gym.raid_battle_timestamp : gym.raid_end_timestamp) * 1000
+ const update = () =>
+ start || hasHatched || gym.raid_pokemon_id
+ ? Utility.getTimeUntil(target, true)
+ : Utility.formatInterval(target - gym.raid_battle_timestamp * 1000)
const [display, setDisplay] = useState(update)
useEffect(() => {
@@ -529,9 +537,16 @@ const Timer = ({
})
return target ? (
-
+
- {t(start ? 'starts' : 'ends')}: {new Date(target).toLocaleTimeString(localStorage.getItem('i18nextLng') || 'en')}
+ {t(start ? 'starts' : 'ends')}:{' '}
+ {new Date(target).toLocaleTimeString(
+ localStorage.getItem('i18nextLng') || 'en',
+ )}
{display.str.replace('days', t('days')).replace('day', t('day'))}
@@ -540,23 +555,26 @@ const Timer = ({
) : null
}
-const GymFooter = ({
- gym, popups, setPopups, hasRaid, perms, Icons,
-}) => {
+const GymFooter = ({ gym, popups, setPopups, hasRaid, perms, Icons }) => {
const classes = useStyles()
- const { navigation } = useStore(state => state.settings)
- const { navigation: { [navigation]: { url } } } = useStatic(state => state.config)
+ const { navigation } = useStore((state) => state.settings)
+ const {
+ navigation: {
+ [navigation]: { url },
+ },
+ } = useStatic((state) => state.config)
const { lat, lon } = gym
const handleExpandClick = (category) => {
setPopups({
- ...popups, [category]: !popups[category],
+ ...popups,
+ [category]: !popups[category],
})
}
return (
<>
- {(hasRaid && perms.raids && perms.gyms) && (
+ {hasRaid && perms.raids && perms.gyms && (
{
- const {
- last_modified_timestamp, updated, total_cp, guarding_pokemon_id,
- } = gym
- const { gymValidDataLimit } = useStatic(state => state.config)
+ const { last_modified_timestamp, updated, total_cp, guarding_pokemon_id } =
+ gym
+ const { gymValidDataLimit } = useStatic((state) => state.config)
const extraMetaData = [
{
@@ -625,26 +642,38 @@ const ExtraInfo = ({ gym, t, ts }) => {
data: Utility.dayCheck(ts, last_modified_timestamp),
check: last_modified_timestamp,
},
- ].filter(x => Boolean(x.check))
+ ].filter((x) => Boolean(x.check))
return (
- {extraMetaData.map(meta => (
+ {extraMetaData.map((meta) => (
-
-
- {t(meta.description)}:
-
+
+ {t(meta.description)}:
{Boolean(meta.timer) && (
-
+
{meta.timer}
)}
-
-
- {meta.data}
-
+
+ {meta.data}
))}
diff --git a/src/components/popups/Nest.jsx b/src/components/popups/Nest.jsx
index 4ac42ed90..11ca97331 100644
--- a/src/components/popups/Nest.jsx
+++ b/src/components/popups/Nest.jsx
@@ -1,6 +1,11 @@
import React, { useState, useEffect } from 'react'
import {
- Grid, Typography, IconButton, Divider, Menu, MenuItem,
+ Grid,
+ Typography,
+ IconButton,
+ Divider,
+ Menu,
+ MenuItem,
} from '@material-ui/core'
import { MoreVert } from '@material-ui/icons'
import { useTranslation } from 'react-i18next'
@@ -8,23 +13,19 @@ import { useTranslation } from 'react-i18next'
import { useStore, useStatic } from '@hooks/useStore'
import Utility from '@services/Utility'
-export default function NestPopup({
- nest, iconUrl, pokemon, recent,
-}) {
+export default function NestPopup({ nest, iconUrl, pokemon, recent }) {
const { t } = useTranslation()
- const hideList = useStatic(state => state.hideList)
- const setHideList = useStatic(state => state.setHideList)
- const excludeList = useStatic(state => state.excludeList)
- const setExcludeList = useStatic(state => state.setExcludeList)
- const filters = useStore(state => state.filters)
- const setFilters = useStore(state => state.setFilters)
+ const hideList = useStatic((state) => state.hideList)
+ const setHideList = useStatic((state) => state.setHideList)
+ const excludeList = useStatic((state) => state.excludeList)
+ const setExcludeList = useStatic((state) => state.setExcludeList)
+ const filters = useStore((state) => state.filters)
+ const setFilters = useStore((state) => state.setFilters)
const [parkName, setParkName] = useState(true)
const [anchorEl, setAnchorEl] = useState(false)
- const {
- id, name, updated, pokemon_avg,
- } = nest
+ const { id, name, updated, pokemon_avg } = nest
- const lastUpdated = Utility.getTimeUntil((new Date(updated * 1000)))
+ const lastUpdated = Utility.getTimeUntil(new Date(updated * 1000))
const getColor = (timeSince) => {
let color = '#00e676'
@@ -96,10 +97,7 @@ export default function NestPopup({
-
+
@@ -136,10 +134,11 @@ export default function NestPopup({
-
- {t('last_updated')}
-
-
+ {t('last_updated')}
+
{lastUpdated.str.replace('days', t('days')).replace('day', t('day'))}
@@ -152,12 +151,14 @@ export default function NestPopup({
{recent ? (
- {t('nest_estimated')}
+ {t('nest_estimated')}
+
{t('verify_nests')}
) : (
- {t('nest_out_of_date')}
+ {t('nest_out_of_date')}
+
{t('nest_check_current')}
)}
diff --git a/src/components/popups/Pokemon.jsx b/src/components/popups/Pokemon.jsx
index e6d879e53..5729696cf 100644
--- a/src/components/popups/Pokemon.jsx
+++ b/src/components/popups/Pokemon.jsx
@@ -1,12 +1,17 @@
-import React, {
- Fragment, useCallback, useState, useEffect,
-} from 'react'
+import React, { Fragment, useCallback, useState, useEffect } from 'react'
import {
- Grid, Avatar, Typography, Icon, Collapse, IconButton, Divider, Menu, MenuItem, Tooltip,
+ Grid,
+ Avatar,
+ Typography,
+ Icon,
+ Collapse,
+ IconButton,
+ Divider,
+ Menu,
+ MenuItem,
+ Tooltip,
} from '@material-ui/core'
-import {
- Check, Clear, ExpandMore, Map, MoreVert,
-} from '@material-ui/icons'
+import { Check, Clear, ExpandMore, Map, MoreVert } from '@material-ui/icons'
import { useTranslation } from 'react-i18next'
import { useStore, useStatic } from '@hooks/useStore'
@@ -24,25 +29,37 @@ const leagueLookup = {
}
export default function PokemonPopup({
- pokemon, iconUrl, userSettings, isTutorial, Icons, isNight,
+ pokemon,
+ iconUrl,
+ userSettings,
+ isTutorial,
+ Icons,
+ isNight,
}) {
const { t } = useTranslation()
const classes = useStyles()
+ const { pokemon_id, cleanPvp, iv, cp } = pokemon
+ const { perms } = useStatic((state) => state.auth)
+ const pokePerms = isTutorial
+ ? {
+ pvp: true,
+ iv: true,
+ }
+ : perms
const {
- pokemon_id, cleanPvp, iv, cp,
- } = pokemon
- const { perms } = useStatic(state => state.auth)
- const pokePerms = isTutorial ? {
- pvp: true, iv: true,
- } : perms
- const { pokemon: { [pokemon_id]: metaData } } = useStatic(state => state.masterfile)
- const popups = useStore(state => state.popups)
- const setPopups = useStore(state => state.setPopups)
+ pokemon: { [pokemon_id]: metaData },
+ } = useStatic((state) => state.masterfile)
+ const popups = useStore((state) => state.popups)
+ const setPopups = useStore((state) => state.setPopups)
const hasLeagues = cleanPvp ? Object.keys(cleanPvp) : []
const hasStats = iv || cp
useEffect(() => {
- Utility.analytics('Popup', `ID: ${pokemon.pokemon_id} IV: ${pokemon.iv}% PVP: #${pokemon.bestPvp}`, 'Pokemon')
+ Utility.analytics(
+ 'Popup',
+ `ID: ${pokemon.pokemon_id} IV: ${pokemon.iv}% PVP: #${pokemon.bestPvp}`,
+ 'Pokemon',
+ )
}, [])
return (
@@ -64,22 +81,14 @@ export default function PokemonPopup({
isTutorial={isTutorial}
/>
{Boolean(pokemon.expire_timestamp) && (
-
+
)}
{pokemon.seen_type === 'nearby_cell' && (
{t('pokemon_cell')}
)}
- {(hasStats && pokePerms.iv) && (
+ {hasStats && pokePerms.iv && (
<>
-
+
)}
@@ -99,7 +108,7 @@ export default function PokemonPopup({
Icons={Icons}
/>
- {hasLeagues.map(league => (
+ {hasLeagues.map((league) => (
-
+
)
}
const Header = ({
- pokemon, metaData, t, iconUrl, userSettings, classes, isTutorial,
+ pokemon,
+ metaData,
+ t,
+ iconUrl,
+ userSettings,
+ classes,
+ isTutorial,
}) => {
- const hideList = useStatic(state => state.hideList)
- const setHideList = useStatic(state => state.setHideList)
- const excludeList = useStatic(state => state.excludeList)
- const setExcludeList = useStatic(state => state.setExcludeList)
- const timerList = useStatic(state => state.timerList)
- const setTimerList = useStatic(state => state.setTimerList)
- const filters = useStore(state => state.filters)
- const setFilters = useStore(state => state.setFilters)
+ const hideList = useStatic((state) => state.hideList)
+ const setHideList = useStatic((state) => state.setHideList)
+ const excludeList = useStatic((state) => state.excludeList)
+ const setExcludeList = useStatic((state) => state.setExcludeList)
+ const timerList = useStatic((state) => state.timerList)
+ const setTimerList = useStatic((state) => state.setTimerList)
+ const filters = useStore((state) => state.filters)
+ const setFilters = useStore((state) => state.setFilters)
const [anchorEl, setAnchorEl] = useState(false)
- const {
- id, pokemon_id, form, ditto_form, display_pokemon_id,
- } = pokemon
+ const { id, pokemon_id, form, ditto_form, display_pokemon_id } = pokemon
const handleClick = (event) => {
setAnchorEl(event.currentTarget)
@@ -174,7 +182,7 @@ const Header = ({
const handleTimer = () => {
setAnchorEl(null)
if (timerList.includes(id)) {
- setTimerList(timerList.filter(x => x !== id))
+ setTimerList(timerList.filter((x) => x !== id))
} else {
setTimerList([...timerList, id])
}
@@ -184,44 +192,51 @@ const Header = ({
{ name: 'timer', action: handleTimer },
{ name: 'hide', action: handleHide },
]
- if (isTutorial || filters?.pokemon?.filter?.[`${pokemon_id}-${form}`]?.enabled) {
+ if (
+ isTutorial ||
+ filters?.pokemon?.filter?.[`${pokemon_id}-${form}`]?.enabled
+ ) {
options.push({ name: 'exclude', action: handleExclude })
}
const pokeName = t(`poke_${metaData.pokedexId}`)
- const formName = metaData.forms?.[form]?.name === 'Normal' || form === 0 ? '' : t(`form_${pokemon.form}`)
+ const formName =
+ metaData.forms?.[form]?.name === 'Normal' || form === 0
+ ? ''
+ : t(`form_${pokemon.form}`)
return (
<>
- {userSettings.showDexNumInPopup
- ? (
- {metaData.pokedexId}
-
- )
- : 
}
+ >
+ {metaData.pokedexId}
+
+ ) : (
+
+ )}
8 ? 'h6' : 'h5'}>
{pokeName}
- {(ditto_form !== null && display_pokemon_id) ? (
+ {ditto_form !== null && display_pokemon_id ? (
({t(`poke_${display_pokemon_id}`)})
) : (
-
- {formName}
-
+ {formName}
)}
-
+
@@ -248,20 +263,24 @@ const Header = ({
}
const Stats = ({ pokemon, t }) => {
- const {
- cp, iv, atk_iv, def_iv, sta_iv, level, inactive_stats,
- } = pokemon
-
- const getColor = useCallback(ivPercent => {
- const ivColors = {
- 0: 'red', 66: 'orange', 82: 'yellow', 100: '#00e676',
- }
- let color
- Object.keys(ivColors).forEach(range => (
- ivPercent >= parseInt(range) ? color = ivColors[range] : ''
- ))
- return color
- }, [iv])
+ const { cp, iv, atk_iv, def_iv, sta_iv, level, inactive_stats } = pokemon
+
+ const getColor = useCallback(
+ (ivPercent) => {
+ const ivColors = {
+ 0: 'red',
+ 66: 'orange',
+ 82: 'yellow',
+ 100: '#00e676',
+ }
+ let color
+ Object.keys(ivColors).forEach((range) =>
+ ivPercent >= parseInt(range) ? (color = ivColors[range]) : '',
+ )
+ return color
+ },
+ [iv],
+ )
return (
{
>
{iv !== null && (
-
- {iv.toFixed(2)}{t('%')}
+
+ {iv.toFixed(2)}
+ {t('%')}
)}
@@ -289,7 +313,8 @@ const Stats = ({ pokemon, t }) => {
{level !== null && (
- {t('cp')} {cp} | {t('abbreviation_level')}{level}
+ {t('cp')} {cp} | {t('abbreviation_level')}
+ {level}
)}
@@ -297,22 +322,20 @@ const Stats = ({ pokemon, t }) => {
)
}
-const Info = ({
- pokemon, metaData, perms, Icons, isNight,
-}) => {
+const Info = ({ pokemon, metaData, perms, Icons, isNight }) => {
const { gender, weather, form } = pokemon
const formTypes = metaData?.forms?.[form]?.types || metaData?.types || []
return (
- {(weather != 0 && perms.iv) && (
+ {weather != 0 && perms.iv && (
)}
- {formTypes.map(type => (
+ {formTypes.map((type) => (
{
{timer.str}
- {despawnTimer.toLocaleTimeString(localStorage.getItem('i18nextLng') || 'en')}
+ {despawnTimer.toLocaleTimeString(
+ localStorage.getItem('i18nextLng') || 'en',
+ )}
- {expire_timestamp_verified
- ?
- : }
+ {expire_timestamp_verified ? (
+
+ ) : (
+
+ )}
)
}
-const Footer = ({
- pokemon, popups, setPopups, hasPvp, classes, Icons,
-}) => {
- const { navigation } = useStore(state => state.settings)
- const { navigation: { [navigation]: { url } } } = useStatic(state => state.config)
+const Footer = ({ pokemon, popups, setPopups, hasPvp, classes, Icons }) => {
+ const { navigation } = useStore((state) => state.settings)
+ const {
+ navigation: {
+ [navigation]: { url },
+ },
+ } = useStatic((state) => state.config)
const { lat, lon } = pokemon
@@ -426,7 +459,12 @@ const Footer = ({
)}
-
+
@@ -444,94 +482,123 @@ const Footer = ({
)
}
-const ExtraInfo = ({
- pokemon, perms, t, Icons,
-}) => {
- const { moves } = useStatic(state => state.masterfile)
+const ExtraInfo = ({ pokemon, perms, t, Icons }) => {
+ const { moves } = useStatic((state) => state.masterfile)
- const {
- move_1, move_2, weight, size, first_seen_timestamp, updated, iv,
- } = pokemon
+ const { move_1, move_2, weight, size, first_seen_timestamp, updated, iv } =
+ pokemon
return (
-
- {(perms.iv && iv !== null) && [move_1, move_2].map((move, i) => {
- if (!move) return null
- return (
-
-
-
-
- {t(`move_${move}`)}
-
-
-
-
- {i ? `${weight ? weight.toFixed(2) : '? '}${t('kilogram')}` : `${size ? size.toFixed(2) : '? '}${t('meter')}`}
-
-
-
- )
- })}
- {[first_seen_timestamp, updated].map((time, i) => (
+
+ {perms.iv &&
+ iv !== null &&
+ [move_1, move_2].map((move, i) => {
+ if (!move) return null
+ return (
+
+
+
+ {t(`move_${move}`)}
+
+
+
+ {i
+ ? `${weight ? weight.toFixed(2) : '? '}${t('kilogram')}`
+ : `${size ? size.toFixed(2) : '? '}${t('meter')}`}
+
+
+
+ )
+ })}
+ {[first_seen_timestamp, updated].map((time, i) =>
time ? (
-
+
{i ? t('last_seen') : t('first_seen')}:
-
+
-
+
- {(new Date(time * 1000)).toLocaleTimeString(localStorage.getItem('i18nextLng') || 'en')}
+ {new Date(time * 1000).toLocaleTimeString(
+ localStorage.getItem('i18nextLng') || 'en',
+ )}
- ) : null
- ))}
+ ) : null,
+ )}
)
}
-const PvpInfo = ({
- pokemon, league, data, t, Icons,
-}) => {
+const PvpInfo = ({ pokemon, league, data, t, Icons }) => {
if (data === null) return ''
- const rows = data.map(each => each.rank !== null && each.cp !== null ? {
- id: `${league}-${each.pokemon}-${each.form}-${each.evolution}-${each.gender}-${each.rank}-${each.cp}-${each.lvl}-${each.cap}`,
- img: 
,
- rank: each.rank || 0,
- cp: each.cp || 0,
- lvl: `${each.level || ''}${each.cap && !each.capped ? `/${each.cap}` : ''}`,
- percent: (each.percentage * 100).toFixed(1) || 0,
- } : null).filter(Boolean)
+ const rows = data
+ .map((each) =>
+ each.rank !== null && each.cp !== null
+ ? {
+ id: `${league}-${each.pokemon}-${each.form}-${each.evolution}-${each.gender}-${each.rank}-${each.cp}-${each.lvl}-${each.cap}`,
+ img: (
+ 
+ ),
+ rank: each.rank || 0,
+ cp: each.cp || 0,
+ lvl: `${each.level || ''}${
+ each.cap && !each.capped ? `/${each.cap}` : ''
+ }`,
+ percent: (each.percentage * 100).toFixed(1) || 0,
+ }
+ : null,
+ )
+ .filter(Boolean)
return (
-  |
+
+
+ |
{t('rank')} |
{t('cp')} |
{t('lvl')} |
diff --git a/src/components/popups/Pokestop.jsx b/src/components/popups/Pokestop.jsx
index 2e61bc878..e1a762278 100644
--- a/src/components/popups/Pokestop.jsx
+++ b/src/components/popups/Pokestop.jsx
@@ -1,8 +1,10 @@
-import React, {
- Fragment, useState, useEffect,
-} from 'react'
+import React, { Fragment, useState, useEffect } from 'react'
import {
- Grid, Typography, Collapse, IconButton, Divider,
+ Grid,
+ Typography,
+ Collapse,
+ IconButton,
+ Divider,
} from '@material-ui/core'
import { ExpandMore, MoreVert } from '@material-ui/icons'
import { useTranslation, Trans } from 'react-i18next'
@@ -20,19 +22,28 @@ import Timer from './common/Timer'
import PowerUp from './common/PowerUp'
export default function PokestopPopup({
- pokestop, ts, hasLure, hasInvasion, hasQuest, Icons, userSettings, config,
+ pokestop,
+ ts,
+ hasLure,
+ hasInvasion,
+ hasQuest,
+ Icons,
+ userSettings,
+ config,
}) {
const { t } = useTranslation()
- const { pokestops: perms } = useStatic(state => state.ui)
- const popups = useStore(state => state.popups)
- const setPopups = useStore(state => state.setPopups)
- const {
- lure_expire_timestamp, lure_id, invasions,
- } = pokestop
+ const { pokestops: perms } = useStatic((state) => state.ui)
+ const popups = useStore((state) => state.popups)
+ const setPopups = useStore((state) => state.setPopups)
+ const { lure_expire_timestamp, lure_id, invasions } = pokestop
useEffect(() => {
const has = { hasLure, hasQuest, hasInvasion }
- Utility.analytics('Popup', Object.keys(has).filter(a => Boolean(has[a])), 'Pokestop')
+ Utility.analytics(
+ 'Popup',
+ Object.keys(has).filter((a) => Boolean(has[a])),
+ 'Pokestop',
+ )
}, [])
const plainPokestop = !hasLure && !hasQuest && !hasInvasion
@@ -57,10 +68,7 @@ export default function PokestopPopup({
)}
-
+
) : (
-
+
-
- {hasQuest && pokestop.quests.map((quest, index) => (
-
- {index ? : null}
-
-
-
- ))}
+
+ {hasQuest &&
+ pokestop.quests.map((quest, index) => (
+
+ {index ? (
+
+ ) : null}
+
+
+
+ ))}
{hasLure && (
<>
- {(hasQuest) && }
+ {hasQuest && (
+
+ )}
- {(hasQuest || hasLure) && }
+ {(hasQuest || hasLure) && (
+
+ )}
{invasions.map((invasion, index) => (
-
- {index ? : null}
+
+ {index ? (
+
+ ) : null}
)}
- {(perms.invasions && hasInvasion) && (
+ {perms.invasions && hasInvasion && (
@@ -160,22 +186,25 @@ export default function PokestopPopup({
}
const MenuActions = ({
- pokestop, perms, hasInvasion, hasQuest, hasLure, t,
+ pokestop,
+ perms,
+ hasInvasion,
+ hasQuest,
+ hasLure,
+ t,
}) => {
- const hideList = useStatic(state => state.hideList)
- const setHideList = useStatic(state => state.setHideList)
- const excludeList = useStatic(state => state.excludeList)
- const setExcludeList = useStatic(state => state.setExcludeList)
- const timerList = useStatic(state => state.timerList)
- const setTimerList = useStatic(state => state.setTimerList)
- const filters = useStore(state => state.filters)
- const setFilters = useStore(state => state.setFilters)
+ const hideList = useStatic((state) => state.hideList)
+ const setHideList = useStatic((state) => state.setHideList)
+ const excludeList = useStatic((state) => state.excludeList)
+ const setExcludeList = useStatic((state) => state.setExcludeList)
+ const timerList = useStatic((state) => state.timerList)
+ const setTimerList = useStatic((state) => state.setTimerList)
+ const filters = useStore((state) => state.filters)
+ const setFilters = useStore((state) => state.setFilters)
const [anchorEl, setAnchorEl] = useState(false)
- const {
- id, lure_id, quests, invasions,
- } = pokestop
+ const { id, lure_id, quests, invasions } = pokestop
const handleClick = (event) => {
setAnchorEl(event.currentTarget)
@@ -225,27 +254,39 @@ const MenuActions = ({
const handleTimer = () => {
setAnchorEl(null)
if (timerList.includes(id)) {
- setTimerList(timerList.filter(x => x !== id))
+ setTimerList(timerList.filter((x) => x !== id))
} else {
setTimerList([...timerList, id])
}
}
- const options = [
- { name: 'hide', action: handleHide },
- ]
+ const options = [{ name: 'hide', action: handleHide }]
if (perms.quests && hasQuest) {
quests.forEach((quest, i) => {
let reward = ''
switch (quest.quest_reward_type) {
- case 2: reward = t(`item_${quest.quest_item_id}`); break
- case 3: reward = `${t('stardust')} x${quest.stardust_amount}`; break
- case 4: reward = `${t(`poke_${quest.candy_pokemon_id} ${t('candy')}`)}`; break
- case 7: reward = t(`poke_${quest.quest_pokemon_id}`); break
- case 9: reward = t(`poke_${quest.quest_pokemon_id} ${t('xl')}`); break
- case 12: reward = `${t(`poke_${quest.mega_pokemon_id}`)} x${quest.mega_amount}`; break
- default: reward = t(`quest_reward_${quest.quest_reward_type}`); break
+ case 2:
+ reward = t(`item_${quest.quest_item_id}`)
+ break
+ case 3:
+ reward = `${t('stardust')} x${quest.stardust_amount}`
+ break
+ case 4:
+ reward = `${t(`poke_${quest.candy_pokemon_id} ${t('candy')}`)}`
+ break
+ case 7:
+ reward = t(`poke_${quest.quest_pokemon_id}`)
+ break
+ case 9:
+ reward = t(`poke_${quest.quest_pokemon_id} ${t('xl')}`)
+ break
+ case 12:
+ reward = `${t(`poke_${quest.mega_pokemon_id}`)} x${quest.mega_amount}`
+ break
+ default:
+ reward = t(`quest_reward_${quest.quest_reward_type}`)
+ break
}
options.push({
key: `${reward}-${quest.with_ar}`,
@@ -255,13 +296,16 @@ const MenuActions = ({
})
}
- if ((perms.invasions && hasInvasion)
- || (perms.lures && hasLure)) {
+ if ((perms.invasions && hasInvasion) || (perms.lures && hasLure)) {
if (hasInvasion) {
invasions.forEach((invasion, i) => {
options.push({
key: `${invasion.grunt_type}-${invasion.incident_expire_timestamp}`,
- name: {{ invasion: t(`grunt_a_${invasion.grunt_type}`) }},
+ name: (
+
+ {{ invasion: t(`grunt_a_${invasion.grunt_type}`) }}
+
+ ),
action: () => excludeInvasion(i),
})
})
@@ -269,16 +313,11 @@ const MenuActions = ({
if (hasLure) {
options.push({ name: 'exclude_lure', action: excludeLure })
}
- options.push(
- { name: 'timer', action: handleTimer },
- )
+ options.push({ name: 'timer', action: handleTimer })
}
return (
-
+
{
+const RewardInfo = ({ quest, Icons, config, t }) => {
const {
quest_item_id,
item_amount,
@@ -312,19 +349,29 @@ const RewardInfo = ({
const getImage = () => {
switch (quest_reward_type) {
- case 2: return Icons.getRewards(quest_reward_type, quest_item_id, item_amount)
- case 3: return Icons.getRewards(quest_reward_type, stardust_amount)
- case 4: return Icons.getRewards(quest_reward_type, candy_pokemon_id, candy_amount)
- case 7: return Icons.getPokemon(
- quest_pokemon_id,
- quest_form_id,
- 0,
- quest_gender_id,
- quest_costume_id,
- quest_shiny,
- )
- case 12: return Icons.getRewards(quest_reward_type, mega_pokemon_id, mega_amount)
- default: return Icons.getRewards(quest_reward_type)
+ case 2:
+ return Icons.getRewards(quest_reward_type, quest_item_id, item_amount)
+ case 3:
+ return Icons.getRewards(quest_reward_type, stardust_amount)
+ case 4:
+ return Icons.getRewards(
+ quest_reward_type,
+ candy_pokemon_id,
+ candy_amount,
+ )
+ case 7:
+ return Icons.getPokemon(
+ quest_pokemon_id,
+ quest_form_id,
+ 0,
+ quest_gender_id,
+ quest_costume_id,
+ quest_shiny,
+ )
+ case 12:
+ return Icons.getRewards(quest_reward_type, mega_pokemon_id, mega_amount)
+ default:
+ return Icons.getRewards(quest_reward_type)
}
}
@@ -332,7 +379,9 @@ const RewardInfo = ({
})
- {config.questMessage ? config.questMessage : t(`ar_quest_${Boolean(with_ar)}`)}
+ {config.questMessage
+ ? config.questMessage
+ : t(`ar_quest_${Boolean(with_ar)}`)}
)
@@ -351,9 +400,7 @@ const QuestConditions = ({ quest, t, userSettings }) => {
if (userSettings.madQuestText && quest_task) {
return (
-
- {quest_task}
-
+ {quest_task}
)
}
@@ -364,9 +411,7 @@ const QuestConditions = ({ quest, t, userSettings }) => {
return (
-
- {{ amount_0: quest_target }}
-
+ {{ amount_0: quest_target }}
)
@@ -376,56 +421,67 @@ const QuestConditions = ({ quest, t, userSettings }) => {
const [type1, type2] = Utility.parseConditions(quest_conditions)
const primaryCondition = (
-
- {{ amount: quest_target }}
-
+ {{ amount: quest_target }}
)
const getQuestConditions = (qType, qInfo) => {
const key = `quest_condition_${qType}_formatted`
switch (qType) {
- case 1: return (
-
- {{ types: qInfo.pokemon_type_ids.map(id => t(`poke_type_${id}`)) }}
-
- )
- case 2: return (
-
- {{ pokemon: qInfo.pokemon_ids.map(id => t(`poke_${id}`)) }}
-
- )
- case 7: return (
-
- {{ levels: qInfo.raid_levels.map(id => id) }}
-
- )
- case 11: return (
-
- {{ item: t(`item_${qInfo.item_id}`) }}
-
- )
+ case 1:
+ return (
+
+ {{
+ types: qInfo.pokemon_type_ids.map((id) => t(`poke_type_${id}`)),
+ }}
+
+ )
+ case 2:
+ return (
+
+ {{ pokemon: qInfo.pokemon_ids.map((id) => t(`poke_${id}`)) }}
+
+ )
+ case 7:
+ return (
+
+ {{ levels: qInfo.raid_levels.map((id) => id) }}
+
+ )
+ case 11:
+ return (
+ {{ item: t(`item_${qInfo.item_id}`) }}
+ )
case 8:
- case 14: return qInfo.throw_type_id ? (
-
- {{ throw_type: t(`throw_type_${qInfo.throw_type_id}`) }}
-
- ) : t('quest_condition_14')
- case 26: return (
-
- {{ alignments: qInfo.alignment_ids.map(id => t(`alignment_${id}`)) }}
-
- )
- case 27: return (
-
- {{ categories: qInfo.character_category_ids.map(id => t(`character_category_${id}`)) }}
-
- )
- case 44: return (
-
- {{ time: qInfo.time }}
-
- )
- default: return t(`quest_condition_${qType}`)
+ case 14:
+ return qInfo.throw_type_id ? (
+
+ {{ throw_type: t(`throw_type_${qInfo.throw_type_id}`) }}
+
+ ) : (
+ t('quest_condition_14')
+ )
+ case 26:
+ return (
+
+ {{
+ alignments: qInfo.alignment_ids.map((id) => t(`alignment_${id}`)),
+ }}
+
+ )
+ case 27:
+ return (
+
+ {{
+ categories: qInfo.character_category_ids.map((id) =>
+ t(`character_category_${id}`),
+ ),
+ }}
+
+ )
+ case 44:
+ return {{ time: qInfo.time }}
+ default:
+ return t(`quest_condition_${qType}`)
}
}
return (
@@ -451,21 +507,25 @@ const QuestConditions = ({ quest, t, userSettings }) => {
)
}
-const Footer = ({
- pokestop, popups, setPopups,
- hasInvasion, perms, Icons,
-}) => {
+const Footer = ({ pokestop, popups, setPopups, hasInvasion, perms, Icons }) => {
const classes = useStyles()
const handleExpandClick = (category) => {
setPopups({
- ...popups, [category]: !popups[category],
+ ...popups,
+ [category]: !popups[category],
})
}
return (
-
- {(hasInvasion && perms.invasions) && (
+
+ {hasInvasion && perms.invasions && (
{
]
return (
-
- {extraMetaData.map(meta => (
+
+ {extraMetaData.map((meta) => (
-
-
- {t(meta.description)}:
-
+
+ {t(meta.description)}:
-
+
{meta.timer}
-
-
- {meta.data}
-
+
+ {meta.data}
))}
@@ -543,15 +607,22 @@ const ExtraInfo = ({ pokestop, t, ts }) => {
const Invasion = ({ pokestop, Icons, t }) => {
const { invasions } = pokestop
- const { invasions: invasionInfo } = useStatic(state => state.masterfile)
+ const { invasions: invasionInfo } = useStatic((state) => state.masterfile)
const encounterNum = { first: '#1', second: '#2', third: '#3' }
- const makeShadowPokemon = pkmn => (
+ const makeShadowPokemon = (pkmn) => (
![]()
{
)
- const getRewardPercent = grunt => {
+ const getRewardPercent = (grunt) => {
if (grunt.type === 'Giovanni') {
return { third: '100%' }
}
@@ -574,8 +645,11 @@ const Invasion = ({ pokestop, Icons, t }) => {
return { first: '100%' }
}
- return invasions.map(invasion => (
-
+ return invasions.map((invasion) => (
+
{t(`grunt_a_${invasion.grunt_type}`)}
@@ -584,15 +658,23 @@ const Invasion = ({ pokestop, Icons, t }) => {
- {Object.keys(invasionInfo[invasion.grunt_type].encounters).map(position => (
-
- | {encounterNum[position]} |
-
- {invasionInfo[invasion.grunt_type].encounters[position].map(data => makeShadowPokemon(data))}
- |
- {getRewardPercent(invasionInfo[invasion.grunt_type])[position] || ''} |
-
- ))}
+ {Object.keys(invasionInfo[invasion.grunt_type].encounters).map(
+ (position) => (
+
+ | {encounterNum[position]} |
+
+ {invasionInfo[invasion.grunt_type].encounters[position].map(
+ (data) => makeShadowPokemon(data),
+ )}
+ |
+
+ {getRewardPercent(invasionInfo[invasion.grunt_type])[
+ position
+ ] || ''}
+ |
+
+ ),
+ )}
diff --git a/src/components/popups/Portal.jsx b/src/components/popups/Portal.jsx
index 82ba0ac05..7775d9ac2 100644
--- a/src/components/popups/Portal.jsx
+++ b/src/components/popups/Portal.jsx
@@ -7,13 +7,15 @@ import { useStore, useStatic } from '@hooks/useStore'
import Utility from '@services/Utility'
export default function PortalPopup({ portal, ts, Icons }) {
- const { navigation } = useStore(state => state.settings)
- const { navigation: { [navigation]: { url } } } = useStatic(state => state.config)
+ const { navigation } = useStore((state) => state.settings)
+ const {
+ navigation: {
+ [navigation]: { url },
+ },
+ } = useStatic((state) => state.config)
const { t } = useTranslation()
const [portalName, setPortalName] = useState(true)
- const {
- url: imageUrl, name, lat, lon, updated, imported,
- } = portal
+ const { url: imageUrl, name, lat, lon, updated, imported } = portal
const src = imageUrl
? imageUrl.replace('http://', 'https://')
@@ -72,10 +74,14 @@ export default function PortalPopup({ portal, ts, Icons }) {
- {extraMetaData.map(meta => (
+ {extraMetaData.map((meta) => (
- {meta.description}
- {meta.data}
+
+ {meta.description}
+
+
+ {meta.data}
+
))}
diff --git a/src/components/popups/S2cell.jsx b/src/components/popups/S2cell.jsx
index 1fc8420e7..8510753cd 100644
--- a/src/components/popups/S2cell.jsx
+++ b/src/components/popups/S2cell.jsx
@@ -20,9 +20,7 @@ export default function S2CellPopup({ cell, ts }) {
return (
<>
-
- {{ level: 15 }}
-
+ {{ level: 15 }}
{timer.str.replace('days', t('days')).replace('day', t('day'))}
diff --git a/src/components/popups/Spawnpoint.jsx b/src/components/popups/Spawnpoint.jsx
index 69050a0c9..5d56aecae 100644
--- a/src/components/popups/Spawnpoint.jsx
+++ b/src/components/popups/Spawnpoint.jsx
@@ -6,16 +6,16 @@ import Utility from '@services/Utility'
export default function SpawnpointPopup({ spawnpoint, ts }) {
const { t } = useTranslation()
- const {
- despawn_sec: despawn, lat, lon, updated,
- } = spawnpoint
+ const { despawn_sec: despawn, lat, lon, updated } = spawnpoint
const minute = despawn > 60 ? Math.round(despawn / 60) : despawn
const minuteFixed = minute < 10 ? `0${minute}` : minute
return (
<>
- {t('spawnpoint')}
+
+ {t('spawnpoint')}
+
{despawn ? `00:${minuteFixed}` : '?'}
@@ -30,7 +30,8 @@ export default function SpawnpointPopup({ spawnpoint, ts }) {
{t('location')}
- {lat},
{lon}
+ {lat},
+ {lon}
)
diff --git a/src/components/popups/SubmissionCell.jsx b/src/components/popups/SubmissionCell.jsx
index 1fcef926a..f12eaf41b 100644
--- a/src/components/popups/SubmissionCell.jsx
+++ b/src/components/popups/SubmissionCell.jsx
@@ -11,9 +11,11 @@ export default function SubmissionCellPopup({ cell }) {
if (cell.count_gyms < 3) {
untilNextGym = gymThreshold[cell.count_gyms] - cell.count
}
- if ((cell.count === 1 && cell.count_gyms < 1)
- || (cell.count === 5 && cell.count_gyms < 2)
- || (cell.count === 19 && cell.count_gyms < 3)) {
+ if (
+ (cell.count === 1 && cell.count_gyms < 1) ||
+ (cell.count === 5 && cell.count_gyms < 2) ||
+ (cell.count === 19 && cell.count_gyms < 3)
+ ) {
untilNextGym = t('next_submission')
}
@@ -24,9 +26,7 @@ export default function SubmissionCellPopup({ cell }) {
return (
<>
-
- {{ level: cell.level }}
-
+ {{ level: cell.level }}
{t('total_count')}: {cell.count}
diff --git a/src/components/popups/Weather.jsx b/src/components/popups/Weather.jsx
index 2a4a33e48..59ad7cb4f 100644
--- a/src/components/popups/Weather.jsx
+++ b/src/components/popups/Weather.jsx
@@ -7,11 +7,15 @@ import Utility from '@services/Utility'
export default function WeatherPopup({ weather, ts, Icons }) {
const { t } = useTranslation()
- const { weather: weatherTypes } = useStatic(state => state.masterfile)
+ const { weather: weatherTypes } = useStatic((state) => state.masterfile)
const { gameplay_condition, updated } = weather
useEffect(() => {
- Utility.analytics('Popup', `Type: ${t(`weather_${gameplay_condition}`)}`, 'Weather')
+ Utility.analytics(
+ 'Popup',
+ `Type: ${t(`weather_${gameplay_condition}`)}`,
+ 'Weather',
+ )
}, [])
return (
@@ -38,11 +42,9 @@ export default function WeatherPopup({ weather, ts, Icons }) {
{t('boosted_types')}:
- {weatherTypes[gameplay_condition].types.map(type => (
+ {weatherTypes[gameplay_condition].types.map((type) => (
-
- {t(`poke_type_${type}`)}
-
+ {t(`poke_type_${type}`)}
})
{Image}
- ) : Image}
+ ) : (
+ Image
+ )}
{Boolean(arScanEligible) && (
![]()
state.settings)
- const { navigation: { [navigation]: { url } } } = useStatic(state => state.config)
+ const { navigation } = useStore((state) => state.settings)
+ const {
+ navigation: {
+ [navigation]: { url },
+ },
+ } = useStatic((state) => state.config)
return (
{Utility.capitalize(t('level'))} {power_up_level}
@@ -26,7 +29,7 @@ export default function PowerUp({
{power_up_points} {t('points')}
- )}
+ }
/>
{divider && }
diff --git a/src/components/popups/common/TimeTile.jsx b/src/components/popups/common/TimeTile.jsx
index 42a79efe9..1ccc29603 100644
--- a/src/components/popups/common/TimeTile.jsx
+++ b/src/components/popups/common/TimeTile.jsx
@@ -10,15 +10,20 @@ export default function TimeTile({ expireTime, icon, until, size = 3 }) {
<>
{icon && (
- {typeof icon === 'string'
- ? 
: icon}
+ {typeof icon === 'string' ? (
+
+ ) : (
+ icon
+ )}
)}
{endTime && (
- {new Date(endTime).toLocaleTimeString(localStorage.getItem('i18nextLng') || 'en')}
+ {new Date(endTime).toLocaleTimeString(
+ localStorage.getItem('i18nextLng') || 'en',
+ )}
)}
diff --git a/src/components/popups/common/Title.jsx b/src/components/popups/common/Title.jsx
index 8f880ae28..b3f011419 100644
--- a/src/components/popups/common/Title.jsx
+++ b/src/components/popups/common/Title.jsx
@@ -4,12 +4,13 @@ import { Typography } from '@material-ui/core'
import { useStore } from '@hooks/useStore'
export default function Title({ mainName, backup }) {
- const popups = useStore(state => state.popups)
- const setPopups = useStore(state => state.setPopups)
+ const popups = useStore((state) => state.popups)
+ const setPopups = useStore((state) => state.setPopups)
const handleClick = () => {
setPopups({
- ...popups, names: !popups.names,
+ ...popups,
+ names: !popups.names,
})
}
return (
diff --git a/src/components/tiles/Device.jsx b/src/components/tiles/Device.jsx
index f76a736c7..4c7a9912d 100644
--- a/src/components/tiles/Device.jsx
+++ b/src/components/tiles/Device.jsx
@@ -1,15 +1,11 @@
-import React, {
- memo, useRef, useEffect, useState,
-} from 'react'
+import React, { memo, useRef, useEffect, useState } from 'react'
import { Marker, Popup } from 'react-leaflet'
import deviceMarker from '../markers/device'
import PopupContent from '../popups/Device'
import DevicePoly from '../popups/DevicePoly'
-const DeviceTile = ({
- item, ts, Icons, userSettings,
-}) => {
+const DeviceTile = ({ item, ts, Icons, userSettings }) => {
const [poly, setPoly] = useState(false)
const markerRef = useRef(null)
const isOnline = ts - item.last_seen < 900
@@ -31,22 +27,19 @@ const DeviceTile = ({
onOpen={() => setPoly(true)}
onClose={() => setPoly(false)}
>
-
+
- {(poly && !item.isMad) && }
+ {poly && !item.isMad && (
+
+ )}
)
}
-const areEqual = (prev, next) => (
- prev.item.type === next.item.type
- && prev.item.last_lat === next.item.last_lat
- && prev.item.last_lon === next.item.last_lon
- && prev.item.last_seen === next.item.last_seen
-)
+const areEqual = (prev, next) =>
+ prev.item.type === next.item.type &&
+ prev.item.last_lat === next.item.last_lat &&
+ prev.item.last_lon === next.item.last_lon &&
+ prev.item.last_seen === next.item.last_seen
export default memo(DeviceTile, areEqual)
diff --git a/src/components/tiles/Gym.jsx b/src/components/tiles/Gym.jsx
index 784799b61..1f40adf18 100644
--- a/src/components/tiles/Gym.jsx
+++ b/src/components/tiles/Gym.jsx
@@ -8,18 +8,30 @@ import gymMarker from '../markers/gym'
import PopupContent from '../popups/Gym'
import ToolTipWrapper from './Timer'
-const getColor = team => {
+const getColor = (team) => {
switch (team) {
- case 1: return '#0030C8'
- case 2: return '#D83C22'
- case 3: return '#F1F642'
- default: return '#A9A9A9'
+ case 1:
+ return '#0030C8'
+ case 2:
+ return '#D83C22'
+ case 3:
+ return '#F1F642'
+ default:
+ return '#A9A9A9'
}
}
const GymTile = ({
- item, ts, showTimer, filters, Icons, excludeList, userSettings, params,
- showCircles, setParams,
+ item,
+ ts,
+ showTimer,
+ filters,
+ Icons,
+ excludeList,
+ userSettings,
+ params,
+ showCircles,
+ setParams,
}) => {
const markerRef = useRef({})
const [done, setDone] = useState(false)
@@ -27,20 +39,32 @@ const GymTile = ({
const [badge, setBadge] = useState(item.badge || 0)
const {
- raid_battle_timestamp, raid_end_timestamp, raid_level, raid_pokemon_id, raid_pokemon_form, team_id,
+ raid_battle_timestamp,
+ raid_end_timestamp,
+ raid_level,
+ raid_pokemon_id,
+ raid_pokemon_form,
+ team_id,
} = item
const newTs = Date.now() / 1000
- const hasRaid = raid_end_timestamp >= newTs
- && raid_level > 0
- && (raid_battle_timestamp >= newTs
+ const hasRaid =
+ raid_end_timestamp >= newTs &&
+ raid_level > 0 &&
+ (raid_battle_timestamp >= newTs
? !excludeList.includes(`e${raid_level}`)
: !excludeList.includes(`${raid_pokemon_id}-${raid_pokemon_form}`))
- const hasHatched = raid_end_timestamp >= newTs && raid_battle_timestamp <= newTs
+ const hasHatched =
+ raid_end_timestamp >= newTs && raid_battle_timestamp <= newTs
- const timerToDisplay = item.raid_pokemon_id || hasHatched ? raid_end_timestamp : raid_battle_timestamp
+ const timerToDisplay =
+ item.raid_pokemon_id || hasHatched
+ ? raid_end_timestamp
+ : raid_battle_timestamp
- useMarkerTimer(timerToDisplay, item.id, markerRef, '', ts, () => setStateChange(!stateChange))
+ useMarkerTimer(timerToDisplay, item.id, markerRef, '', ts, () =>
+ setStateChange(!stateChange),
+ )
useForcePopup(item.id, markerRef, params, setParams, done)
useEffect(() => {
@@ -51,71 +75,86 @@ const GymTile = ({
}
}, [filters.gymBadges, item.badge])
- return !excludeList.includes(`t${team_id}-0`) && (
- {
- markerRef.current[item.id] = m
- if (!done && item.id === params.id) {
- setDone(true)
- }
- }}
- position={[item.lat, item.lon]}
- icon={gymMarker(item, hasHatched, hasRaid, filters, Icons, userSettings, badge)}
- >
-
-
-
- {((showTimer || userSettings.raidTimers) && hasRaid) && (
-
- )}
- {showCircles && (
-
- )}
-
+ return (
+ !excludeList.includes(`t${team_id}-0`) && (
+ {
+ markerRef.current[item.id] = m
+ if (!done && item.id === params.id) {
+ setDone(true)
+ }
+ }}
+ position={[item.lat, item.lon]}
+ icon={gymMarker(
+ item,
+ hasHatched,
+ hasRaid,
+ filters,
+ Icons,
+ userSettings,
+ badge,
+ )}
+ >
+
+
+
+ {(showTimer || userSettings.raidTimers) && hasRaid && (
+
+ )}
+ {showCircles && (
+
+ )}
+
+ )
)
}
const areEqual = (prev, next) => {
const raidLogic = () => {
- if (prev.item.raid_battle_timestamp <= next.ts
- && prev.item.raid_battle_timestamp > prev.ts) {
+ if (
+ prev.item.raid_battle_timestamp <= next.ts &&
+ prev.item.raid_battle_timestamp > prev.ts
+ ) {
return false
}
- if (prev.item.raid_end_timestamp <= next.ts
- && prev.item.raid_end_timestamp > prev.ts) {
+ if (
+ prev.item.raid_end_timestamp <= next.ts &&
+ prev.item.raid_end_timestamp > prev.ts
+ ) {
return false
}
return true
}
- return prev.item.id === next.item.id
- && prev.item.raid_pokemon_id === next.item.raid_pokemon_id
- && prev.item.raid_level === next.item.raid_level
- && prev.item.in_battle === next.item.in_battle
- && prev.item.badge === next.item.badge
- && prev.item.team_id === next.item.team_id
- && prev.item.available_slots === next.item.available_slots
- && raidLogic()
- && prev.showTimer === next.showTimer
- && prev.showCircles === next.showCircles
- && !next.excludeList.includes(`${prev.item.raid_pokemon_id}-${prev.item.raid_pokemon_form}`)
- && !next.excludeList.includes(`t${prev.item.team_id}-0`)
- && !next.excludeList.includes(`e${prev.item.raid_level}`)
+ return (
+ prev.item.id === next.item.id &&
+ prev.item.raid_pokemon_id === next.item.raid_pokemon_id &&
+ prev.item.raid_level === next.item.raid_level &&
+ prev.item.in_battle === next.item.in_battle &&
+ prev.item.badge === next.item.badge &&
+ prev.item.team_id === next.item.team_id &&
+ prev.item.available_slots === next.item.available_slots &&
+ raidLogic() &&
+ prev.showTimer === next.showTimer &&
+ prev.showCircles === next.showCircles &&
+ !next.excludeList.includes(
+ `${prev.item.raid_pokemon_id}-${prev.item.raid_pokemon_form}`,
+ ) &&
+ !next.excludeList.includes(`t${prev.item.team_id}-0`) &&
+ !next.excludeList.includes(`e${prev.item.raid_level}`)
+ )
}
export default memo(GymTile, areEqual)
diff --git a/src/components/tiles/Nest.jsx b/src/components/tiles/Nest.jsx
index 93ceeeb24..ae0c3b443 100644
--- a/src/components/tiles/Nest.jsx
+++ b/src/components/tiles/Nest.jsx
@@ -7,12 +7,10 @@ import { useStatic } from '@hooks/useStore'
import nestMarker from '../markers/nest'
import PopupContent from '../popups/Nest'
-const NestTile = ({
- item, filters, Icons, ts, params, setParams,
-}) => {
+const NestTile = ({ item, filters, Icons, ts, params, setParams }) => {
const markerRef = useRef({})
const [done, setDone] = useState(false)
- const { pokemon } = useStatic(state => state.masterfile)
+ const { pokemon } = useStatic((state) => state.masterfile)
const iconUrl = Icons.getPokemon(item.pokemon_id, item.pokemon_form)
const parsedJson = JSON.parse(item.polygon_path)
@@ -31,7 +29,14 @@ const NestTile = ({
}
}}
position={[item.lat, item.lon]}
- icon={nestMarker(iconUrl, item, pokemon[item.pokemon_id], filters, Icons, recent)}
+ icon={nestMarker(
+ iconUrl,
+ item,
+ pokemon[item.pokemon_id],
+ filters,
+ Icons,
+ recent,
+ )}
>
)}
- {parsedJson && filters.polygons && parsedJson.map(polygon => (
-
- ))}
+ {parsedJson &&
+ filters.polygons &&
+ parsedJson.map((polygon) => (
+
+ ))}
)
}
-const areEqual = (prev, next) => (
- prev.item.id === next.item.id
- && prev.item.updated === next.item.updated
- && prev.filters.pokemon === next.filters.pokemon
- && prev.filters.polygons === next.filters.polygons
-)
+const areEqual = (prev, next) =>
+ prev.item.id === next.item.id &&
+ prev.item.updated === next.item.updated &&
+ prev.filters.pokemon === next.filters.pokemon &&
+ prev.filters.polygons === next.filters.polygons
export default memo(NestTile, areEqual)
diff --git a/src/components/tiles/Pokemon.jsx b/src/components/tiles/Pokemon.jsx
index b38035383..024680c21 100644
--- a/src/components/tiles/Pokemon.jsx
+++ b/src/components/tiles/Pokemon.jsx
@@ -25,29 +25,36 @@ const cyrb53 = (str, seed = 0) => {
h1 = Math.imul(h1 ^ ch, 2654435761)
h2 = Math.imul(h2 ^ ch, 1597334677)
}
- h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ Math.imul(h2 ^ (h2 >>> 13), 3266489909)
- h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909)
+ h1 =
+ Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^
+ Math.imul(h2 ^ (h2 >>> 13), 3266489909)
+ h2 =
+ Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^
+ Math.imul(h1 ^ (h1 >>> 13), 3266489909)
return [h1, h2]
}
const getOffset = (coords, type, seed) => {
const offOffset = type === 'nearby_cell' ? 0.0002 : 0.00015
const rand = cyrb53(seed)
- return [0, 1].map(i => {
+ return [0, 1].map((i) => {
let offset = rand[i] * (0.0002 / 4294967296) - 0.0001
offset += offset >= 0 ? -offOffset : offOffset
- return (coords[i] + offset)
+ return coords[i] + offset
})
}
const getGlowStatus = (item, userSettings, staticUserSettings) => {
let glowCount = 0
let glowValue
- Object.entries(staticUserSettings.glow.sub).forEach(rule => {
+ Object.entries(staticUserSettings.glow.sub).forEach((rule) => {
const [ruleKey, ruleValue] = rule
const statKey = ruleValue.perm === 'iv' ? 'iv' : 'bestPvp'
if (ruleValue.op) {
- if (operator[ruleValue.op](item[statKey], ruleValue.num) && item[statKey] !== null) {
+ if (
+ operator[ruleValue.op](item[statKey], ruleValue.num) &&
+ item[statKey] !== null
+ ) {
glowCount += 1
glowValue = userSettings[ruleKey]
}
@@ -60,17 +67,42 @@ const getGlowStatus = (item, userSettings, staticUserSettings) => {
}
const PokemonTile = ({
- item, showTimer, filters, Icons, excludeList, ts, map, isNight,
- userSettings, staticUserSettings, params, showCircles, setParams,
+ item,
+ showTimer,
+ filters,
+ Icons,
+ excludeList,
+ ts,
+ map,
+ isNight,
+ userSettings,
+ staticUserSettings,
+ params,
+ showCircles,
+ setParams,
}) => {
const markerRef = useRef({ [item.id]: null })
const [done, setDone] = useState(false)
useMarkerTimer(item.expire_timestamp, item.id, markerRef, map, ts)
- const url = Icons.getPokemon(item.pokemon_id, item.form, 0, item.gender, item.costume)
- const size = Icons.getSize('pokemon', filters.filter[`${item.pokemon_id}-${item.form}`])
- const glowStatus = userSettings.glow ? getGlowStatus(item, userSettings, staticUserSettings) : undefined
- const ivCircle = userSettings.ivCircles && item.iv !== null && item.iv >= userSettings.minIvCircle
+ const url = Icons.getPokemon(
+ item.pokemon_id,
+ item.form,
+ 0,
+ item.gender,
+ item.costume,
+ )
+ const size = Icons.getSize(
+ 'pokemon',
+ filters.filter[`${item.pokemon_id}-${item.form}`],
+ )
+ const glowStatus = userSettings.glow
+ ? getGlowStatus(item, userSettings, staticUserSettings)
+ : undefined
+ const ivCircle =
+ userSettings.ivCircles &&
+ item.iv !== null &&
+ item.iv >= userSettings.minIvCircle
const pvpCheck = item.bestPvp !== null && item.bestPvp < 4
const weatherCheck = item.weather && userSettings.weatherIndicator
@@ -80,53 +112,63 @@ const PokemonTile = ({
useForcePopup(item.id, markerRef, params, setParams, done)
- return (!excludeList.includes(`${item.pokemon_id}-${item.form}`) && item.expire_timestamp > ts) && (
- {
- markerRef.current[item.id] = m
- if (!done && item.id === params.id) {
- setDone(true)
+ return (
+ !excludeList.includes(`${item.pokemon_id}-${item.form}`) &&
+ item.expire_timestamp > ts && (
+ {
+ markerRef.current[item.id] = m
+ if (!done && item.id === params.id) {
+ setDone(true)
+ }
+ }}
+ zIndexOffset={item.iv * 100}
+ position={finalLocation}
+ icon={
+ pvpCheck || glowStatus || ivCircle || weatherCheck
+ ? fancyMarker(
+ url,
+ size,
+ item,
+ glowStatus,
+ ivCircle,
+ Icons,
+ weatherCheck,
+ isNight,
+ )
+ : basicMarker(url, size)
}
- }}
- zIndexOffset={item.iv * 100}
- position={finalLocation}
- icon={(pvpCheck || glowStatus || ivCircle || weatherCheck)
- ? fancyMarker(url, size, item, glowStatus, ivCircle, Icons, weatherCheck, isNight)
- : basicMarker(url, size)}
- >
-
-
-
- {(showTimer || userSettings.pokemonTimers) && (
-
- )}
- {showCircles && (
-
- )}
-
+ >
+
+
+
+ {(showTimer || userSettings.pokemonTimers) && (
+
+ )}
+ {showCircles && (
+
+ )}
+
+ )
)
}
-const areEqual = (prev, next) => (
- prev.item.id === next.item.id
- && prev.item.updated === next.item.updated
- && prev.showTimer === next.showTimer
- && !next.excludeList.includes(`${prev.item.pokemon_id}-${prev.item.form}`)
- && prev.userIcons.pokemon === next.userIcons.pokemon
- && prev.showCircles === next.showCircles
-)
+const areEqual = (prev, next) =>
+ prev.item.id === next.item.id &&
+ prev.item.updated === next.item.updated &&
+ prev.showTimer === next.showTimer &&
+ !next.excludeList.includes(`${prev.item.pokemon_id}-${prev.item.form}`) &&
+ prev.userIcons.pokemon === next.userIcons.pokemon &&
+ prev.showCircles === next.showCircles
export default memo(PokemonTile, areEqual)
diff --git a/src/components/tiles/Pokestop.jsx b/src/components/tiles/Pokestop.jsx
index bf262e6a0..0130ccf20 100644
--- a/src/components/tiles/Pokestop.jsx
+++ b/src/components/tiles/Pokestop.jsx
@@ -9,8 +9,18 @@ import stopMarker from '../markers/pokestop'
import ToolTipWrapper from './Timer'
const PokestopTile = ({
- item, ts, showTimer, filters, Icons, perms, excludeList, userSettings,
- params, showCircles, config, setParams,
+ item,
+ ts,
+ showTimer,
+ filters,
+ Icons,
+ perms,
+ excludeList,
+ userSettings,
+ params,
+ showCircles,
+ config,
+ setParams,
}) => {
const markerRef = useRef({})
const [done, setDone] = useState(false)
@@ -19,28 +29,44 @@ const PokestopTile = ({
const hasLure = item.lure_expire_timestamp > newTs
- const hasInvasion = item.invasions && item.invasions.some(invasion => !excludeList.includes(`i${invasion.grunt_type}`) && invasion.incident_expire_timestamp > newTs)
+ const hasInvasion =
+ item.invasions &&
+ item.invasions.some(
+ (invasion) =>
+ !excludeList.includes(`i${invasion.grunt_type}`) &&
+ invasion.incident_expire_timestamp > newTs,
+ )
- const hasQuest = item.quests && item.quests.some(quest => !excludeList.includes(quest.key))
+ const hasQuest =
+ item.quests && item.quests.some((quest) => !excludeList.includes(quest.key))
const timers = []
if ((showTimer || userSettings.invasionTimers) && hasInvasion) {
- item.invasions.forEach(invasion => (
- timers.push(invasion.incident_expire_timestamp)
- ))
+ item.invasions.forEach((invasion) =>
+ timers.push(invasion.incident_expire_timestamp),
+ )
}
if ((showTimer || userSettings.lureTimers) && hasLure) {
timers.push(item.lure_expire_timestamp)
}
- useMarkerTimer(timers.length ? Math.min(...timers) : null, item.id, markerRef, '', ts, () => setStateChange(!stateChange))
+ useMarkerTimer(
+ timers.length ? Math.min(...timers) : null,
+ item.id,
+ markerRef,
+ '',
+ ts,
+ () => setStateChange(!stateChange),
+ )
useForcePopup(item.id, markerRef, params, setParams, done)
- return Boolean(((hasQuest && perms.quests)
- || (hasLure && perms.lures)
- || (hasInvasion && perms.invasions))
- || ((filters.allPokestops || item.ar_scan_eligible) && perms.allPokestops))
- && (
+ return (
+ Boolean(
+ (hasQuest && perms.quests) ||
+ (hasLure && perms.lures) ||
+ (hasInvasion && perms.invasions) ||
+ ((filters.allPokestops || item.ar_scan_eligible) && perms.allPokestops),
+ ) && (
{
markerRef.current[item.id] = m
@@ -49,7 +75,15 @@ const PokestopTile = ({
}
}}
position={[item.lat, item.lon]}
- icon={stopMarker(item, hasQuest, hasLure, hasInvasion, filters, Icons, userSettings)}
+ icon={stopMarker(
+ item,
+ hasQuest,
+ hasLure,
+ hasInvasion,
+ filters,
+ Icons,
+ userSettings,
+ )}
>
)
+ )
}
-const areEqual = (prev, next) => (
- prev.item.id === next.item.id
- && prev.item.lure_expire_timestamp === next.item.lure_expire_timestamp
- && prev.item.quests?.length === next.item.quests?.length
- && prev.item.invasions?.length === next.item.invasions?.length
- && prev.item.updated === next.item.updated
- && prev.showTimer === next.showTimer
- && (prev.item.quests && next.item.quests
- ? prev.item.quests.every((q, i) => q.with_ar === next.item.quests[i]?.with_ar)
- : true)
- && (prev.item.quests
- ? !prev.item.quests.some(quest => next.excludeList.includes(quest.key))
- : true)
- && (prev.item.invasions
- ? !prev.item.invasions.some(invasion => next.excludeList.includes(invasion.grunt_type))
- : true)
- && prev.showCircles === next.showCircles
-)
+const areEqual = (prev, next) =>
+ prev.item.id === next.item.id &&
+ prev.item.lure_expire_timestamp === next.item.lure_expire_timestamp &&
+ prev.item.quests?.length === next.item.quests?.length &&
+ prev.item.invasions?.length === next.item.invasions?.length &&
+ prev.item.updated === next.item.updated &&
+ prev.showTimer === next.showTimer &&
+ (prev.item.quests && next.item.quests
+ ? prev.item.quests.every(
+ (q, i) => q.with_ar === next.item.quests[i]?.with_ar,
+ )
+ : true) &&
+ (prev.item.quests
+ ? !prev.item.quests.some((quest) => next.excludeList.includes(quest.key))
+ : true) &&
+ (prev.item.invasions
+ ? !prev.item.invasions.some((invasion) =>
+ next.excludeList.includes(invasion.grunt_type),
+ )
+ : true) &&
+ prev.showCircles === next.showCircles
export default memo(PokestopTile, areEqual)
diff --git a/src/components/tiles/Portal.jsx b/src/components/tiles/Portal.jsx
index 7154ae362..f1b93637b 100644
--- a/src/components/tiles/Portal.jsx
+++ b/src/components/tiles/Portal.jsx
@@ -6,9 +6,7 @@ import useForcePopup from '@hooks/useForcePopup'
import PopupContent from '../popups/Portal'
import marker from '../markers/portal'
-const PortalTile = ({
- item, userSettings, ts, params, Icons, setParams,
-}) => {
+const PortalTile = ({ item, userSettings, ts, params, Icons, setParams }) => {
const [done, setDone] = useState(false)
const markerRef = useRef({})
@@ -34,11 +32,10 @@ const PortalTile = ({
)
}
-const areEqual = (prev, next) => (
- prev.item.id === next.item.id
- && prev.userSettings.clustering === next.userSettings.clustering
- && prev.userSettings.oldPortals === next.userSettings.oldPortals
- && prev.userSettings.newPortals === next.userSettings.newPortals
-)
+const areEqual = (prev, next) =>
+ prev.item.id === next.item.id &&
+ prev.userSettings.clustering === next.userSettings.clustering &&
+ prev.userSettings.oldPortals === next.userSettings.oldPortals &&
+ prev.userSettings.newPortals === next.userSettings.newPortals
export default memo(PortalTile, areEqual)
diff --git a/src/components/tiles/ScanArea.jsx b/src/components/tiles/ScanArea.jsx
index bd709fa23..721974595 100644
--- a/src/components/tiles/ScanArea.jsx
+++ b/src/components/tiles/ScanArea.jsx
@@ -3,11 +3,14 @@ import { GeoJSON } from 'react-leaflet'
import Utility from '@services/Utility'
export default function ScanAreaTile({
- item, webhookMode, selectedAreas, setSelectedAreas,
+ item,
+ webhookMode,
+ selectedAreas,
+ setSelectedAreas,
}) {
const handleClick = (name) => {
if (selectedAreas.includes(name)) {
- setSelectedAreas(selectedAreas.filter(h => h !== name))
+ setSelectedAreas(selectedAreas.filter((h) => h !== name))
} else {
setSelectedAreas([...selectedAreas, name])
}
@@ -21,13 +24,21 @@ export default function ScanAreaTile({
weight: feature.properties['stroke-width'] || 3,
opacity: feature.properties['stroke-opacity'] || 1,
fillColor: feature.properties.fill || '#3388ff',
- fillOpacity: selectedAreas && selectedAreas.includes(name) && webhookMode === 'areas' ? 0.8 : 0.2,
+ fillOpacity:
+ selectedAreas &&
+ selectedAreas.includes(name) &&
+ webhookMode === 'areas'
+ ? 0.8
+ : 0.2,
})
if (webhookMode) {
layer.on('click', () => handleClick(name))
- layer.bindTooltip(popupContent, {
- permanent: true, direction: 'top',
- }).openTooltip()
+ layer
+ .bindTooltip(popupContent, {
+ permanent: true,
+ direction: 'top',
+ })
+ .openTooltip()
} else {
layer.bindPopup(popupContent)
}
@@ -35,10 +46,6 @@ export default function ScanAreaTile({
}
return (
-
+
)
}
diff --git a/src/components/tiles/ScanCell.jsx b/src/components/tiles/ScanCell.jsx
index e54ea42b0..c21c1e624 100644
--- a/src/components/tiles/ScanCell.jsx
+++ b/src/components/tiles/ScanCell.jsx
@@ -4,23 +4,18 @@ import { Polygon, Popup } from 'react-leaflet'
import PopupContent from '../popups/S2cell'
import marker from '../markers/s2cell'
-const S2cellTile = ({
- item, config, zoom, ts,
-}) => (zoom >= config.scanCellsZoom && (
-
-
-
-
-
-))
+const S2cellTile = ({ item, config, zoom, ts }) =>
+ zoom >= config.scanCellsZoom && (
+
+
+
+
+
+ )
-const areEqual = (prev, next) => (
- prev.item.id === next.item.id
- && prev.item.updated === next.item.updated
- && prev.zoom === next.zoom
-)
+const areEqual = (prev, next) =>
+ prev.item.id === next.item.id &&
+ prev.item.updated === next.item.updated &&
+ prev.zoom === next.zoom
export default memo(S2cellTile, areEqual)
diff --git a/src/components/tiles/Spawnpoint.jsx b/src/components/tiles/Spawnpoint.jsx
index c01dbb4ff..fcfc30b43 100644
--- a/src/components/tiles/Spawnpoint.jsx
+++ b/src/components/tiles/Spawnpoint.jsx
@@ -15,7 +15,11 @@ const SpawnpointTile = ({ item, Icons, ts }) => {
return modifiers.useImage ? (
{popup}
@@ -29,9 +33,7 @@ const SpawnpointTile = ({ item, Icons, ts }) => {
)
}
-const areEqual = (prev, next) => (
- prev.item.id === next.item.id
- && prev.item.updated === next.item.updated
-)
+const areEqual = (prev, next) =>
+ prev.item.id === next.item.id && prev.item.updated === next.item.updated
export default memo(SpawnpointTile, areEqual)
diff --git a/src/components/tiles/Timer.jsx b/src/components/tiles/Timer.jsx
index d912f6a47..138363e7c 100644
--- a/src/components/tiles/Timer.jsx
+++ b/src/components/tiles/Timer.jsx
@@ -5,7 +5,9 @@ import Utility from '@services/Utility'
const Timer = ({ timestamp }) => {
const { t } = useTranslation()
- const [timer, setTimer] = useState(Utility.getTimeUntil(new Date(timestamp * 1000), true))
+ const [timer, setTimer] = useState(
+ Utility.getTimeUntil(new Date(timestamp * 1000), true),
+ )
useEffect(() => {
const timer2 = setTimeout(() => {
@@ -15,9 +17,7 @@ const Timer = ({ timestamp }) => {
})
return (
-
- {timer.str.replace('days', t('days')).replace('day', t('day'))}
-
+ {timer.str.replace('days', t('days')).replace('day', t('day'))}
)
}
@@ -25,8 +25,12 @@ export default function TooltipWrapper({ timers, offset }) {
return (
{[...new Set(timers)].map((timer, i) => (
- // eslint-disable-next-line react/no-array-index-key
- 1} />
+ 1}
+ />
))}
)
diff --git a/src/components/tiles/Weather.jsx b/src/components/tiles/Weather.jsx
index 21d9671f3..b7657d182 100644
--- a/src/components/tiles/Weather.jsx
+++ b/src/components/tiles/Weather.jsx
@@ -18,7 +18,13 @@ const WeatherTile = ({ item, ts, Icons, isNight, tileStyle, userSettings }) => {
{
)
}
-const areEqual = (prev, next) => (
- prev.item.gameplay_condition === next.item.gameplay_condition
- && prev.item.updated === next.item.updated
- && prev.tileStyle === next.tileStyle
-)
+const areEqual = (prev, next) =>
+ prev.item.gameplay_condition === next.item.gameplay_condition &&
+ prev.item.updated === next.item.updated &&
+ prev.tileStyle === next.tileStyle
export default memo(WeatherTile, areEqual)
diff --git a/src/components/tiles/submissionCells/Placement.jsx b/src/components/tiles/submissionCells/Placement.jsx
index 193757745..b3db9fafc 100644
--- a/src/components/tiles/submissionCells/Placement.jsx
+++ b/src/components/tiles/submissionCells/Placement.jsx
@@ -11,10 +11,9 @@ const PlacementTile = ({ cell, tileStyle, userSettings }) => (
/>
)
-const areEqual = (prev, next) => (
- prev.cell.id === next.cell.id
- && prev.zoom === next.zoom
- && prev.tileStyle === next.tileStyle
-)
+const areEqual = (prev, next) =>
+ prev.cell.id === next.cell.id &&
+ prev.zoom === next.zoom &&
+ prev.tileStyle === next.tileStyle
export default memo(PlacementTile, areEqual)
diff --git a/src/components/tiles/submissionCells/Ring.jsx b/src/components/tiles/submissionCells/Ring.jsx
index b19f3a9d9..6fc5937ff 100644
--- a/src/components/tiles/submissionCells/Ring.jsx
+++ b/src/components/tiles/submissionCells/Ring.jsx
@@ -6,13 +6,14 @@ const RingTile = ({ ring, userSettings }) => (
center={[ring.lat, ring.lon]}
radius={20}
interactive={false}
- pathOptions={{ fillColor: userSettings.poiColor, color: userSettings.poiColor }}
+ pathOptions={{
+ fillColor: userSettings.poiColor,
+ color: userSettings.poiColor,
+ }}
/>
)
-const areEqual = (prev, next) => (
- prev.ring.id === next.ring.id
- && prev.zoom === next.zoom
-)
+const areEqual = (prev, next) =>
+ prev.ring.id === next.ring.id && prev.zoom === next.zoom
export default memo(RingTile, areEqual)
diff --git a/src/components/tiles/submissionCells/SubmissionCell.jsx b/src/components/tiles/submissionCells/SubmissionCell.jsx
index 8fa31f1cc..6a50c39b9 100644
--- a/src/components/tiles/submissionCells/SubmissionCell.jsx
+++ b/src/components/tiles/submissionCells/SubmissionCell.jsx
@@ -4,39 +4,48 @@ import PlacementTile from './Placement'
import RingTile from './Ring'
export default function SubmissionCellTile({
- item, tileStyle, config, zoom, userSettings,
+ item,
+ tileStyle,
+ config,
+ zoom,
+ userSettings,
}) {
const zoomLimit = zoom >= config.submissionZoom
- return zoom >= (config.submissionZoom - 1) && (
- <>
- {(item?.placementCells?.rings && zoomLimit)
- && item.placementCells.rings.map(ring => (
-
- ))}
- {(item?.placementCells?.cells && zoomLimit)
- && item.placementCells.cells.map(cell => (
-
- ))}
- {item?.typeCells && item.typeCells.map(cell => (
- = (config.submissionZoom - 1)}
- userSettings={userSettings}
- />
- ))}
-
+ return (
+ zoom >= config.submissionZoom - 1 && (
+ <>
+ {item?.placementCells?.rings &&
+ zoomLimit &&
+ item.placementCells.rings.map((ring) => (
+
+ ))}
+ {item?.placementCells?.cells &&
+ zoomLimit &&
+ item.placementCells.cells.map((cell) => (
+
+ ))}
+ {item?.typeCells &&
+ item.typeCells.map((cell) => (
+ = config.submissionZoom - 1}
+ userSettings={userSettings}
+ />
+ ))}
+
+ )
)
}
diff --git a/src/components/tiles/submissionCells/Type.jsx b/src/components/tiles/submissionCells/Type.jsx
index 3a2ed2012..cde481eb7 100644
--- a/src/components/tiles/submissionCells/Type.jsx
+++ b/src/components/tiles/submissionCells/Type.jsx
@@ -9,26 +9,19 @@ const TypeTile = ({ cell, tileStyle, userSettings }) => (
positions={cell.polygon}
pathOptions={typeStyle(cell, tileStyle, userSettings)}
>
-
+
-
+
{cell.count}
)
-const areEqual = (prev, next) => (
- prev.cell.id === next.cell.id
- && prev.cell.count === next.cell.count
- && prev.zoom === next.zoom
- && prev.tileStyle === next.tileStyle
-)
+const areEqual = (prev, next) =>
+ prev.cell.id === next.cell.id &&
+ prev.cell.count === next.cell.count &&
+ prev.zoom === next.zoom &&
+ prev.tileStyle === next.tileStyle
export default memo(TypeTile, areEqual)
diff --git a/src/hooks/useConfig.js b/src/hooks/useConfig.js
index f99477524..ef0fd4a10 100644
--- a/src/hooks/useConfig.js
+++ b/src/hooks/useConfig.js
@@ -5,32 +5,39 @@ import Utility from '@services/Utility'
import { useStore, useStatic } from '@hooks/useStore'
export default function useConfig(serverSettings, params) {
- Utility.analytics('User', serverSettings.user ? `${serverSettings.user.username} (${serverSettings.user.id})` : 'Not Logged In', 'Permissions', true)
+ Utility.analytics(
+ 'User',
+ serverSettings.user
+ ? `${serverSettings.user.username} (${serverSettings.user.id})`
+ : 'Not Logged In',
+ 'Permissions',
+ true,
+ )
document.title = serverSettings.config?.map?.headerTitle
- const setUserSettings = useStore(state => state.setUserSettings)
- const setSettings = useStore(state => state.setSettings)
- const setFilters = useStore(state => state.setFilters)
- const setLocation = useStore(state => state.setLocation)
- const setZoom = useStore(state => state.setZoom)
- const setMenus = useStore(state => state.setMenus)
- const setIcons = useStore(state => state.setIcons)
- const setSelectedWebhook = useStore(state => state.setSelectedWebhook)
- const setTutorial = useStore(state => state.setTutorial)
-
- const setAuth = useStatic(state => state.setAuth)
- const setStaticUserSettings = useStatic(state => state.setUserSettings)
- const setStaticSettings = useStatic(state => state.setSettings)
- const setStaticMenus = useStatic(state => state.setMenus)
- const setAvailable = useStatic(state => state.setAvailable)
- const setConfig = useStatic(state => state.setConfig)
- const setStaticIcons = useStatic(state => state.setIcons)
- const setMasterfile = useStatic(state => state.setMasterfile)
- const setUi = useStatic(state => state.setUi)
- const setStaticFilters = useStatic(state => state.setFilters)
- const setWebhookData = useStatic(state => state.setWebhookData)
- const setIsNight = useStatic(state => state.setIsNight)
+ const setUserSettings = useStore((state) => state.setUserSettings)
+ const setSettings = useStore((state) => state.setSettings)
+ const setFilters = useStore((state) => state.setFilters)
+ const setLocation = useStore((state) => state.setLocation)
+ const setZoom = useStore((state) => state.setZoom)
+ const setMenus = useStore((state) => state.setMenus)
+ const setIcons = useStore((state) => state.setIcons)
+ const setSelectedWebhook = useStore((state) => state.setSelectedWebhook)
+ const setTutorial = useStore((state) => state.setTutorial)
+
+ const setAuth = useStatic((state) => state.setAuth)
+ const setStaticUserSettings = useStatic((state) => state.setUserSettings)
+ const setStaticSettings = useStatic((state) => state.setSettings)
+ const setStaticMenus = useStatic((state) => state.setMenus)
+ const setAvailable = useStatic((state) => state.setAvailable)
+ const setConfig = useStatic((state) => state.setConfig)
+ const setStaticIcons = useStatic((state) => state.setIcons)
+ const setMasterfile = useStatic((state) => state.setMasterfile)
+ const setUi = useStatic((state) => state.setUi)
+ const setStaticFilters = useStatic((state) => state.setFilters)
+ const setWebhookData = useStatic((state) => state.setWebhookData)
+ const setIsNight = useStatic((state) => state.setIsNight)
const localState = JSON.parse(localStorage.getItem('local-state'))
@@ -62,14 +69,17 @@ export default function useConfig(serverSettings, params) {
})
Sentry.setUser({
username: serverSettings.user.username,
- id: serverSettings.user.discordId
- || serverSettings.user.telegramId
- || serverSettings.user.id,
+ id:
+ serverSettings.user.discordId ||
+ serverSettings.user.telegramId ||
+ serverSettings.user.id,
})
- setTutorial(serverSettings.user.tutorial === undefined
- ? Boolean(localState?.state?.tutorial)
- : !serverSettings.user.tutorial)
+ setTutorial(
+ serverSettings.user.tutorial === undefined
+ ? Boolean(localState?.state?.tutorial)
+ : !serverSettings.user.tutorial,
+ )
setUi(serverSettings.ui)
setMasterfile(serverSettings.masterfile)
@@ -90,19 +100,26 @@ export default function useConfig(serverSettings, params) {
if (localState?.state?.settings) {
const cached = localState.state.settings.localeSelection
const i18cached = localStorage.getItem('i18nextLng')
- localState.state.settings.localeSelection = cached !== i18cached ? i18cached : cached
+ localState.state.settings.localeSelection =
+ cached !== i18cached ? i18cached : cached
const validNav = Object.keys(serverSettings.config.navigation)
- localState.state.settings.navigation = validNav.includes(localState.state.settings.navigation)
+ localState.state.settings.navigation = validNav.includes(
+ localState.state.settings.navigation,
+ )
? localState.state.settings.navigation
: serverSettings.config.navigation[validNav[0]]?.name
const validTs = Object.keys(serverSettings.config.tileServers)
- localState.state.settings.tileServers = validTs.includes(localState.state.settings.tileServers)
+ localState.state.settings.tileServers = validTs.includes(
+ localState.state.settings.tileServers,
+ )
? localState.state.settings.tileServers
: serverSettings.config.tileServers[validTs[0]]?.name
} else {
- serverSettings.settings.localeSelection = localStorage.getItem('i18nextLng') || serverSettings.settings.localeSelection
+ serverSettings.settings.localeSelection =
+ localStorage.getItem('i18nextLng') ||
+ serverSettings.settings.localeSelection
}
setSettings(updateObjState(serverSettings.settings, 'settings'))
@@ -119,17 +136,29 @@ export default function useConfig(serverSettings, params) {
setConfig(serverSettings.config)
setWebhookData(serverSettings.webhooks)
- if (localState?.state && serverSettings?.webhooks?.[localState.state?.selectedWebhook]) {
+ if (
+ localState?.state &&
+ serverSettings?.webhooks?.[localState.state?.selectedWebhook]
+ ) {
setSelectedWebhook(localState.state.selectedWebhook)
} else if (serverSettings?.webhooks) {
setSelectedWebhook(Object.keys(serverSettings.webhooks)[0])
}
- const location = params.lat && params.lon
- ? [params.lat, params.lon]
- : updatePositionState([serverSettings.config.map.startLat, serverSettings.config.map.startLon], 'location')
-
- const zoom = params.zoom || updatePositionState(serverSettings.config.map.startZoom, 'zoom')
+ const location =
+ params.lat && params.lon
+ ? [params.lat, params.lon]
+ : updatePositionState(
+ [
+ serverSettings.config.map.startLat,
+ serverSettings.config.map.startLon,
+ ],
+ 'location',
+ )
+
+ const zoom =
+ params.zoom ||
+ updatePositionState(serverSettings.config.map.startZoom, 'zoom')
setZoom(zoom)
setLocation(location)
diff --git a/src/hooks/useFilter.js b/src/hooks/useFilter.js
index 3b59feee5..a2a480ad5 100644
--- a/src/hooks/useFilter.js
+++ b/src/hooks/useFilter.js
@@ -3,21 +3,31 @@ import { useTranslation } from 'react-i18next'
import { useStatic } from '@hooks/useStore'
-const filteringPokemon = ['pokemon', 'quest_reward_4', 'quest_reward_9', 'quest_reward_12']
+const filteringPokemon = [
+ 'pokemon',
+ 'quest_reward_4',
+ 'quest_reward_9',
+ 'quest_reward_12',
+]
-export default function useFilter(tempFilters, menus, search, category, webhookCategory, reqCategories) {
+export default function useFilter(
+ tempFilters,
+ menus,
+ search,
+ category,
+ webhookCategory,
+ reqCategories,
+) {
const { t } = useTranslation()
- const available = useStatic(useCallback(s => s.available, []))
- const Icons = useStatic(useCallback(s => s.Icons, []))
- const { perms } = useStatic(useCallback(s => s.auth, []))
- const { pokemon } = useStatic(useCallback(s => s.masterfile, []))
- const setExcludeList = useStatic(useCallback(s => s.setExcludeList, []))
- const menuFilters = useStatic(useCallback(s => s.menuFilters, []))
+ const available = useStatic(useCallback((s) => s.available, []))
+ const Icons = useStatic(useCallback((s) => s.Icons, []))
+ const { perms } = useStatic(useCallback((s) => s.auth, []))
+ const { pokemon } = useStatic(useCallback((s) => s.masterfile, []))
+ const setExcludeList = useStatic(useCallback((s) => s.setExcludeList, []))
+ const menuFilters = useStatic(useCallback((s) => s.menuFilters, []))
const {
- filters: {
- generations, types, rarity, forms, others, categories,
- },
+ filters: { generations, types, rarity, forms, others, categories },
} = menus[category]
const tempAdvFilter = {}
const filteredArr = []
@@ -26,10 +36,12 @@ export default function useFilter(tempFilters, menus, search, category, webhookC
const count = { total: 0, show: 0 }
let switchKey
- Object.keys(menus[category].filters).forEach(subCategory => {
- tempAdvFilter[subCategory] = Object.values(menus[category].filters[subCategory]).every(val => val === false)
+ Object.keys(menus[category].filters).forEach((subCategory) => {
+ tempAdvFilter[subCategory] = Object.values(
+ menus[category].filters[subCategory],
+ ).every((val) => val === false)
})
- tempAdvFilter.all = Object.values(tempAdvFilter).every(val => val === true)
+ tempAdvFilter.all = Object.values(tempAdvFilter).every((val) => val === true)
if ((others.selected && others.unselected) || tempAdvFilter.all) {
switchKey = 'all'
@@ -50,27 +62,27 @@ export default function useFilter(tempFilters, menus, search, category, webhookC
filteredArr.push(item)
}
- const evalSearchTerms = term => {
+ const evalSearchTerms = (term) => {
if (term.includes('&')) {
searchTerms.push(term.split('&'))
}
if (term.includes('+')) {
const cleaned = term.slice(1)
- const families = Object.keys(pokemon).filter(id => {
+ const families = Object.keys(pokemon).filter((id) => {
const name = t(`poke_${id}`)
- return (name.toLowerCase().includes(cleaned))
+ return name.toLowerCase().includes(cleaned)
})
if (families && term.slice(1)) {
- const familyIds = families.map(item => +pokemon[item].family)
+ const familyIds = families.map((item) => +pokemon[item].family)
searchTerms.push(...new Set(familyIds))
}
}
searchTerms.push(term)
}
- const typeResolver = pkmnTypes => {
+ const typeResolver = (pkmnTypes) => {
let typeCount = 0
- Object.values(types).forEach(pkmnType => {
+ Object.values(types).forEach((pkmnType) => {
if (pkmnType) typeCount += 1
})
if (typeCount === 2) {
@@ -85,8 +97,8 @@ export default function useFilter(tempFilters, menus, search, category, webhookC
switchKey = 'search'
search = search.replace(/,/g, '|')
if (search.includes('|')) {
- const orSplit = search.split('|').map(term => term.trim())
- orSplit.forEach(term => {
+ const orSplit = search.split('|').map((term) => term.trim())
+ orSplit.forEach((term) => {
evalSearchTerms(term)
})
} else {
@@ -98,83 +110,119 @@ export default function useFilter(tempFilters, menus, search, category, webhookC
reqCategories = Object.keys(categories)
}
- reqCategories.forEach(subCategory => {
+ reqCategories.forEach((subCategory) => {
Object.entries(menuFilters[subCategory] || {}).forEach(([id, item]) => {
- if (item.perms.some(perm => perms[perm])
- && (item.webhookOnly
- ? webhookCategory && tempFilters[id]
- : true)) {
- if (!item.name.endsWith('*') || (item.name.endsWith('*') && category === item.category)) {
+ if (
+ item.perms.some((perm) => perms[perm]) &&
+ (item.webhookOnly ? webhookCategory && tempFilters[id] : true)
+ ) {
+ if (
+ !item.name.endsWith('*') ||
+ (item.name.endsWith('*') && category === item.category)
+ ) {
count.total += 1
item.id = id
switch (switchKey) {
- case 'all': addItem(id, item); break
- case 'selected': if (tempFilters[id]?.enabled) addItem(id, item); break
- case 'unselected': if (!tempFilters[id]?.enabled) addItem(id, item); break
+ case 'all':
+ addItem(id, item)
+ break
+ case 'selected':
+ if (tempFilters[id]?.enabled) addItem(id, item)
+ break
+ case 'unselected':
+ if (!tempFilters[id]?.enabled) addItem(id, item)
+ break
case 'reverse':
if (filteringPokemon.includes(subCategory) || item.webhookOnly) {
- if (((tempAdvFilter.generations || generations[item.genId])
- && (tempAdvFilter.types || typeResolver(item.formTypes))
- && (tempAdvFilter.rarity || rarity[item.rarity])
- && (tempAdvFilter.categories || categories[subCategory])
- && (tempAdvFilter.forms
- || forms[item.formName]
- || (forms.altForms && item.formId != item.defaultFormId)
- || (forms.normalForms && item.formId === item.defaultFormId)
- )) || item.webhookOnly) {
+ if (
+ ((tempAdvFilter.generations || generations[item.genId]) &&
+ (tempAdvFilter.types || typeResolver(item.formTypes)) &&
+ (tempAdvFilter.rarity || rarity[item.rarity]) &&
+ (tempAdvFilter.categories || categories[subCategory]) &&
+ (tempAdvFilter.forms ||
+ forms[item.formName] ||
+ (forms.altForms && item.formId != item.defaultFormId) ||
+ (forms.normalForms &&
+ item.formId === item.defaultFormId))) ||
+ item.webhookOnly
+ ) {
addItem(id, item)
}
- } else if ((tempAdvFilter.categories || categories[subCategory]) || item.webhookOnly) {
+ } else if (
+ tempAdvFilter.categories ||
+ categories[subCategory] ||
+ item.webhookOnly
+ ) {
addItem(id, item)
- } break
+ }
+ break
case 'available':
- if ((available?.[category]?.includes(id) || id.startsWith('t')) || item.webhookOnly) {
+ if (
+ available?.[category]?.includes(id) ||
+ id.startsWith('t') ||
+ item.webhookOnly
+ ) {
if (filteringPokemon.includes(subCategory)) {
- if (((tempAdvFilter.generations || generations[item.genId])
- && (tempAdvFilter.types || typeResolver(item.formTypes))
- && (tempAdvFilter.rarity || rarity[item.rarity])
- && (tempAdvFilter.categories || categories[subCategory])
- && (tempAdvFilter.forms
- || forms[item.formName]
- || (forms.altForms && item.formId != item.defaultFormId)
- || (forms.normalForms && item.formId === item.defaultFormId)
- )) || item.webhookOnly) {
+ if (
+ ((tempAdvFilter.generations || generations[item.genId]) &&
+ (tempAdvFilter.types || typeResolver(item.formTypes)) &&
+ (tempAdvFilter.rarity || rarity[item.rarity]) &&
+ (tempAdvFilter.categories || categories[subCategory]) &&
+ (tempAdvFilter.forms ||
+ forms[item.formName] ||
+ (forms.altForms && item.formId != item.defaultFormId) ||
+ (forms.normalForms &&
+ item.formId === item.defaultFormId))) ||
+ item.webhookOnly
+ ) {
addItem(id, item)
}
- } else if (tempAdvFilter.categories || categories[subCategory] || item.webhookOnly) {
+ } else if (
+ tempAdvFilter.categories ||
+ categories[subCategory] ||
+ item.webhookOnly
+ ) {
addItem(id, item)
}
- } break
+ }
+ break
case 'search':
- searchTerms.forEach(term => {
+ searchTerms.forEach((term) => {
const meta = item.searchMeta || item.name
switch (typeof term) {
case 'string':
term = term.trim()
- if ((meta.includes(term)) || item.pokedexId == term) {
+ if (meta.includes(term) || item.pokedexId == term) {
addItem(id, item)
- } break
+ }
+ break
case 'number':
- if (item.family === term) addItem(id, item); break
+ if (item.family === term) addItem(id, item)
+ break
default:
- if (term.every(subTerm => meta.includes(subTerm))) addItem(id, item)
+ if (term.every((subTerm) => meta.includes(subTerm)))
+ addItem(id, item)
}
- }); break
+ })
+ break
default:
if (filteringPokemon.includes(subCategory)) {
- if (generations[item.genId]
- || item.formTypes.some(x => types[x])
- || rarity[item.rarity]
- || (forms[item.name]
- || (forms.altForms && item.formId != item.defaultFormId)
- || (forms.normalForms && item.formId === item.defaultFormId))
- || categories[subCategory]
- || item.webhookOnly) {
+ if (
+ generations[item.genId] ||
+ item.formTypes.some((x) => types[x]) ||
+ rarity[item.rarity] ||
+ forms[item.name] ||
+ (forms.altForms && item.formId != item.defaultFormId) ||
+ (forms.normalForms && item.formId === item.defaultFormId) ||
+ categories[subCategory] ||
+ item.webhookOnly
+ ) {
addItem(id, item)
}
} else if (categories[subCategory] || item.webhookOnly) {
addItem(id, item)
- } break
+ }
+ break
}
}
}
diff --git a/src/hooks/useGenerate.js b/src/hooks/useGenerate.js
index 4012c8cd9..80830cd51 100644
--- a/src/hooks/useGenerate.js
+++ b/src/hooks/useGenerate.js
@@ -9,15 +9,20 @@ import { useStatic } from '@hooks/useStore'
export default function useGenerate() {
const { t } = useTranslation()
- const { pokemon } = useStatic(s => s.masterfile)
- const { gyms, pokestops } = useStatic(s => s.filters)
- const staticMenus = useStatic(s => s.menus)
- const setMenuFilters = useStatic(s => s.setMenuFilters)
+ const { pokemon } = useStatic((s) => s.masterfile)
+ const { gyms, pokestops } = useStatic((s) => s.filters)
+ const staticMenus = useStatic((s) => s.menus)
+ const setMenuFilters = useStatic((s) => s.setMenuFilters)
useEffect(() => {
const pokeFilters = genPokemon(t, pokemon, staticMenus.pokemon.categories)
const gymFilters = genGyms(t, gyms, staticMenus.gyms.categories)
- const stopFilters = genPokestops(t, pokemon, pokestops, staticMenus.pokestops.categories)
+ const stopFilters = genPokestops(
+ t,
+ pokemon,
+ pokestops,
+ staticMenus.pokestops.categories,
+ )
setMenuFilters({ ...gymFilters, ...stopFilters, ...pokeFilters })
}, [localStorage.getItem('i18nextLng'), pokemon])
diff --git a/src/hooks/useLocation.js b/src/hooks/useLocation.js
index 7c92bd38b..5778eadc9 100644
--- a/src/hooks/useLocation.js
+++ b/src/hooks/useLocation.js
@@ -18,7 +18,10 @@ export default function useLocation(map) {
setColor('inherit')
},
onAdd() {
- const container = L.DomUtil.create('div', 'react-locate-control leaflet-bar leaflet-control')
+ const container = L.DomUtil.create(
+ 'div',
+ 'react-locate-control leaflet-bar leaflet-control',
+ )
this._container = container
this._map = map
this._layer = this.options.layer || new L.LayerGroup()
@@ -27,7 +30,10 @@ export default function useLocation(map) {
this._compassHeading = null
this._prevBounds = null
- const linkAndIcon = this.options.createButtonCallback(container, this.options)
+ const linkAndIcon = this.options.createButtonCallback(
+ container,
+ this.options,
+ )
this._link = linkAndIcon.link
this._icon = linkAndIcon.icon
diff --git a/src/hooks/useMarkerTimer.js b/src/hooks/useMarkerTimer.js
index d43834d4e..da442a064 100644
--- a/src/hooks/useMarkerTimer.js
+++ b/src/hooks/useMarkerTimer.js
@@ -1,6 +1,13 @@
import { useEffect } from 'react'
-export default function useMarkerTimer(itemExpire, itemId, ref, map, ts, callback) {
+export default function useMarkerTimer(
+ itemExpire,
+ itemId,
+ ref,
+ map,
+ ts,
+ callback,
+) {
useEffect(() => {
if (itemExpire > ts && itemExpire !== Infinity) {
const timeout = setTimeout(() => {
diff --git a/src/hooks/useRefresh.js b/src/hooks/useRefresh.js
index 493ee7f2c..7ab735529 100644
--- a/src/hooks/useRefresh.js
+++ b/src/hooks/useRefresh.js
@@ -5,10 +5,10 @@ import { useEffect } from 'react'
import { useStatic } from './useStore'
export default function useRefresh() {
- const setAvailable = useStatic(s => s.setAvailable)
- const setMasterfile = useStatic(s => s.setMasterfile)
- const setStaticFilters = useStatic(s => s.setFilters)
- const active = useStatic(s => s.active)
+ const setAvailable = useStatic((s) => s.setAvailable)
+ const setMasterfile = useStatic((s) => s.setMasterfile)
+ const setStaticFilters = useStatic((s) => s.setFilters)
+ const active = useStatic((s) => s.active)
const { data, stopPolling, startPolling } = useQuery(getAvailable, {
variables: { version: inject.VERSION },
diff --git a/src/hooks/useStore.js b/src/hooks/useStore.js
index 7f1520062..57b61f90d 100644
--- a/src/hooks/useStore.js
+++ b/src/hooks/useStore.js
@@ -1,59 +1,67 @@
import create from 'zustand'
import { persist } from 'zustand/middleware'
-export const useStore = create(persist(
- set => ({
- location: undefined,
- setLocation: (location) => set({ location }),
- zoom: undefined,
- setZoom: (zoom) => set({ zoom }),
- filters: undefined,
- setFilters: (filters) => set({ filters }),
- settings: undefined,
- setSettings: (settings) => set({ settings }),
- userSettings: undefined,
- setUserSettings: (userSettings) => set({ userSettings }),
- icons: undefined,
- setIcons: (icons) => set({ icons }),
- menus: undefined,
- setMenus: (menus) => set({ menus }),
- tutorial: true,
- setTutorial: (tutorial) => set({ tutorial }),
- sidebar: undefined,
- setSidebar: (sidebar) => set({ sidebar }),
- advMenu: {
- pokemon: 'others',
- gyms: 'categories',
- pokestops: 'categories',
- nests: 'others',
+export const useStore = create(
+ persist(
+ (set) => ({
+ location: undefined,
+ setLocation: (location) => set({ location }),
+ zoom: undefined,
+ setZoom: (zoom) => set({ zoom }),
+ filters: undefined,
+ setFilters: (filters) => set({ filters }),
+ settings: undefined,
+ setSettings: (settings) => set({ settings }),
+ userSettings: undefined,
+ setUserSettings: (userSettings) => set({ userSettings }),
+ icons: undefined,
+ setIcons: (icons) => set({ icons }),
+ menus: undefined,
+ setMenus: (menus) => set({ menus }),
+ tutorial: true,
+ setTutorial: (tutorial) => set({ tutorial }),
+ sidebar: undefined,
+ setSidebar: (sidebar) => set({ sidebar }),
+ advMenu: {
+ pokemon: 'others',
+ gyms: 'categories',
+ pokestops: 'categories',
+ nests: 'others',
+ },
+ setAdvMenu: (advMenu) => set({ advMenu }),
+ search: '',
+ setSearch: (search) => set({ search }),
+ searchTab: 0,
+ setSearchTab: (searchTab) => set({ searchTab }),
+ selectedWebhook: undefined,
+ setSelectedWebhook: (selectedWebhook) => set({ selectedWebhook }),
+ webhookAdv: {
+ primary: true,
+ advanced: false,
+ pvp: false,
+ distance: true,
+ global: true,
+ },
+ setWebhookAdv: (webhookAdv) => set({ webhookAdv }),
+ popups: {
+ invasions: false,
+ extras: false,
+ raids: true,
+ pvp: false,
+ names: true,
+ },
+ setPopups: (popups) => set({ popups }),
+ motdIndex: 0,
+ setMotdIndex: (motdIndex) => set({ motdIndex }),
+ }),
+ {
+ name: 'local-state',
+ getStorage: () => localStorage,
},
- setAdvMenu: (advMenu) => set({ advMenu }),
- search: '',
- setSearch: (search) => set({ search }),
- searchTab: 0,
- setSearchTab: (searchTab) => set({ searchTab }),
- selectedWebhook: undefined,
- setSelectedWebhook: (selectedWebhook) => set({ selectedWebhook }),
- webhookAdv: { primary: true, advanced: false, pvp: false, distance: true, global: true },
- setWebhookAdv: (webhookAdv) => set({ webhookAdv }),
- popups: {
- invasions: false,
- extras: false,
- raids: true,
- pvp: false,
- names: true,
- },
- setPopups: (popups) => set({ popups }),
- motdIndex: 0,
- setMotdIndex: (motdIndex) => set({ motdIndex }),
- }),
- {
- name: 'local-state',
- getStorage: () => localStorage,
- },
-))
+ ),
+)
-export const useStatic = create(set => ({
+export const useStatic = create((set) => ({
active: true,
setActive: (active) => set({ active }),
auth: { discord: true, loggedIn: false, perms: {} },
@@ -85,7 +93,9 @@ export const useStatic = create(set => ({
timerList: [],
setTimerList: (timerList) => set({ timerList }),
webhookAlert: {
- open: false, severity: 'info', message: '',
+ open: false,
+ severity: 'info',
+ message: '',
},
setWebhookAlert: (webhookAlert) => set({ webhookAlert }),
webhookData: undefined,
diff --git a/src/hooks/useStyles.js b/src/hooks/useStyles.js
index 456b94296..f81573467 100644
--- a/src/hooks/useStyles.js
+++ b/src/hooks/useStyles.js
@@ -1,7 +1,7 @@
import { makeStyles } from '@material-ui/styles'
import { purple } from '@material-ui/core/colors'
-export default makeStyles(theme => ({
+export default makeStyles((theme) => ({
gridItem: {
height: 75,
width: 'auto',
diff --git a/src/hooks/useWebhook.js b/src/hooks/useWebhook.js
index 8c6312c5e..c5a4f4daf 100644
--- a/src/hooks/useWebhook.js
+++ b/src/hooks/useWebhook.js
@@ -7,16 +7,22 @@ import { useStatic } from '@hooks/useStore'
export default function useWebhook({ category, selectedWebhook }) {
const [syncWebhook, { data }] = useMutation(Query.webhook('quickAdd'))
const { t } = useTranslation()
- const webhookData = useStatic(state => state.webhookData)
- const setWebhookData = useStatic(state => state.setWebhookData)
- const setWebhookAlert = useStatic(state => state.setWebhookAlert)
+ const webhookData = useStatic((state) => state.webhookData)
+ const setWebhookData = useStatic((state) => state.setWebhookData)
+ const setWebhookAlert = useStatic((state) => state.setWebhookAlert)
useEffect(() => {
if (data?.webhook) {
if (data.webhook.status === 'success') {
- data.webhook.message = t(`webhook_success_${category.replace('quick', '').toLowerCase()}`)
+ data.webhook.message = t(
+ `webhook_success_${category.replace('quick', '').toLowerCase()}`,
+ )
}
- setWebhookAlert({ open: true, severity: data.webhook.status, message: data.webhook.message })
+ setWebhookAlert({
+ open: true,
+ severity: data.webhook.status,
+ message: data.webhook.message,
+ })
if (webhookData?.[selectedWebhook]) {
return setWebhookData({
...webhookData,
diff --git a/src/index.jsx b/src/index.jsx
index b903e21a6..dcb545536 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -9,8 +9,15 @@ import './services/i18n'
if (inject) {
const {
- GOOGLE_ANALYTICS_ID, ANALYTICS_DEBUG_MODE, TITLE, VERSION, CUSTOM,
- SENTRY_DSN, SENTRY_TRACES_SAMPLE_RATE, DEVELOPMENT, SENTRY_DEBUG,
+ GOOGLE_ANALYTICS_ID,
+ ANALYTICS_DEBUG_MODE,
+ TITLE,
+ VERSION,
+ CUSTOM,
+ SENTRY_DSN,
+ SENTRY_TRACES_SAMPLE_RATE,
+ DEVELOPMENT,
+ SENTRY_DEBUG,
} = inject
if (GOOGLE_ANALYTICS_ID) {
ReactGA.initialize(GOOGLE_ANALYTICS_ID, { debug: ANALYTICS_DEBUG_MODE })
@@ -19,19 +26,25 @@ if (inject) {
document.title = TITLE
}
Sentry.init({
- dsn: SENTRY_DSN || 'https://c40dad799323428f83aee04391639345@o1096501.ingest.sentry.io/6117162',
+ dsn:
+ SENTRY_DSN ||
+ 'https://c40dad799323428f83aee04391639345@o1096501.ingest.sentry.io/6117162',
integrations: [new Integrations.BrowserTracing()],
- tracesSampleRate: SENTRY_TRACES_SAMPLE_RATE ? +SENTRY_TRACES_SAMPLE_RATE : 0.1,
+ tracesSampleRate: SENTRY_TRACES_SAMPLE_RATE
+ ? +SENTRY_TRACES_SAMPLE_RATE
+ : 0.1,
release: VERSION,
environment: DEVELOPMENT ? 'development' : 'production',
debug: SENTRY_DEBUG,
beforeSend: async (event) => {
const errors = event.exception.values
- const isLibrary = errors.find(e => e?.value?.includes('_'))
- const fetchError = errors.find(e => e?.value?.includes('<'))
+ const isLibrary = errors.find((e) => e?.value?.includes('_'))
+ const fetchError = errors.find((e) => e?.value?.includes('<'))
if (!isLibrary) {
- const error = errors[0] ? `${errors[0].type}: ${errors[0].value}` : 'Unknown error'
+ const error = errors[0]
+ ? `${errors[0].type}: ${errors[0].value}`
+ : 'Unknown error'
await fetch('/clientError', {
method: 'POST',
headers: {
diff --git a/src/services/Fetch.js b/src/services/Fetch.js
index 79061f0d0..972f8df50 100644
--- a/src/services/Fetch.js
+++ b/src/services/Fetch.js
@@ -10,7 +10,10 @@ export default class Fetch {
const body = await response.json()
return body.serverSettings
} catch (error) {
- console.error(error.message, '\nUnable to fetch settings at this time, please try again later.')
+ console.error(
+ error.message,
+ '\nUnable to fetch settings at this time, please try again later.',
+ )
return { error: true, status: 500 }
}
}
@@ -25,7 +28,10 @@ export default class Fetch {
body: JSON.stringify(user),
})
} catch (error) {
- console.error(error.message, '\nUnable to login at this time, please try again later.')
+ console.error(
+ error.message,
+ '\nUnable to login at this time, please try again later.',
+ )
return { error: true, status: 500 }
}
}
diff --git a/src/services/HolidayAnimations.js b/src/services/HolidayAnimations.js
index 191b9b395..45c49d612 100644
--- a/src/services/HolidayAnimations.js
+++ b/src/services/HolidayAnimations.js
@@ -17,9 +17,9 @@ export default class HolidayAnimations {
}
move() {
- this.images.forEach(item => {
+ this.images.forEach((item) => {
item.y += item.ys
- item.x += item.x > (this.h / 2) ? item.xs : -item.xs
+ item.x += item.x > this.h / 2 ? item.xs : -item.xs
if (item.y > this.h) {
item.x = Math.random() * this.w
item.y = -1 * this.imageHeight
@@ -30,7 +30,7 @@ export default class HolidayAnimations {
draw() {
this.setCanvasSize()
this.ctx.clearRect(0, 0, this.w, this.h)
- this.images.forEach(item => {
+ this.images.forEach((item) => {
item.image = new Image()
item.image.style.height = item.height
item.image.src = this.image
@@ -46,7 +46,7 @@ export default class HolidayAnimations {
}
this.setCanvasSize()
for (let a = 0; a < 30; a += 1) {
- const scale = (Math.random() * (1 - this.minScale)) + this.minScale
+ const scale = Math.random() * (1 - this.minScale) + this.minScale
this.images.push({
x: Math.random() * this.w,
xs: Math.random() * 2 - 1,
diff --git a/src/services/Icons.js b/src/services/Icons.js
index dae970373..f885bd3a4 100644
--- a/src/services/Icons.js
+++ b/src/services/Icons.js
@@ -14,15 +14,17 @@ export default class UIcons {
},
}
this.cacheMs = cacheHrs * 60 * 60 * 1000
- Object.entries(questRewardTypes).forEach(([id, category]) => (
- this.questRewardTypes[id] = category.toLowerCase().replace(' ', '_')
- ))
+ Object.entries(questRewardTypes).forEach(
+ ([id, category]) =>
+ (this.questRewardTypes[id] = category.toLowerCase().replace(' ', '_')),
+ )
}
build(icons) {
- const baseUrl = 'https://raw.githubusercontent.com/WatWowMap/wwm-uicons/main/'
+ const baseUrl =
+ 'https://raw.githubusercontent.com/WatWowMap/wwm-uicons/main/'
- icons.forEach(icon => {
+ icons.forEach((icon) => {
try {
const { data } = icon
if (data) {
@@ -34,16 +36,22 @@ export default class UIcons {
if (!this[icon.name].modifiers) {
this[icon.name].modifiers = {}
}
- this[icon.name].indexes.forEach(category => {
+ this[icon.name].indexes.forEach((category) => {
let isValid = false
- if (!parseInt(category) && category !== '0' && category !== 'lastFetched') {
+ if (
+ !parseInt(category) &&
+ category !== '0' &&
+ category !== 'lastFetched'
+ ) {
if (Array.isArray(data[category])) {
this[icon.name][category] = new Set(data[category])
isValid = true
} else {
- Object.keys(data[category]).forEach(subCategory => {
+ Object.keys(data[category]).forEach((subCategory) => {
if (Array.isArray(data[category][subCategory])) {
- this[icon.name][subCategory] = new Set(data[category][subCategory])
+ this[icon.name][subCategory] = new Set(
+ data[category][subCategory],
+ )
isValid = true
}
})
@@ -84,12 +92,12 @@ export default class UIcons {
}
checkValid(localIconObj) {
- return Object.values(localIconObj).every(icon => this[icon])
+ return Object.values(localIconObj).every((icon) => this[icon])
}
setSelection(categories, value) {
if (typeof categories === 'object') {
- Object.keys(categories).forEach(category => {
+ Object.keys(categories).forEach((category) => {
if (category !== 'misc') {
this.selected[category] = categories[category]
this.modifiers[category] = this[categories[category]]
@@ -121,24 +129,45 @@ export default class UIcons {
getIconById(id) {
switch (id.charAt(0)) {
- case 'c': return this.getRewards(4, ...id.slice(1).split('-'))
- case 'd': return this.getRewards(3, id.slice(1))
- case 'e': return this.getEggs(id.slice(1), false)
- case 'g': return this.getGyms(...id.slice(1).split('-'))
- case 'i': return this.getInvasions(id.slice(1))
- case 'l': return this.getPokestops(id.slice(1))
- case 'm': return this.getPokemon(id.slice(1).split('-')[0], 0, 1)
- case 'q': return this.getRewards(2, ...id.slice(1).split('-'))
- case 'r': return this.getEggs(id.slice(1), true)
- case 's': return this.getPokestops(0)
- case 't': return this.getGyms(...id.slice(1).split('-'))
- case 'u': return this.getRewards(id.slice(1))
- case 'x': return this.getRewards(9, ...id.slice(1).split('-'))
- default: return this.getPokemon(...id.split('-'))
+ case 'c':
+ return this.getRewards(4, ...id.slice(1).split('-'))
+ case 'd':
+ return this.getRewards(3, id.slice(1))
+ case 'e':
+ return this.getEggs(id.slice(1), false)
+ case 'g':
+ return this.getGyms(...id.slice(1).split('-'))
+ case 'i':
+ return this.getInvasions(id.slice(1))
+ case 'l':
+ return this.getPokestops(id.slice(1))
+ case 'm':
+ return this.getPokemon(id.slice(1).split('-')[0], 0, 1)
+ case 'q':
+ return this.getRewards(2, ...id.slice(1).split('-'))
+ case 'r':
+ return this.getEggs(id.slice(1), true)
+ case 's':
+ return this.getPokestops(0)
+ case 't':
+ return this.getGyms(...id.slice(1).split('-'))
+ case 'u':
+ return this.getRewards(id.slice(1))
+ case 'x':
+ return this.getRewards(9, ...id.slice(1).split('-'))
+ default:
+ return this.getPokemon(...id.split('-'))
}
}
- getPokemon(pokemonId, form = 0, evolution = 0, gender = 0, costume = 0, shiny = false) {
+ getPokemon(
+ pokemonId,
+ form = 0,
+ evolution = 0,
+ gender = 0,
+ costume = 0,
+ shiny = false,
+ ) {
const baseUrl = `${this[this.selected.pokemon].path}/pokemon`
const evolutionSuffixes = evolution ? [`_e${evolution}`, ''] : ['']
const formSuffixes = form ? [`_f${form}`, ''] : ['']
@@ -171,7 +200,12 @@ export default class UIcons {
return `${baseUrl}/0.png`
}
- getPokestops(lureId, invasionActive = false, questActive = false, ar = false) {
+ getPokestops(
+ lureId,
+ invasionActive = false,
+ questActive = false,
+ ar = false,
+ ) {
const baseUrl = `${this[this.selected.pokestop].path}/pokestop`
const invasionSuffixes = invasionActive ? ['_i', ''] : ['']
const questSuffixes = questActive ? ['_q', ''] : ['']
@@ -213,7 +247,13 @@ export default class UIcons {
return `${baseUrl}/0.png`
}
- getGyms(teamId = 0, trainerCount = 0, inBattle = false, ex = false, ar = false) {
+ getGyms(
+ teamId = 0,
+ trainerCount = 0,
+ inBattle = false,
+ ex = false,
+ ar = false,
+ ) {
const baseUrl = `${this[this.selected.gym].path}/gym`
const trainerSuffixes = trainerCount ? [`_t${trainerCount}`, ''] : ['']
const inBattleSuffixes = inBattle ? ['_b', ''] : ['']
@@ -241,7 +281,10 @@ export default class UIcons {
for (let h = 0; h < hatchedSuffixes.length; h += 1) {
for (let e = 0; e < exSuffixes.length; e += 1) {
const result = `${level}${hatchedSuffixes[h]}${exSuffixes[e]}.png`
- if (this[this.selected.raid].egg && this[this.selected.raid].egg.has(result)) {
+ if (
+ this[this.selected.raid].egg &&
+ this[this.selected.raid].egg.has(result)
+ ) {
return `${baseUrl}/${result}`
}
}
@@ -284,11 +327,14 @@ export default class UIcons {
switch (true) {
case this[this.selected.misc].misc.has(`${fileName}.png`):
return `${baseUrl}/${fileName}.png`
- case fileName.endsWith('s') && this[this.selected.misc].misc.has(`${fileName.slice(0, -1)}.png`):
+ case fileName.endsWith('s') &&
+ this[this.selected.misc].misc.has(`${fileName.slice(0, -1)}.png`):
return `${baseUrl}/${fileName.slice(0, -1)}.png`
- case !fileName.endsWith('s') && this[this.selected.misc].misc.has(`${fileName}s.png`):
+ case !fileName.endsWith('s') &&
+ this[this.selected.misc].misc.has(`${fileName}s.png`):
return `${baseUrl}/${fileName}s.png`
- default: return `${baseUrl}/0.png`
+ default:
+ return `${baseUrl}/0.png`
}
}
diff --git a/src/services/Poracle.js b/src/services/Poracle.js
index eec428040..cd52e5da4 100644
--- a/src/services/Poracle.js
+++ b/src/services/Poracle.js
@@ -1,7 +1,10 @@
export default class Poracle {
static filterGenerator = (poracleInfo, reactMapFilters, invasions) => {
try {
- const { info: { pokemon, raid, egg, invasion, lure, nest, quest, gym }, human } = poracleInfo
+ const {
+ info: { pokemon, raid, egg, invasion, lure, nest, quest, gym },
+ human,
+ } = poracleInfo
const filters = {
pokemon: {
global: { ...pokemon.defaults, profile_no: human.current_profile_no },
@@ -9,19 +12,34 @@ export default class Poracle {
},
raid: {
global: { ...raid.defaults, profile_no: human.current_profile_no },
- r90: { ...raid.defaults, level: 90, profile_no: human.current_profile_no },
+ r90: {
+ ...raid.defaults,
+ level: 90,
+ profile_no: human.current_profile_no,
+ },
},
egg: {
global: { ...egg.defaults, profile_no: human.current_profile_no },
- e90: { ...egg.defaults, level: 90, profile_no: human.current_profile_no },
+ e90: {
+ ...egg.defaults,
+ level: 90,
+ profile_no: human.current_profile_no,
+ },
},
gym: {
global: { ...gym.defaults, profile_no: human.current_profile_no },
t4: { ...gym.defaults, profile_no: human.current_profile_no },
},
invasion: {
- global: { ...invasion.defaults, profile_no: human.current_profile_no },
- i0: { ...invasion.defaults, grunt_type: 'everything', profile_no: human.current_profile_no },
+ global: {
+ ...invasion.defaults,
+ profile_no: human.current_profile_no,
+ },
+ i0: {
+ ...invasion.defaults,
+ grunt_type: 'everything',
+ profile_no: human.current_profile_no,
+ },
},
lure: {
global: { ...lure.defaults, profile_no: human.current_profile_no },
@@ -33,7 +51,7 @@ export default class Poracle {
global: { ...quest.defaults, profile_no: human.current_profile_no },
},
}
- Object.keys(reactMapFilters.pokemon.filter).forEach(key => {
+ Object.keys(reactMapFilters.pokemon.filter).forEach((key) => {
filters.pokemon[key] = {
...pokemon.defaults,
pokemon_id: +key.split('-')[0],
@@ -74,7 +92,7 @@ export default class Poracle {
delete filters.quest[key].form
}
})
- Object.keys(reactMapFilters.pokestops.filter).forEach(key => {
+ Object.keys(reactMapFilters.pokestops.filter).forEach((key) => {
if (key.startsWith('i')) {
filters.invasion[key] = {
...invasion.defaults,
@@ -147,7 +165,7 @@ export default class Poracle {
delete filters.quest[key].amount
}
})
- Object.keys(reactMapFilters.gyms.filter).forEach(key => {
+ Object.keys(reactMapFilters.gyms.filter).forEach((key) => {
if (key.startsWith('r')) {
filters.raid[key] = {
...raid.defaults,
@@ -188,94 +206,138 @@ export default class Poracle {
switch (poracleCategory) {
case 'gym':
case 'egg':
- case 'raid': return 'gyms'
+ case 'raid':
+ return 'gyms'
case 'invasion':
case 'lure':
- case 'quest': return 'pokestops'
- case 'nest': return 'nests'
- default: return poracleCategory
+ case 'quest':
+ return 'pokestops'
+ case 'nest':
+ return 'nests'
+ default:
+ return poracleCategory
}
}
static getFilterCategories(poracleCategory) {
switch (poracleCategory) {
- case 'egg': return ['eggs']
- case 'invasion': return ['invasions']
- case 'gym': return ['teams']
- case 'lure': return ['lures']
- case 'nest': return ['pokemon']
- case 'raid': return ['raids', 'pokemon']
- case 'quest': return ['items', 'quest_reward_12', 'pokemon', 'quest_reward_4', 'quest_reward_3']
- default: return [poracleCategory]
+ case 'egg':
+ return ['eggs']
+ case 'invasion':
+ return ['invasions']
+ case 'gym':
+ return ['teams']
+ case 'lure':
+ return ['lures']
+ case 'nest':
+ return ['pokemon']
+ case 'raid':
+ return ['raids', 'pokemon']
+ case 'quest':
+ return [
+ 'items',
+ 'quest_reward_12',
+ 'pokemon',
+ 'quest_reward_4',
+ 'quest_reward_3',
+ ]
+ default:
+ return [poracleCategory]
}
}
static getId(item, category, invasions) {
switch (category) {
- case 'egg': return `e${item.level}`
- case 'invasion': return `i${Object.keys(invasions)
- .find(x => invasions[x].type?.toLowerCase() === item.grunt_type.toLowerCase()
- && invasions[x].gender === (item.gender || 1))}`
- case 'lure': return `l${item.lure_id}`
- case 'gym': return `t${item.team}-0`
- case 'raid': return item.pokemon_id === 9000
- ? `r${item.level}`
- : `${item.pokemon_id}-${item.form}`
- case 'quest': return (() => {
- switch (item.reward_type) {
- case 2: return `q${item.reward}`
- case 3: return `d${item.amount}`
- case 4: return `c${item.reward}`
- case 9: return `x${item.reward}`
- case 12: return `m${item.reward}-${item.amount}`
- default: return `${item.reward}-${item.form}`
- }
- })()
- default: return `${item.pokemon_id}-${item.form}`
+ case 'egg':
+ return `e${item.level}`
+ case 'invasion':
+ return `i${Object.keys(invasions).find(
+ (x) =>
+ invasions[x].type?.toLowerCase() ===
+ item.grunt_type.toLowerCase() &&
+ invasions[x].gender === (item.gender || 1),
+ )}`
+ case 'lure':
+ return `l${item.lure_id}`
+ case 'gym':
+ return `t${item.team}-0`
+ case 'raid':
+ return item.pokemon_id === 9000
+ ? `r${item.level}`
+ : `${item.pokemon_id}-${item.form}`
+ case 'quest':
+ return (() => {
+ switch (item.reward_type) {
+ case 2:
+ return `q${item.reward}`
+ case 3:
+ return `d${item.amount}`
+ case 4:
+ return `c${item.reward}`
+ case 9:
+ return `x${item.reward}`
+ case 12:
+ return `m${item.reward}-${item.amount}`
+ default:
+ return `${item.reward}-${item.form}`
+ }
+ })()
+ default:
+ return `${item.pokemon_id}-${item.form}`
}
}
static getIdObj(id) {
switch (id.charAt(0)) {
- case 'e': return { id: id.replace('e', ''), type: 'egg' }
- case 'i': return { id: id.replace('i', ''), type: 'invasion' }
- case 'l': return { id: id.replace('l', ''), type: 'lure' }
- case 'r': return { id: id.replace('r', ''), type: 'raid' }
- case 'q': return { id: id.replace('q', ''), type: 'item' }
- case 'm': return { id: id.split('-')[0].replace('m', ''), type: 'pokemon' }
- case 'c': return { id: id.replace('c', ''), type: 'pokemon' }
- case 'x': return { id: id.replace('x', ''), type: 'pokemon' }
- case 'd': return { id: 3, type: 'quest_reward' }
- case 't': return { id: id.split('-')[0].replace('t', ''), type: 'gym' }
- default: return { id: id.split('-')[0], form: id.split('-')[1], type: 'pokemon' }
+ case 'e':
+ return { id: id.replace('e', ''), type: 'egg' }
+ case 'i':
+ return { id: id.replace('i', ''), type: 'invasion' }
+ case 'l':
+ return { id: id.replace('l', ''), type: 'lure' }
+ case 'r':
+ return { id: id.replace('r', ''), type: 'raid' }
+ case 'q':
+ return { id: id.replace('q', ''), type: 'item' }
+ case 'm':
+ return { id: id.split('-')[0].replace('m', ''), type: 'pokemon' }
+ case 'c':
+ return { id: id.replace('c', ''), type: 'pokemon' }
+ case 'x':
+ return { id: id.replace('x', ''), type: 'pokemon' }
+ case 'd':
+ return { id: 3, type: 'quest_reward' }
+ case 't':
+ return { id: id.split('-')[0].replace('t', ''), type: 'gym' }
+ default:
+ return { id: id.split('-')[0], form: id.split('-')[1], type: 'pokemon' }
}
}
static getTitles(idObj) {
switch (idObj.type) {
- case 'egg': return idObj.id === '90'
- ? ['poke_global']
- : [`egg_${idObj.id}_plural`]
- case 'invasion': return idObj.id === '0'
- ? ['poke_global']
- : [`grunt_a_${idObj.id}`]
- case 'lure': return [`lure_${idObj.id}`]
- case 'raid': return idObj.id === '90'
- ? ['poke_global']
- : [`raid_${idObj.id}_plural`]
- case 'pokemon': return idObj.id === '0'
- ? ['poke_global']
- : [`poke_${idObj.id}`, +idObj.form ? `form_${idObj.form}` : '']
- case 'gym': return idObj.id === '4'
- ? ['poke_global']
- : [`team_${idObj.id}`]
- default: return [`${idObj.type}_${idObj.id}`]
+ case 'egg':
+ return idObj.id === '90' ? ['poke_global'] : [`egg_${idObj.id}_plural`]
+ case 'invasion':
+ return idObj.id === '0' ? ['poke_global'] : [`grunt_a_${idObj.id}`]
+ case 'lure':
+ return [`lure_${idObj.id}`]
+ case 'raid':
+ return idObj.id === '90' ? ['poke_global'] : [`raid_${idObj.id}_plural`]
+ case 'pokemon':
+ return idObj.id === '0'
+ ? ['poke_global']
+ : [`poke_${idObj.id}`, +idObj.form ? `form_${idObj.form}` : '']
+ case 'gym':
+ return idObj.id === '4' ? ['poke_global'] : [`team_${idObj.id}`]
+ default:
+ return [`${idObj.type}_${idObj.id}`]
}
}
static reactMapFriendly(values) {
const reactMapFriendly = {}
- Object.keys(values).forEach(key => {
+ Object.keys(values).forEach((key) => {
if (key === 'min_time') {
reactMapFriendly[key] = values[key]
} else if (key.startsWith('min')) {
@@ -284,7 +346,10 @@ export default class Poracle {
} else if (key.startsWith('max')) {
// do nothing, handled above
} else if (key.startsWith('pvp')) {
- reactMapFriendly.pvp = [values.pvp_ranking_best, values.pvp_ranking_worst]
+ reactMapFriendly.pvp = [
+ values.pvp_ranking_best,
+ values.pvp_ranking_worst,
+ ]
} else if (key === 'atk' || key === 'def' || key === 'sta') {
reactMapFriendly[`${key}_iv`] = [values[key], values[`max_${key}`]]
} else if (key.startsWith('rarity')) {
@@ -297,55 +362,123 @@ export default class Poracle {
}
static processor(type, entries, defaults) {
- const pvpFields = ['pvp_ranking_league', 'pvp_ranking_best', 'pvp_ranking_worst', 'pvp_ranking_min_cp', 'pvp_ranking_cap']
- const ignoredFields = ['noIv', 'byDistance', 'xs', 'xl', 'allForms', 'pvpEntry']
+ const pvpFields = [
+ 'pvp_ranking_league',
+ 'pvp_ranking_best',
+ 'pvp_ranking_worst',
+ 'pvp_ranking_min_cp',
+ 'pvp_ranking_cap',
+ ]
+ const ignoredFields = [
+ 'noIv',
+ 'byDistance',
+ 'xs',
+ 'xl',
+ 'allForms',
+ 'pvpEntry',
+ ]
const dupes = {}
switch (type) {
- case 'egg': return entries.map(egg => ({ ...defaults, ...egg, byDistance: undefined }))
- case 'invasion': return entries.map(invasion => ({ ...defaults, ...invasion, byDistance: undefined }))
- case 'lure': return entries.map(lure => ({ ...defaults, ...lure, lure_id: +lure.lure_id, byDistance: undefined }))
- case 'gym': return entries.map(gym => ({ ...defaults, ...gym, byDistance: undefined }))
- case 'raid': return entries.map(boss => {
- if (boss.allForms) {
- boss.form = defaults.form
- if (dupes[boss.pokemon_id]) {
- return null
- }
- dupes[boss.pokemon_id] = true
- }
- if (boss.byDistance === false) {
- boss.distance = 0
- }
- return { ...defaults, ...boss }
- }).filter(boss => boss)
- case 'quest': return entries.map(quest => {
- if (quest.allForms) {
- quest.form = defaults.form
- if (dupes[quest.reward]) {
- return null
- }
- dupes[quest.reward] = true
- }
- return { ...defaults, ...quest, byDistance: undefined, allForms: undefined }
- }).filter(quest => quest)
- default: return entries.map(pkmn => {
- const fields = ['pokemon_id', 'form', 'clean', 'distance', 'min_time', 'template', 'profile_no', 'gender', 'rarity', 'max_rarity']
- const newPokemon = {}
- if (pkmn.allForms) {
- pkmn.form = 0
- if (dupes[pkmn.pokemon_id]) {
- return null
- }
- dupes[pkmn.pokemon_id] = true
- }
- if (pkmn.pvpEntry) {
- fields.push(...pvpFields)
- } else {
- fields.push(...Object.keys(pkmn).filter(key => !pvpFields.includes(key) && !ignoredFields.includes(key)))
- }
- fields.forEach(field => newPokemon[field] = pkmn[field] === undefined ? defaults[field] : pkmn[field])
- return newPokemon
- }).filter(pokemon => pokemon)
+ case 'egg':
+ return entries.map((egg) => ({
+ ...defaults,
+ ...egg,
+ byDistance: undefined,
+ }))
+ case 'invasion':
+ return entries.map((invasion) => ({
+ ...defaults,
+ ...invasion,
+ byDistance: undefined,
+ }))
+ case 'lure':
+ return entries.map((lure) => ({
+ ...defaults,
+ ...lure,
+ lure_id: +lure.lure_id,
+ byDistance: undefined,
+ }))
+ case 'gym':
+ return entries.map((gym) => ({
+ ...defaults,
+ ...gym,
+ byDistance: undefined,
+ }))
+ case 'raid':
+ return entries
+ .map((boss) => {
+ if (boss.allForms) {
+ boss.form = defaults.form
+ if (dupes[boss.pokemon_id]) {
+ return null
+ }
+ dupes[boss.pokemon_id] = true
+ }
+ if (boss.byDistance === false) {
+ boss.distance = 0
+ }
+ return { ...defaults, ...boss }
+ })
+ .filter((boss) => boss)
+ case 'quest':
+ return entries
+ .map((quest) => {
+ if (quest.allForms) {
+ quest.form = defaults.form
+ if (dupes[quest.reward]) {
+ return null
+ }
+ dupes[quest.reward] = true
+ }
+ return {
+ ...defaults,
+ ...quest,
+ byDistance: undefined,
+ allForms: undefined,
+ }
+ })
+ .filter((quest) => quest)
+ default:
+ return entries
+ .map((pkmn) => {
+ const fields = [
+ 'pokemon_id',
+ 'form',
+ 'clean',
+ 'distance',
+ 'min_time',
+ 'template',
+ 'profile_no',
+ 'gender',
+ 'rarity',
+ 'max_rarity',
+ ]
+ const newPokemon = {}
+ if (pkmn.allForms) {
+ pkmn.form = 0
+ if (dupes[pkmn.pokemon_id]) {
+ return null
+ }
+ dupes[pkmn.pokemon_id] = true
+ }
+ if (pkmn.pvpEntry) {
+ fields.push(...pvpFields)
+ } else {
+ fields.push(
+ ...Object.keys(pkmn).filter(
+ (key) =>
+ !pvpFields.includes(key) && !ignoredFields.includes(key),
+ ),
+ )
+ }
+ fields.forEach(
+ (field) =>
+ (newPokemon[field] =
+ pkmn[field] === undefined ? defaults[field] : pkmn[field]),
+ )
+ return newPokemon
+ })
+ .filter((pokemon) => pokemon)
}
}
@@ -354,28 +487,82 @@ export default class Poracle {
case 'invasion': {
let name = t(item.grunt_id ? `grunt_${item.grunt_id}` : 'poke_global')
if (!item.gender) name = name.replace(/\(.+?\)/g, `(${t('all')})`)
- return `${name}${item.clean ? ` | ${t('clean')} ` : ''}${item.distance ? ` | d${item.distance}` : ''}`
+ return `${name}${item.clean ? ` | ${t('clean')} ` : ''}${
+ item.distance ? ` | d${item.distance}` : ''
+ }`
}
- case 'lure': return `${t(`lure_${item.lure_id}`)}${item.clean ? ` | ${t('clean')} ` : ''}${item.distance ? ` | d${item.distance}` : ''}`
- case 'quest': return `${t(`quest_reward_${item.reward_type}`)} | ${(function getReward() {
- switch (item.reward_type) {
- case 2: return `${t(`item_${item.reward}`)}${item.amount ? ` | x${item.amount}` : ''}`
- case 3: return `x${item.amount}`
- case 4: return `${t(`poke_${item.reward}`)}${item.amount ? ` | x${item.amount}` : ''}`
- case 7: return `${t(`poke_${item.reward}`)} ${t('form')}: ${t(`form_${item.form}`)}`
- case 12: return `${t(`poke_${item.reward}`)}${item.amount ? ` | x${item.amount}` : ''}`
- default: return ''
- }
- }())}${item.clean ? ` | ${t('clean')} ` : ''}${item.distance ? ` | d${item.distance}` : ''}`
+ case 'lure':
+ return `${t(`lure_${item.lure_id}`)}${
+ item.clean ? ` | ${t('clean')} ` : ''
+ }${item.distance ? ` | d${item.distance}` : ''}`
+ case 'quest':
+ return `${t(
+ `quest_reward_${item.reward_type}`,
+ )} | ${(function getReward() {
+ switch (item.reward_type) {
+ case 2:
+ return `${t(`item_${item.reward}`)}${
+ item.amount ? ` | x${item.amount}` : ''
+ }`
+ case 3:
+ return `x${item.amount}`
+ case 4:
+ return `${t(`poke_${item.reward}`)}${
+ item.amount ? ` | x${item.amount}` : ''
+ }`
+ case 7:
+ return `${t(`poke_${item.reward}`)} ${t('form')}: ${t(
+ `form_${item.form}`,
+ )}`
+ case 12:
+ return `${t(`poke_${item.reward}`)}${
+ item.amount ? ` | x${item.amount}` : ''
+ }`
+ default:
+ return ''
+ }
+ })()}${item.clean ? ` | ${t('clean')} ` : ''}${
+ item.distance ? ` | d${item.distance}` : ''
+ }`
// case 'gym': return `${t(`team_${item.team}`)} ${item.gym_id ? item.name : ''}`
// case 'raid':
// case 'egg': return `Level ${item.level} ${item.exclusive ? 'Exclusive Only' : ''} ${item.clean ? 'clean' : ''} Template: ${item.template} ${item.team === 4 ? '' : item.team} ${item.gym_id ? 'Gym:' : ''}${item.distance ? ` | d${item.distance}` : ''}`
- case 'nest': return `${t(`poke_${item.pokemon_id}`)} | Min Spawn: ${item.min_spawn_avg}${item.clean ? ` | ${t('clean')} ` : ''}${item.distance ? ` | d${item.distance}` : ''}`
- case 'pokemon': return `${item.pokemon_id ? ` ${t(`poke_${item.pokemon_id}`)} | ` : ` ${t('poke_global')} | `}${item.form ? ` ${t(`form_${item.form}`)} | ` : ''}${item.pvp_ranking_league
- ? `${t('pvp')} ${t(leagues.find(league => league.cp === item.pvp_ranking_league).name)} ${item.pvp_ranking_best}-${item.pvp_ranking_worst} ${item.pvp_ranking_min_cp ? `${item.pvp_ranking_min_cp}${t('cp')}` : ''} ${item.pvp_ranking_cap ? `${t('cap')}${item.pvp_ranking_cap}` : ''}${item.clean ? ` | ${t('clean')} ` : ''}${item.distance ? ` | d${item.distance}` : ''}`
- : `${item.min_iv}-${item.max_iv}% | L${item.min_level}-${item.max_level}
- A${item.atk}-${item.max_atk} | D${item.def}-${item.max_def} | S${item.sta}-${item.max_sta}${item.clean ? ` | ${t('clean')} ` : ''}${item.distance ? ` | d${item.distance}` : ''}`}`
- default: return item.description
+ case 'nest':
+ return `${t(`poke_${item.pokemon_id}`)} | Min Spawn: ${
+ item.min_spawn_avg
+ }${item.clean ? ` | ${t('clean')} ` : ''}${
+ item.distance ? ` | d${item.distance}` : ''
+ }`
+ case 'pokemon':
+ return `${
+ item.pokemon_id
+ ? ` ${t(`poke_${item.pokemon_id}`)} | `
+ : ` ${t('poke_global')} | `
+ }${item.form ? ` ${t(`form_${item.form}`)} | ` : ''}${
+ item.pvp_ranking_league
+ ? `${t('pvp')} ${t(
+ leagues.find((league) => league.cp === item.pvp_ranking_league)
+ .name,
+ )} ${item.pvp_ranking_best}-${item.pvp_ranking_worst} ${
+ item.pvp_ranking_min_cp
+ ? `${item.pvp_ranking_min_cp}${t('cp')}`
+ : ''
+ } ${
+ item.pvp_ranking_cap ? `${t('cap')}${item.pvp_ranking_cap}` : ''
+ }${item.clean ? ` | ${t('clean')} ` : ''}${
+ item.distance ? ` | d${item.distance}` : ''
+ }`
+ : `${item.min_iv}-${item.max_iv}% | L${item.min_level}-${
+ item.max_level
+ }
+ A${item.atk}-${item.max_atk} | D${item.def}-${item.max_def} | S${
+ item.sta
+ }-${item.max_sta}${item.clean ? ` | ${t('clean')} ` : ''}${
+ item.distance ? ` | d${item.distance}` : ''
+ }`
+ }`
+ default:
+ return item.description
}
}
}
diff --git a/src/services/Query.js b/src/services/Query.js
index b4f375bc9..57233a313 100644
--- a/src/services/Query.js
+++ b/src/services/Query.js
@@ -28,15 +28,22 @@ export default class Query {
return gymIndex.getBadges
}
const permObj = {
- Gyms: filters.raids ? filters.allGyms || perms.allGyms : filters.allGyms && perms.allGyms,
+ Gyms: filters.raids
+ ? filters.allGyms || perms.allGyms
+ : filters.allGyms && perms.allGyms,
Raids: filters.raids && perms.raids,
}
let query = 'get'
- Object.keys(permObj).forEach(keyPerm => {
+ Object.keys(permObj).forEach((keyPerm) => {
if (permObj[keyPerm]) query += keyPerm
})
- if (query === 'get'
- && (filters.exEligible || filters.inBattle || filters.arEligible || filters.gymBadges)) {
+ if (
+ query === 'get' &&
+ (filters.exEligible ||
+ filters.inBattle ||
+ filters.arEligible ||
+ filters.gymBadges)
+ ) {
query += 'Gyms'
}
@@ -61,7 +68,7 @@ export default class Query {
}
let query = 'get'
- Object.keys(permObj).forEach(keyPerm => {
+ Object.keys(permObj).forEach((keyPerm) => {
if (permObj[keyPerm]) query += keyPerm
})
@@ -79,7 +86,7 @@ export default class Query {
}
let query = 'get'
- Object.keys(permObj).forEach(keyPerm => {
+ Object.keys(permObj).forEach((keyPerm) => {
if (permObj[keyPerm]) query += keyPerm
})
if (query === 'get') query += 'Pokemon'
@@ -119,9 +126,12 @@ export default class Query {
switch (category) {
case 'raids':
case 'nests':
- case 'quests': return searchIndex[category]
- case 'webhook': return searchIndex.poiWebhook
- default: return searchIndex.poi
+ case 'quests':
+ return searchIndex[category]
+ case 'webhook':
+ return searchIndex.poiWebhook
+ default:
+ return searchIndex.poi
}
}
diff --git a/src/services/Utility.js b/src/services/Utility.js
index 26b76f93c..fba923eb8 100644
--- a/src/services/Utility.js
+++ b/src/services/Utility.js
@@ -52,17 +52,18 @@ export default class Utility {
? 'rgba(1, 1, 1, 0.01)'
: 'rgba(240, 240, 240, 0.01)'
: rowIndex % 2
- ? 'rgba(1, 1, 1, 0.01)'
- : 'rgba(240, 240, 240, 0.01)'
+ ? 'rgba(1, 1, 1, 0.01)'
+ : 'rgba(240, 240, 240, 0.01)'
}
static generateSlots = (teamId, show, tempFilters) => {
const slotObj = {}
for (let i = 1; i <= 6; i += 1) {
const slotKey = `g${teamId.charAt(1)}-${i}`
- slotObj[slotKey] = typeof show === 'boolean'
- ? { ...tempFilters[slotKey], enabled: show }
- : { ...tempFilters[slotKey], size: show.size }
+ slotObj[slotKey] =
+ typeof show === 'boolean'
+ ? { ...tempFilters[slotKey], enabled: show }
+ : { ...tempFilters[slotKey], size: show.size }
}
return slotObj
}
@@ -76,15 +77,31 @@ export default class Utility {
static getMidnight() {
const date = new Date()
return Math.floor(
- new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 1, 0).getTime() / 1000,
+ new Date(
+ date.getFullYear(),
+ date.getMonth(),
+ date.getDate(),
+ 0,
+ 0,
+ 1,
+ 0,
+ ).getTime() / 1000,
)
}
- static analytics(category, action = false, label = false, nonInteraction = false) {
+ static analytics(
+ category,
+ action = false,
+ label = false,
+ nonInteraction = false,
+ ) {
if (inject?.GOOGLE_ANALYTICS_ID) {
if (action) {
ReactGA.event({
- category, action, label, nonInteraction,
+ category,
+ action,
+ label,
+ nonInteraction,
})
} else {
ReactGA.pageview(category)
@@ -97,7 +114,13 @@ export default class Utility {
sm: sizeObj?.sm || sizeObj?.xs || 12,
md: sizeObj?.md || sizeObj?.sm || sizeObj?.xs || 12,
lg: sizeObj?.lg || sizeObj?.md || sizeObj?.sm || sizeObj?.xs || 12,
- xl: sizeObj?.xl || sizeObj?.lg || sizeObj?.md || sizeObj?.sm || sizeObj?.xs || 12,
+ xl:
+ sizeObj?.xl ||
+ sizeObj?.lg ||
+ sizeObj?.md ||
+ sizeObj?.sm ||
+ sizeObj?.xs ||
+ 12,
})
static getQueryArgs(map) {
@@ -118,8 +141,7 @@ export default class Utility {
if (!content) return ''
if (typeof content === 'string') return content
return typeof content === 'object'
- ? content[localStorage.getItem('i18nextLng')]
- || Object.values(content)[0]
+ ? content[localStorage.getItem('i18nextLng')] || Object.values(content)[0]
: ''
}
}
diff --git a/src/services/filtering/genGyms.js b/src/services/filtering/genGyms.js
index 78f045021..f31cf1142 100644
--- a/src/services/filtering/genGyms.js
+++ b/src/services/filtering/genGyms.js
@@ -1,41 +1,60 @@
export default function genGyms(t, gyms, categories) {
- const tempObj = Object.fromEntries(categories.map(x => [x, {}]))
+ const tempObj = Object.fromEntries(categories.map((x) => [x, {}]))
if (!gyms?.filter) return {}
if (tempObj.eggs) {
- tempObj.eggs.e90 = { name: t('poke_global'), perms: ['raids'], webhookOnly: true }
+ tempObj.eggs.e90 = {
+ name: t('poke_global'),
+ perms: ['raids'],
+ webhookOnly: true,
+ }
}
if (tempObj.raids) {
- tempObj.raids.r90 = { name: t('poke_global'), perms: ['raids'], webhookOnly: true }
+ tempObj.raids.r90 = {
+ name: t('poke_global'),
+ perms: ['raids'],
+ webhookOnly: true,
+ }
}
if (tempObj.teams) {
- tempObj.teams.t4 = { name: t('poke_global'), perms: ['gyms'], webhookOnly: true }
+ tempObj.teams.t4 = {
+ name: t('poke_global'),
+ perms: ['gyms'],
+ webhookOnly: true,
+ }
}
- Object.keys(gyms.filter).forEach(id => {
- if (id !== 'global'
- && !/\d/.test(id.charAt(0))
- && !id.startsWith('g')) {
+ Object.keys(gyms.filter).forEach((id) => {
+ if (id !== 'global' && !/\d/.test(id.charAt(0)) && !id.startsWith('g')) {
switch (id.charAt(0)) {
case 'e':
tempObj.eggs[id] = {
name: t(`egg_${id.slice(1)}_plural`),
perms: ['raids'],
- searchMeta: `${t(`egg_${id.slice(1)}_plural`)} ${t('eggs').toLowerCase()}`,
- }; break
+ searchMeta: `${t(`egg_${id.slice(1)}_plural`)} ${t(
+ 'eggs',
+ ).toLowerCase()}`,
+ }
+ break
case 'r':
tempObj.raids[id] = {
name: t(`raid_${id.slice(1).split('-')[0]}_plural`),
perms: ['raids'],
- searchMeta: `${t(`raid_${id.slice(1)}_plural`)} ${t('raids').toLowerCase()}`,
+ searchMeta: `${t(`raid_${id.slice(1)}_plural`)} ${t(
+ 'raids',
+ ).toLowerCase()}`,
webhookOnly: true,
- }; break
+ }
+ break
default:
tempObj.teams[id] = {
name: t(`team_${id.slice(1).split('-')[0]}`),
perms: ['gyms'],
- searchMeta: `${t(`team_${id.slice(1)}`)} ${t('teams').toLowerCase()}`,
- }; break
+ searchMeta: `${t(`team_${id.slice(1)}`)} ${t(
+ 'teams',
+ ).toLowerCase()}`,
+ }
+ break
}
}
})
diff --git a/src/services/filtering/genPokemon.js b/src/services/filtering/genPokemon.js
index b65d576dd..4dfbb77f3 100644
--- a/src/services/filtering/genPokemon.js
+++ b/src/services/filtering/genPokemon.js
@@ -1,17 +1,30 @@
export default function genPokemon(t, pokemon, categories) {
- const tempObj = Object.fromEntries(categories.map(x => (
- [x, { '0-0': { webhookOnly: true, name: t('poke_global'), perms: ['pokemon', 'raids', 'quests', 'nests'], formTypes: [] } }]
- )))
+ const tempObj = Object.fromEntries(
+ categories.map((x) => [
+ x,
+ {
+ '0-0': {
+ webhookOnly: true,
+ name: t('poke_global'),
+ perms: ['pokemon', 'raids', 'quests', 'nests'],
+ formTypes: [],
+ },
+ },
+ ]),
+ )
Object.entries(pokemon).forEach(([i, pkmn]) => {
const pokeName = t(`poke_${i}`)
Object.entries(pkmn.forms).forEach(([j, form]) => {
const formName = t(`form_${j}`)
const id = `${i}-${j}`
- const formTypes = (form.types || pkmn.types || []).map(x => `poke_type_${x}`)
- const name = form.name && form.name !== 'Normal' && j != 0 && j != pkmn.defaultFormId
- ? formName
- : pokeName
+ const formTypes = (form.types || pkmn.types || []).map(
+ (x) => `poke_type_${x}`,
+ )
+ const name =
+ form.name && form.name !== 'Normal' && j != 0 && j != pkmn.defaultFormId
+ ? formName
+ : pokeName
tempObj.pokemon[id] = {
name: form.name === '*' ? `${name}*` : name,
category: form.name === '*' ? form.category : undefined,
@@ -27,7 +40,7 @@ export default function genPokemon(t, pokemon, categories) {
family: pkmn.family,
}
tempObj.pokemon[id].searchMeta = `${Object.values(tempObj.pokemon[id])
- .flatMap(x => Array.isArray(x) ? x.map(y => t(y)) : t(x))
+ .flatMap((x) => (Array.isArray(x) ? x.map((y) => t(y)) : t(x)))
.join(' ')
.toLowerCase()} ${t('pokemon').toLowerCase()}`
})
diff --git a/src/services/filtering/genPokestops.js b/src/services/filtering/genPokestops.js
index 25ea5a8ed..3dd82697c 100644
--- a/src/services/filtering/genPokestops.js
+++ b/src/services/filtering/genPokestops.js
@@ -1,12 +1,16 @@
export default function genPokestops(t, pokemon, pokestops, categories) {
- const tempObj = Object.fromEntries(categories.map(x => [x, {}]))
+ const tempObj = Object.fromEntries(categories.map((x) => [x, {}]))
if (!pokestops?.filter) return {}
if (tempObj.invasions) {
- tempObj.invasions.i0 = { name: t('poke_global'), perms: ['invasions'], webhookOnly: true }
+ tempObj.invasions.i0 = {
+ name: t('poke_global'),
+ perms: ['invasions'],
+ webhookOnly: true,
+ }
}
- Object.keys(pokestops.filter).forEach(id => {
+ Object.keys(pokestops.filter).forEach((id) => {
if (id !== 'global' && !/\d/.test(id.charAt(0))) {
switch (id.charAt(0)) {
case 'i':
@@ -15,76 +19,107 @@ export default function genPokestops(t, pokemon, pokestops, categories) {
name: t(`grunt_a_${id.slice(1)}`, `grunt_${id.slice(1)}`),
perms: ['invasions'],
}
- tempObj.invasions[id].searchMeta = `${t('invasions').toLowerCase()} ${t(`grunt_${id.slice(1)}`).toLowerCase()}`
- } break
+ tempObj.invasions[id].searchMeta = `${t(
+ 'invasions',
+ ).toLowerCase()} ${t(`grunt_${id.slice(1)}`).toLowerCase()}`
+ }
+ break
case 'd':
if (tempObj.quest_reward_3) {
tempObj.quest_reward_3[id] = {
name: `x${id.slice(1)}`,
perms: ['quests'],
}
- tempObj.quest_reward_3[id].searchMeta = `${t('quest_reward_3').toLowerCase()} ${tempObj.quest_reward_3[id].name.toLowerCase()}`
- } break
- case 'm': {
- const monId = id && id.slice(1).split('-')[0]
- if (tempObj.quest_reward_12 && pokemon[monId]) {
- tempObj.quest_reward_12[id] = {
- name: `${t(`poke_${monId}`)} x${id.split('-')[1]}`,
- perms: ['quests'],
- genId: `generation_${pokemon[monId].genId}`,
- formTypes: pokemon[monId].types.map(x => `poke_type_${x}`),
- rarity: pokemon[monId].rarity,
- family: pokemon[monId].family,
+ tempObj.quest_reward_3[id].searchMeta = `${t(
+ 'quest_reward_3',
+ ).toLowerCase()} ${tempObj.quest_reward_3[id].name.toLowerCase()}`
+ }
+ break
+ case 'm':
+ {
+ const monId = id && id.slice(1).split('-')[0]
+ if (tempObj.quest_reward_12 && pokemon[monId]) {
+ tempObj.quest_reward_12[id] = {
+ name: `${t(`poke_${monId}`)} x${id.split('-')[1]}`,
+ perms: ['quests'],
+ genId: `generation_${pokemon[monId].genId}`,
+ formTypes: pokemon[monId].types.map((x) => `poke_type_${x}`),
+ rarity: pokemon[monId].rarity,
+ family: pokemon[monId].family,
+ }
+ tempObj.quest_reward_12[id].searchMeta = `${Object.values(
+ tempObj.quest_reward_12[id],
+ )
+ .flatMap((x) => t(x))
+ .join(' ')
+ .toLowerCase()} ${t('quest_reward_12').toLowerCase()}`
}
- tempObj.quest_reward_12[id].searchMeta = `${Object.values(tempObj.quest_reward_12[id])
- .flatMap(x => t(x))
- .join(' ')
- .toLowerCase()} ${t('quest_reward_12').toLowerCase()}`
}
- } break
+ break
case 'q':
if (tempObj.items) {
tempObj.items[id] = {
name: t(`item_${id.slice(1)}`),
perms: ['quests'],
}
- tempObj.items[id].searchMeta = `${t('items').toLowerCase()} ${tempObj.items[id].name.toLowerCase()}`
- } break
+ tempObj.items[id].searchMeta = `${t(
+ 'items',
+ ).toLowerCase()} ${tempObj.items[id].name.toLowerCase()}`
+ }
+ break
case 'l':
if (tempObj.lures) {
tempObj.lures[id] = {
name: t(`lure_${id.slice(1)}`),
perms: ['lures'],
}
- tempObj.lures[id].searchMeta = `${t('lures').toLowerCase()} ${tempObj.lures[id].name.toLowerCase()}`
- } break
+ tempObj.lures[id].searchMeta = `${t(
+ 'lures',
+ ).toLowerCase()} ${tempObj.lures[id].name.toLowerCase()}`
+ }
+ break
case 'x':
- case 'c': {
- const monId = id && id.slice(1)
- if (tempObj.quest_reward_4 && tempObj.quest_reward_9 && pokemon[monId]) {
- const category = [id.charAt(0) === 'c' ? 'quest_reward_4' : 'quest_reward_9']
- tempObj[category][id] = {
- name: `${t(`poke_${monId}`)} ${id.charAt(0) === 'c' ? t('candy') : t('xl')}`,
- perms: ['quests'],
- genId: `generation_${pokemon[monId].genId}`,
- formTypes: pokemon[monId].types.map(x => `poke_type_${x}`),
- rarity: pokemon[monId].rarity,
- family: pokemon[monId].family,
+ case 'c':
+ {
+ const monId = id && id.slice(1)
+ if (
+ tempObj.quest_reward_4 &&
+ tempObj.quest_reward_9 &&
+ pokemon[monId]
+ ) {
+ const category = [
+ id.charAt(0) === 'c' ? 'quest_reward_4' : 'quest_reward_9',
+ ]
+ tempObj[category][id] = {
+ name: `${t(`poke_${monId}`)} ${
+ id.charAt(0) === 'c' ? t('candy') : t('xl')
+ }`,
+ perms: ['quests'],
+ genId: `generation_${pokemon[monId].genId}`,
+ formTypes: pokemon[monId].types.map((x) => `poke_type_${x}`),
+ rarity: pokemon[monId].rarity,
+ family: pokemon[monId].family,
+ }
+ tempObj[category][id].searchMeta = `${Object.values(
+ tempObj[category][id],
+ )
+ .flatMap((x) => t(x))
+ .join(' ')
+ .toLowerCase()} ${t(category).toLowerCase()}`
}
- tempObj[category][id].searchMeta = `${Object.values(tempObj[category][id])
- .flatMap(x => t(x))
- .join(' ')
- .toLowerCase()} ${t(category).toLowerCase()}`
}
- } break
+ break
case 'u':
if (tempObj.general) {
tempObj.general[id] = {
name: t(`quest_reward_${id.slice(1)}`),
perms: ['quests'],
}
- tempObj.general[id].searchMeta = `${t('general').toLowerCase()} ${tempObj.general[id].name.toLowerCase()}`
- } break
+ tempObj.general[id].searchMeta = `${t(
+ 'general',
+ ).toLowerCase()} ${tempObj.general[id].name.toLowerCase()}`
+ }
+ break
default:
if (tempObj.pokestops) {
tempObj.pokestops[id] = {
diff --git a/src/services/functions/checkAdvFilter.js b/src/services/functions/checkAdvFilter.js
index 2af63125d..5fbe59bf3 100644
--- a/src/services/functions/checkAdvFilter.js
+++ b/src/services/functions/checkAdvFilter.js
@@ -3,7 +3,8 @@
/* eslint-disable default-case */
export default function checkIVFilterValid(filter) {
const input = filter.toUpperCase()
- const tokenizer = /\s*([()|&!,]|([ADSL]?|CP|[GU]L|LC)\s*([0-9]+(?:\.[0-9]*)?)(?:\s*-\s*([0-9]+(?:\.[0-9]*)?))?)/g
+ const tokenizer =
+ /\s*([()|&!,]|([ADSL]?|CP|[GU]L|LC)\s*([0-9]+(?:\.[0-9]*)?)(?:\s*-\s*([0-9]+(?:\.[0-9]*)?))?)/g
let expectClause = true
let stack = 0
let lastIndex = 0
diff --git a/src/services/functions/dayCheck.js b/src/services/functions/dayCheck.js
index 2f4d43c34..8fd940b0c 100644
--- a/src/services/functions/dayCheck.js
+++ b/src/services/functions/dayCheck.js
@@ -1,7 +1,7 @@
export default function dayCheck(currentStamp, desiredStamp) {
const locale = localStorage.getItem('i18nextLng') || 'en'
if (currentStamp - desiredStamp < 86400) {
- return (new Date(desiredStamp * 1000)).toLocaleTimeString(locale)
+ return new Date(desiredStamp * 1000).toLocaleTimeString(locale)
}
- return (new Date(desiredStamp * 1000)).toLocaleString(locale)
+ return new Date(desiredStamp * 1000).toLocaleString(locale)
}
diff --git a/src/services/functions/formatInterval.js b/src/services/functions/formatInterval.js
index 89ad9275c..7bcc0b8f9 100644
--- a/src/services/functions/formatInterval.js
+++ b/src/services/functions/formatInterval.js
@@ -3,7 +3,7 @@ export default function formatInterval(intervalMs) {
const d = Math.floor(diff / 86400)
const h = Math.floor(diff / 3600)
const m = Math.floor((diff % 3600) / 60)
- const s = Math.floor(diff % 3600 % 60)
+ const s = Math.floor((diff % 3600) % 60)
const str = []
if (d > 0) {
diff --git a/src/services/functions/parseConditions.js b/src/services/functions/parseConditions.js
index b32c55647..1e80b7987 100644
--- a/src/services/functions/parseConditions.js
+++ b/src/services/functions/parseConditions.js
@@ -1,22 +1,43 @@
export default function parseQuestConditions(conditions) {
const [type1, type2] = JSON.parse(conditions)
const conditionsToReturn = []
- const parseMadRewards = specifics => {
+ const parseMadRewards = (specifics) => {
const normalized = {
type: specifics.type,
info: {},
}
switch (specifics.type) {
- case 1: normalized.info.pokemon_type_ids = specifics.with_pokemon_type.pokemon_type; break
- case 2: normalized.info.pokemon_ids = specifics.with_pokemon_category.pokemon_ids; break
- case 7: normalized.info.raid_levels = specifics.with_raid_level.raid_level; break
- case 11: normalized.info.item_id = specifics.with_item.item; break
+ case 1:
+ normalized.info.pokemon_type_ids =
+ specifics.with_pokemon_type.pokemon_type
+ break
+ case 2:
+ normalized.info.pokemon_ids =
+ specifics.with_pokemon_category.pokemon_ids
+ break
+ case 7:
+ normalized.info.raid_levels = specifics.with_raid_level.raid_level
+ break
+ case 11:
+ normalized.info.item_id = specifics.with_item.item
+ break
case 8:
- case 14: normalized.info.throw_type_id = specifics.with_throw_type.throw_type; break
- case 26: normalized.info.alignment_ids = specifics.with_pokemon_alignment.alignment; break
- case 27: normalized.info.character_category_ids = specifics.with_invasion_character.category; break
- case 44: normalized.info.time = specifics.with_elapsed_time.elapsed_time / 1000; break
- default: break
+ case 14:
+ normalized.info.throw_type_id = specifics.with_throw_type.throw_type
+ break
+ case 26:
+ normalized.info.alignment_ids =
+ specifics.with_pokemon_alignment.alignment
+ break
+ case 27:
+ normalized.info.character_category_ids =
+ specifics.with_invasion_character.category
+ break
+ case 44:
+ normalized.info.time = specifics.with_elapsed_time.elapsed_time / 1000
+ break
+ default:
+ break
}
return normalized
}
diff --git a/src/services/queries/geocoder.js b/src/services/queries/geocoder.js
index 5d95b5295..482ab87f8 100644
--- a/src/services/queries/geocoder.js
+++ b/src/services/queries/geocoder.js
@@ -3,16 +3,16 @@ import { gql } from '@apollo/client'
export const Nominatim = gql`
fragment Nominatim on Geocoder {
latitude
- longitude
- streetNumber
- streetName
- neighborhood
- suburb
- city
- state
- zipcode
- country
- countryCode
+ longitude
+ streetNumber
+ streetName
+ neighborhood
+ suburb
+ city
+ state
+ zipcode
+ country
+ countryCode
}
`
diff --git a/src/services/queries/gym.js b/src/services/queries/gym.js
index 805600b21..5871b793d 100644
--- a/src/services/queries/gym.js
+++ b/src/services/queries/gym.js
@@ -46,8 +46,24 @@ const raid = gql`
export const getGyms = gql`
${core}
${gym}
- query Gyms($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $version: String) {
- gyms(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, version: $version) {
+ query Gyms(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $version: String
+ ) {
+ gyms(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ version: $version
+ ) {
...CoreGym
...Gym
}
@@ -57,8 +73,24 @@ export const getGyms = gql`
export const getRaids = gql`
${core}
${raid}
- query Raids($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $version: String) {
- gyms(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, version: $version) {
+ query Raids(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $version: String
+ ) {
+ gyms(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ version: $version
+ ) {
...CoreGym
...Raid
}
@@ -69,8 +101,24 @@ export const getGymsRaids = gql`
${core}
${gym}
${raid}
- query GymsRaids($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $version: String) {
- gyms(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, version: $version) {
+ query GymsRaids(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $version: String
+ ) {
+ gyms(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ version: $version
+ ) {
...CoreGym
...Gym
...Raid
diff --git a/src/services/queries/nest.js b/src/services/queries/nest.js
index 830d62f6f..25e7ae10e 100644
--- a/src/services/queries/nest.js
+++ b/src/services/queries/nest.js
@@ -10,8 +10,22 @@ const core = gql`
export const getAllNests = gql`
${core}
- query Nests($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $version: String) {
- nests(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, version: $version) {
+ query Nests(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $version: String
+ ) {
+ nests(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ version: $version
+ ) {
...CoreNest
name
pokemon_id
diff --git a/src/services/queries/pokemon.js b/src/services/queries/pokemon.js
index 608d5a356..f5a6ae548 100644
--- a/src/services/queries/pokemon.js
+++ b/src/services/queries/pokemon.js
@@ -44,8 +44,22 @@ const pvp = gql`
export const getPokemon = gql`
${core}
- query Pokemon($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int) {
- pokemon(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts) {
+ query Pokemon(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int
+ ) {
+ pokemon(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ ) {
...CorePokemon
}
}
@@ -54,8 +68,22 @@ export const getPokemon = gql`
export const getIvs = gql`
${core}
${ivs}
- query PokemonIVs($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int) {
- pokemon(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts) {
+ query PokemonIVs(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int
+ ) {
+ pokemon(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ ) {
...CorePokemon
...Iv
}
@@ -65,8 +93,24 @@ export const getIvs = gql`
export const getPvp = gql`
${core}
${pvp}
- query PokemonPVP($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int, $version: String) {
- pokemon(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, version: $version) {
+ query PokemonPVP(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int
+ $version: String
+ ) {
+ pokemon(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ version: $version
+ ) {
...CorePokemon
...Pvp
}
@@ -77,8 +121,24 @@ export const getIvsPvp = gql`
${core}
${ivs}
${pvp}
- query PokemonIVsPVP($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int, $version: String) {
- pokemon(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, version: $version) {
+ query PokemonIVsPVP(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int
+ $version: String
+ ) {
+ pokemon(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ version: $version
+ ) {
...CorePokemon
...Iv
...Pvp
diff --git a/src/services/queries/pokestop.js b/src/services/queries/pokestop.js
index a92a5c733..8139c7c07 100644
--- a/src/services/queries/pokestop.js
+++ b/src/services/queries/pokestop.js
@@ -63,8 +63,26 @@ const invasion = gql`
export const getPokestops = gql`
${core}
- query Pokestops($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query Pokestops(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
}
}
@@ -73,8 +91,26 @@ export const getPokestops = gql`
export const getLures = gql`
${core}
${lure}
- query Lures($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query Lures(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
...Lure
}
@@ -84,8 +120,26 @@ export const getLures = gql`
export const getQuests = gql`
${core}
${quest}
- query Quests($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query Quests(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
...Quest
}
@@ -95,8 +149,26 @@ export const getQuests = gql`
export const getInvasions = gql`
${core}
${invasion}
- query Invasions($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query Invasions(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
...Invasion
}
@@ -107,8 +179,26 @@ export const getLuresQuests = gql`
${core}
${lure}
${quest}
- query LuresQuests($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query LuresQuests(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
...Lure
...Quest
@@ -120,8 +210,26 @@ export const getLuresInvasions = gql`
${core}
${lure}
${invasion}
- query LuresInvasion($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query LuresInvasion(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
...Lure
...Invasion
@@ -133,8 +241,26 @@ export const getQuestsInvasions = gql`
${core}
${quest}
${invasion}
- query QuestsInvasions($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query QuestsInvasions(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
...Quest
...Invasion
@@ -147,8 +273,26 @@ export const getLuresQuestsInvasions = gql`
${lure}
${quest}
${invasion}
- query LuresQuestInvasions($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $filters: JSON!, $ts: Int!, $midnight: Int!, $version: String) {
- pokestops(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, filters: $filters, ts: $ts, midnight: $midnight, version: $version) {
+ query LuresQuestInvasions(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $filters: JSON!
+ $ts: Int!
+ $midnight: Int!
+ $version: String
+ ) {
+ pokestops(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ filters: $filters
+ ts: $ts
+ midnight: $midnight
+ version: $version
+ ) {
...CorePokestop
...Lure
...Quest
diff --git a/src/services/queries/portal.js b/src/services/queries/portal.js
index 0da5ff15a..53a89cbdd 100644
--- a/src/services/queries/portal.js
+++ b/src/services/queries/portal.js
@@ -1,8 +1,20 @@
import { gql } from '@apollo/client'
export const getAllPortals = gql`
- query Portals($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $version: String) {
- portals(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, version: $version) {
+ query Portals(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $version: String
+ ) {
+ portals(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ version: $version
+ ) {
id
lat
lon
diff --git a/src/services/queries/scanAreas.js b/src/services/queries/scanAreas.js
index bab4d9526..73092dc1a 100644
--- a/src/services/queries/scanAreas.js
+++ b/src/services/queries/scanAreas.js
@@ -1,7 +1,7 @@
import { gql } from '@apollo/client'
const getAllScanAreas = gql`
-query ScanAreas($version: String) {
+ query ScanAreas($version: String) {
scanAreas(version: $version) {
type
features {
diff --git a/src/services/queries/scanCell.js b/src/services/queries/scanCell.js
index afe239624..de8761457 100644
--- a/src/services/queries/scanCell.js
+++ b/src/services/queries/scanCell.js
@@ -1,8 +1,22 @@
import { gql } from '@apollo/client'
const getAllScanCells = gql`
- query ScanCells($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $zoom: Int!, $version: String) {
- scanCells(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, zoom: $zoom, version: $version) {
+ query ScanCells(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $zoom: Int!
+ $version: String
+ ) {
+ scanCells(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ zoom: $zoom
+ version: $version
+ ) {
id
center_lat
center_lon
diff --git a/src/services/queries/scanner.js b/src/services/queries/scanner.js
index 9ea582e8a..2fed5175b 100644
--- a/src/services/queries/scanner.js
+++ b/src/services/queries/scanner.js
@@ -1,8 +1,18 @@
import { gql } from '@apollo/client'
const scanner = gql`
- query Scanner($category: String!, $method: String!, $data: JSON!, $version: String) {
- scanner(category: $category, method: $method, data: $data, version: $version) {
+ query Scanner(
+ $category: String!
+ $method: String!
+ $data: JSON!
+ $version: String
+ ) {
+ scanner(
+ category: $category
+ method: $method
+ data: $data
+ version: $version
+ ) {
status
message
}
diff --git a/src/services/queries/search.js b/src/services/queries/search.js
index 993021c7b..64f76eb26 100644
--- a/src/services/queries/search.js
+++ b/src/services/queries/search.js
@@ -14,8 +14,22 @@ const core = gql`
export const poi = gql`
${core}
- query SearchPoi($search: String!, $category: String!, $lat: Float!, $lon: Float!, $locale: String!, $version: String) {
- search(search: $search, category: $category, lat: $lat, lon: $lon, locale: $locale, version: $version) {
+ query SearchPoi(
+ $search: String!
+ $category: String!
+ $lat: Float!
+ $lon: Float!
+ $locale: String!
+ $version: String
+ ) {
+ search(
+ search: $search
+ category: $category
+ lat: $lat
+ lon: $lon
+ locale: $locale
+ version: $version
+ ) {
...CoreSearch
}
}
@@ -23,8 +37,24 @@ export const poi = gql`
export const poiWebhook = gql`
${Nominatim}
- query SearchWebhook($search: String!, $category: String!, $lat: Float!, $lon: Float!, $locale: String!, $webhookName: String, $version: String) {
- search(search: $search, category: $category, lat: $lat, lon: $lon, locale: $locale, webhookName: $webhookName, version: $version) {
+ query SearchWebhook(
+ $search: String!
+ $category: String!
+ $lat: Float!
+ $lon: Float!
+ $locale: String!
+ $webhookName: String
+ $version: String
+ ) {
+ search(
+ search: $search
+ category: $category
+ lat: $lat
+ lon: $lon
+ locale: $locale
+ webhookName: $webhookName
+ version: $version
+ ) {
id
name
formatted {
@@ -36,8 +66,22 @@ export const poiWebhook = gql`
export const nests = gql`
${core}
- query SearchNests($search: String!, $category: String!, $lat: Float!, $lon: Float!, $locale: String!, $version: String) {
- search(search: $search, category: $category, lat: $lat, lon: $lon, locale: $locale, version: $version) {
+ query SearchNests(
+ $search: String!
+ $category: String!
+ $lat: Float!
+ $lon: Float!
+ $locale: String!
+ $version: String
+ ) {
+ search(
+ search: $search
+ category: $category
+ lat: $lat
+ lon: $lon
+ locale: $locale
+ version: $version
+ ) {
...CoreSearch
nest_pokemon_id
nest_pokemon_form
@@ -46,8 +90,24 @@ export const nests = gql`
`
export const quests = gql`
- query SearchQuests($search: String!, $category: String!, $lat: Float!, $lon: Float!, $locale: String!, $midnight: Int, $version: String) {
- searchQuest(search: $search, category: $category, lat: $lat, lon: $lon, locale: $locale, midnight: $midnight, version: $version) {
+ query SearchQuests(
+ $search: String!
+ $category: String!
+ $lat: Float!
+ $lon: Float!
+ $locale: String!
+ $midnight: Int
+ $version: String
+ ) {
+ searchQuest(
+ search: $search
+ category: $category
+ lat: $lat
+ lon: $lon
+ locale: $locale
+ midnight: $midnight
+ version: $version
+ ) {
id
name
lat
@@ -75,8 +135,24 @@ export const quests = gql`
export const raids = gql`
${core}
- query SearchRaids($search: String!, $category: String!, $lat: Float!, $lon: Float!, $locale: String!, $ts: Int, $version: String) {
- search(search: $search, category: $category, lat: $lat, lon: $lon, locale: $locale, ts: $ts, version: $version) {
+ query SearchRaids(
+ $search: String!
+ $category: String!
+ $lat: Float!
+ $lon: Float!
+ $locale: String!
+ $ts: Int
+ $version: String
+ ) {
+ search(
+ search: $search
+ category: $category
+ lat: $lat
+ lon: $lon
+ locale: $locale
+ ts: $ts
+ version: $version
+ ) {
...CoreSearch
raid_pokemon_id
raid_pokemon_form
diff --git a/src/services/queries/spawnpoint.js b/src/services/queries/spawnpoint.js
index d1ff16d57..dad726341 100644
--- a/src/services/queries/spawnpoint.js
+++ b/src/services/queries/spawnpoint.js
@@ -1,15 +1,27 @@
import { gql } from '@apollo/client'
const getAllSpawnpoints = gql`
-query Spawnpoints($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $version: String) {
- spawnpoints(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, version: $version) {
- id
- lat
- lon
- despawn_sec
- updated
+ query Spawnpoints(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $version: String
+ ) {
+ spawnpoints(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ version: $version
+ ) {
+ id
+ lat
+ lon
+ despawn_sec
+ updated
+ }
}
-}
`
export default getAllSpawnpoints
diff --git a/src/services/queries/submissionCells.js b/src/services/queries/submissionCells.js
index 1a9cdd060..2def301fb 100644
--- a/src/services/queries/submissionCells.js
+++ b/src/services/queries/submissionCells.js
@@ -1,8 +1,22 @@
import { gql } from '@apollo/client'
const getAllSubmissionCells = gql`
- query SubmissionCells($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!, $zoom: Int!, $version: String) {
- submissionCells(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon, zoom: $zoom, version: $version) {
+ query SubmissionCells(
+ $minLat: Float!
+ $minLon: Float!
+ $maxLat: Float!
+ $maxLon: Float!
+ $zoom: Int!
+ $version: String
+ ) {
+ submissionCells(
+ minLat: $minLat
+ minLon: $minLon
+ maxLat: $maxLat
+ maxLon: $maxLon
+ zoom: $zoom
+ version: $version
+ ) {
placementCells {
cells {
id
diff --git a/src/services/queries/user.js b/src/services/queries/user.js
index ee0d58d29..47f71ea4d 100644
--- a/src/services/queries/user.js
+++ b/src/services/queries/user.js
@@ -1,25 +1,25 @@
import { gql } from '@apollo/client'
export const setTutorial = gql`
-mutation SetTutorial($tutorial: Boolean!) {
+ mutation SetTutorial($tutorial: Boolean!) {
tutorial(tutorial: $tutorial)
}
`
export const setWebhookStrategy = gql`
-mutation SetStrategy($strategy: String!) {
+ mutation SetStrategy($strategy: String!) {
strategy(strategy: $strategy)
}
`
export const checkUsername = gql`
-mutation SetUsername($username: String!) {
+ mutation SetUsername($username: String!) {
checkUsername(username: $username)
}
`
export const setGymBadge = gql`
-mutation SetGymBadge($gymId: String!, $badge: Int!) {
+ mutation SetGymBadge($gymId: String!, $badge: Int!) {
setGymBadge(gymId: $gymId, badge: $badge)
}
`
diff --git a/src/services/queries/weather.js b/src/services/queries/weather.js
index fa482a40f..731842427 100644
--- a/src/services/queries/weather.js
+++ b/src/services/queries/weather.js
@@ -1,16 +1,16 @@
import { gql } from '@apollo/client'
const getAllWeather = gql`
-query Weather($version: String) {
- weather(version: $version) {
- id
- latitude
- longitude
- gameplay_condition
- updated
- polygon
+ query Weather($version: String) {
+ weather(version: $version) {
+ id
+ latitude
+ longitude
+ gameplay_condition
+ updated
+ polygon
+ }
}
-}
`
export default getAllWeather
diff --git a/src/services/queries/webhook.js b/src/services/queries/webhook.js
index 59dbaa781..e2f2a0191 100644
--- a/src/services/queries/webhook.js
+++ b/src/services/queries/webhook.js
@@ -245,8 +245,18 @@ export const allProfiles = gql`
${Quest}
${Raid}
${Weather}
- query Webhook($category: String!, $status: String!, $name: String!, $version: String) {
- webhook(category: $category, status: $status, name: $name, version: $version) {
+ query Webhook(
+ $category: String!
+ $status: String!
+ $name: String!
+ $version: String
+ ) {
+ webhook(
+ category: $category
+ status: $status
+ name: $name
+ version: $version
+ ) {
...PoracleHuman
...PoracleEgg
...PoracleGym
@@ -274,7 +284,12 @@ export const quickAdd = gql`
${Quest}
${Raid}
${Weather}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...PoracleHuman
...PoracleEgg
@@ -296,7 +311,12 @@ export const quickAdd = gql`
export const setHuman = gql`
${base}
${Human}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleHuman
@@ -307,7 +327,12 @@ export const setHuman = gql`
export const setProfile = gql`
${base}
${Profile}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleProfile
@@ -318,7 +343,12 @@ export const setProfile = gql`
export const pokemon = gql`
${base}
${Pokemon}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoraclePokemon
@@ -329,7 +359,12 @@ export const pokemon = gql`
export const raid = gql`
${base}
${Raid}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleRaid
@@ -340,7 +375,12 @@ export const raid = gql`
export const egg = gql`
${base}
${Egg}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleEgg
@@ -351,7 +391,12 @@ export const egg = gql`
export const gym = gql`
${base}
${Gym}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleGym
@@ -362,7 +407,12 @@ export const gym = gql`
export const invasion = gql`
${base}
${Invasion}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleInvasion
@@ -373,7 +423,12 @@ export const invasion = gql`
export const lure = gql`
${base}
${Lure}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleLure
@@ -384,7 +439,12 @@ export const lure = gql`
export const nest = gql`
${base}
${Nest}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleNest
@@ -395,7 +455,12 @@ export const nest = gql`
export const quest = gql`
${base}
${Quest}
- mutation Webhook($data: JSON!, $category: String!, $status: String!, $name: String!) {
+ mutation Webhook(
+ $data: JSON!
+ $category: String!
+ $status: String!
+ $name: String!
+ ) {
webhook(data: $data, category: $category, status: $status, name: $name) {
...Base
...PoracleQuest
diff --git a/yarn.lock b/yarn.lock
index c18082961..5b3e56fbe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1844,6 +1844,11 @@ eslint-config-airbnb@^19.0.4:
object.assign "^4.1.2"
object.entries "^1.1.5"
+eslint-config-prettier@^8.3.0:
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+ integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+
eslint-import-resolver-alias@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz#297062890e31e4d6651eb5eba9534e1f6e68fc97"
@@ -3749,6 +3754,11 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+prettier@^2.6.2:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+ integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+
prism-media@^1.2.9:
version "1.3.2"
resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-1.3.2.tgz#a1f04423ec15d22f3d62b1987b6a25dc49aad13b"