fix: various type adjustments

WatWowMap · Aug 29, 2024 · ab51750 · ab51750
1 parent 77dadb9
commit ab51750
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 33 deletions.
diff --git a/packages/types/lib/augmentations.d.ts b/packages/types/lib/augmentations.d.ts
@@ -75,3 +75,7 @@ declare module 'http' {
     bodySize?: number
   }
 }
+
+declare module 'ohbem' {
+  export = Ohbem
+}
diff --git a/packages/types/lib/scanner.d.ts b/packages/types/lib/scanner.d.ts
@@ -196,20 +196,7 @@ export interface Pokestop {
 
 export type FullPokestop = FullModel<Pokestop, PokestopModel>
 
-export interface PvpEntry {
-  pokemon: number
-  form: number
-  cap: number
-  value: number
-  level: number
-  cp: number
-  percentage: number
-  rank: number
-  capped: boolean
-  evolution: number
-}
-
-export type CleanPvp = Record<string, PvpEntry[]>
+export type CleanPvp = Record<string, import('ohbem').PvPRankEntry[]>
 
 export interface Pokemon {
   id: string
@@ -247,8 +234,8 @@ export interface Pokemon {
   expire_timestamp_verified: boolean
   updated: number
   pvp: CleanPvp
-  pvp_rankings_great_league?: PvpEntry[]
-  pvp_rankings_ultra_league?: PvpEntry[]
+  pvp_rankings_great_league?: import('ohbem').PvPRankEntry[]
+  pvp_rankings_ultra_league?: import('ohbem').PvPRankEntry[]
   distance?: number
   shiny?: boolean
 }

diff --git a/server/src/filters/pokemon/Backend.js b/server/src/filters/pokemon/Backend.js
@@ -196,7 +196,7 @@ module.exports = class PkmnBackend {
   }
 
   /**
-   * @param {import("@rm/types").PvpEntry} entry
+   * @param {import("ohbem").PvPRankEntry} entry
    * @param {string} league
    * @returns {boolean}
    */
@@ -226,8 +226,8 @@ module.exports = class PkmnBackend {
 
   /**
    * @param {string} league
-   * @param {import("@rm/types").PvpEntry[]} data
-   * @returns {{ best: number; filtered: import("@rm/types").PvpEntry[]}}
+   * @param {import("ohbem").PvPRankEntry[]} data
+   * @returns {{ best: number; filtered: import("ohbem").PvPRankEntry[]}}
    */
   getRanks(league, data) {
     const filtered =

diff --git a/server/src/filters/pokemon/functions.js b/server/src/filters/pokemon/functions.js
@@ -11,7 +11,7 @@ const { log, TAGS } = require('@rm/logger')
 
 /**
  * @param {object} pokemon
- * @returns {Record<string, import('@rm/types').PvpEntry[]>}
+ * @returns {Record<string, import("ohbem").PvPRankEntry[]>}
  */
 function getParsedPvp(pokemon) {
   if (pokemon.pvp)

diff --git a/server/src/services/PvpWrapper.js b/server/src/services/PvpWrapper.js
@@ -9,7 +9,6 @@ class PvpWrapper extends Ohbem {
   constructor() {
     super({
       leagues: config.getSafe('api.pvp.leagueObj'),
-      pokemonData: {},
       levelCaps: config.getSafe('api.pvp.levels'),
       cachingStrategy: Ohbem.cachingStrategies.memoryHeavy,
     })
@@ -24,7 +23,7 @@ class PvpWrapper extends Ohbem {
   /**
    * @param {import("@rm/types").Pokemon} pokemon
    * @param {number} currentTs
-   * @returns {import("@rm/types").CleanPvp}
+   * @returns {Record<string, import("ohbem").PvPRankEntry[]>}
    */
   resultWithCache(pokemon, currentTs) {
     if (pokemon.pokemon_id === 132) return {}

diff --git a/src/assets/constants.js b/src/assets/constants.js
@@ -51,6 +51,6 @@ export const FILTER_SKIP_LIST = ['filter', 'enabled', 'legacy']
 
 export const ALWAYS_EXCLUDED = new Set(['donor', 'blockedGuildNames', 'admin'])
 
-export const SCAN_MODES = /** @type */ (['confirmed', 'loading', 'error'])
+export const SCAN_MODES = ['confirmed', 'loading', 'error']
 
 export const SCAN_SIZES = /** @type {const} */ (['S', 'M', 'XL'])
diff --git a/src/components/filters/Advanced.jsx b/src/components/filters/Advanced.jsx
@@ -1,6 +1,6 @@
 // @ts-check
 import * as React from 'react'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import Dialog from '@mui/material/Dialog'
 import DialogContent from '@mui/material/DialogContent'
 import List from '@mui/material/List'

diff --git a/src/components/filters/SlotSelection.jsx b/src/components/filters/SlotSelection.jsx
@@ -1,6 +1,6 @@
 // @ts-check
 import * as React from 'react'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import DialogContent from '@mui/material/DialogContent'
 import IconButton from '@mui/material/IconButton'
 import Divider from '@mui/material/Divider'

diff --git a/src/components/inputs/BoolToggle.jsx b/src/components/inputs/BoolToggle.jsx
@@ -4,7 +4,7 @@ import ListItem from '@mui/material/ListItem'
 import ListItemText from '@mui/material/ListItemText'
 import Switch from '@mui/material/Switch'
 import List from '@mui/material/List'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
 
 import { useDeepStore } from '@store/useStorage'

diff --git a/src/components/inputs/SliderTile.jsx b/src/components/inputs/SliderTile.jsx
@@ -1,7 +1,7 @@
 // @ts-check
 /* eslint-disable react/jsx-no-duplicate-props */
 import * as React from 'react'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import TextField from '@mui/material/TextField'
 import Slider from '@mui/material/Slider'
 import { styled } from '@mui/material/styles'

diff --git a/src/components/virtual/VirtualGrid.jsx b/src/components/virtual/VirtualGrid.jsx
@@ -1,6 +1,6 @@
 // @ts-check
 import * as React from 'react'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import { VirtuosoGrid } from 'react-virtuoso'
 
 const STYLE = /** @type {React.CSSProperties} */ ({

diff --git a/src/features/profile/ExtraFields.jsx b/src/features/profile/ExtraFields.jsx
@@ -1,6 +1,6 @@
 // @ts-check
 import * as React from 'react'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import TextField from '@mui/material/TextField'
 import { useMutation } from '@apollo/client'
 import { useTranslation } from 'react-i18next'

diff --git a/src/features/profile/LinkAccounts.jsx b/src/features/profile/LinkAccounts.jsx
@@ -2,7 +2,7 @@
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import Select from '@mui/material/Select'
 import MenuItem from '@mui/material/MenuItem'
 import Typography from '@mui/material/Typography'

diff --git a/src/features/profile/Permissions.jsx b/src/features/profile/Permissions.jsx
@@ -1,7 +1,7 @@
 // @ts-check
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import Box from '@mui/material/Box'
 import Card from '@mui/material/Card'
 import CardContent from '@mui/material/CardContent'

diff --git a/src/features/search/renderOption.jsx b/src/features/search/renderOption.jsx
@@ -4,7 +4,7 @@ import { t } from 'i18next'
 import ListItem from '@mui/material/ListItem'
 import ListItemIcon from '@mui/material/ListItemIcon'
 import ListItemText from '@mui/material/ListItemText'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import Divider from '@mui/material/Divider'
 import Typography from '@mui/material/Typography'
 

diff --git a/src/features/webhooks/tiles/TrackedTile.jsx b/src/features/webhooks/tiles/TrackedTile.jsx
@@ -3,7 +3,7 @@
 import * as React from 'react'
 import DeleteForever from '@mui/icons-material/DeleteForever'
 import Edit from '@mui/icons-material/Edit'
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Grid2 from '@mui/material/Unstable_Grid2'
 import Typography from '@mui/material/Typography'
 import IconButton from '@mui/material/IconButton'
 import Checkbox from '@mui/material/Checkbox'