add poracle size support

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "React based frontend map.",
   "main": "ReactMap.js",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",

public/base-locales/en.json

@@ -49,6 +49,7 @@
   "slider_def_iv": "Defense",
   "slider_sta_iv": "Stamina",
   "slider_level": "Level",
+  "slider_size": "Size",
   "abbreviation_level": "L",
   "lvl": "Lvl",
   "cap": "Cap",
@@ -568,5 +569,6 @@
   "size_3": "M",
   "size_4": "XL",
   "size_5": "XXL",
-  "show_size_indicator": "Show Size Indicator"
-}
+  "show_size_indicator": "Show Size Indicator",
+  "size": "Size"
+}

server/src/graphql/poracleTypes.js

@@ -120,6 +120,8 @@ module.exports = gql`
     min_time: Int
     rarity: Int
     max_rarity: Int
+    size: Int
+    max_size: Int
     pvp_ranking_worst: Int
     pvp_ranking_best: Int
     pvp_ranking_min_cp: Int

server/src/services/initWebhooks.js

@@ -35,11 +35,11 @@ module.exports = async function initWebhooks(webhook, config) {
 
       if (
         major < 4 ||
-        (major === 4 && minor < 5) ||
-        (major === 4 && minor === 5 && patch < 1)
+        (major === 4 && minor < 6) ||
+        (major === 4 && minor === 6 && patch < 0)
       ) {
         throw new Error(
-          `Poracle must be at least version 4.5.1, current version is ${hookConfig.version}`,
+          `Poracle must be at least version 4.6.0, current version is ${hookConfig.version}`,
         )
       }
 

server/src/services/ui/webhook.js

@@ -23,6 +23,8 @@ module.exports = function webhookUi(provider, hookConfig, pvp, leagues) {
             max_iv: 100,
             min_level: 0,
             max_level: 40,
+            size: 1,
+            max_size: 5,
             rarity: -1,
             max_rarity: 6,
             sta: 0,
@@ -107,22 +109,30 @@ module.exports = function webhookUi(provider, hookConfig, pvp, leagues) {
                   low: 'sta',
                   high: 'max_sta',
                 },
+                {
+                  name: 'size',
+                  label: '',
+                  noTextInput: true,
+                  min: 1,
+                  max: 5,
+                  perm: 'iv',
+                  low: 'size',
+                  high: 'max_size',
+                  marks: [1, 2, 3, 4, 5],
+                  markI18n: 'size_',
+                },
               ],
               texts: [
                 {
                   name: 'min_time',
                   type: 'number',
                   max: 60,
                   adornment: 's',
-                  xs: 4,
-                  sm: 4,
+                  xs: 12,
+                  sm: 6,
                   width: 100,
                 },
               ],
-              booleans: [
-                { name: 'xs', xs: 4, sm: 4, override: true },
-                { name: 'xl', xs: 4, sm: 4, override: true },
-              ],
             },
             pvp: {
               selects: [

src/components/layout/dialogs/filters/SliderTile.jsx

@@ -15,6 +15,9 @@ export default function SliderTile({
     high,
     step,
     i18nKey,
+    marks,
+    markI18n,
+    noTextInput,
   },
   handleChange,
   filterValues,
@@ -56,14 +59,16 @@ export default function SliderTile({
     }
   }
 
+  if (!tempValues) return null
+
   const textColor =
-    (tempValues[0] === min && tempValues[1] === max) || disabled
+    (tempValues && tempValues[0] === min && tempValues[1] === max) || disabled
       ? '#616161'
       : 'white'
 
   return (
     <Grid container direction="row" justifyContent="center" alignItems="center">
-      <Grid item xs={4}>
+      <Grid item xs={noTextInput ? 12 : 4}>
         <Typography
           noWrap={fullName}
           onClick={() => setFullName(!fullName)}
@@ -72,7 +77,7 @@ export default function SliderTile({
           {t(i18nKey || `slider_${name}`)}
         </Typography>
       </Grid>
-      {['min', 'max'].map((each, index) => (
+      {(noTextInput ? [] : ['min', 'max']).map((each, index) => (
         <Grid
           item
           xs={4}
@@ -118,7 +123,16 @@ export default function SliderTile({
           }}
           disabled={disabled}
           valueLabelDisplay="auto"
+          valueLabelFormat={marks ? (e) => t(`${markI18n}${e}`) : undefined}
           step={step}
+          marks={
+            marks
+              ? marks.map((each) => ({
+                  value: each,
+                  label: t(`${markI18n}${each}`),
+                }))
+              : undefined
+          }
         />
       </Grid>
     </Grid>

src/components/layout/dialogs/webhooks/WebhookAdv.jsx

@@ -47,6 +47,7 @@ const skipFields = [
   'gender',
   'description',
   'uid',
+  'max_size',
   'id',
   'ping',
   'pokemon_id',
@@ -348,10 +349,20 @@ export default function WebhookAdvanced({
   }
 
   const checkDefaults = (field) => {
+    if (
+      field === 'size' &&
+      (poracleValues.size > 1 || poracleValues.max_size < 5)
+    )
+      return poracleValues.size === poracleValues.max_size
+        ? `size:${t(`size_${poracleValues.size}`)}`
+        : `size:${t(`size_${poracleValues.size}`)}-${t(
+            `size_${poracleValues.max_size}`,
+          )}`
+
     if (
       field === 'distance' &&
       poracleValues.byDistance &&
-      parseInt(poracleValues.distance)
+      +poracleValues.distance
     )
       return `d${poracleValues.distance}`
     if (field === 'min_time' && parseInt(poracleValues.min_time))

src/components/layout/dialogs/webhooks/tiles/TrackedTile.jsx

@@ -46,7 +46,6 @@ export default function PokemonTile({ data, rowIndex, columnIndex, style }) {
       newFilters &&
       !Object.keys(newFilters).every((key) => newFilters[key] === item[key])
     ) {
-      // eslint-disable-next-line camelcase
       setTempFilters({ [id]: { ...newFilters, enabled: true } })
       setSend(true)
     }

src/services/Poracle.js

@@ -354,6 +354,8 @@ export default class Poracle {
         reactMapFriendly[`${key}_iv`] = [values[key], values[`max_${key}`]]
       } else if (key.startsWith('rarity')) {
         reactMapFriendly.rarity = [values[key], values[`max_${key}`]]
+      } else if (key.startsWith('size')) {
+        reactMapFriendly.size = [values[key], values[`max_${key}`]]
       } else {
         reactMapFriendly[key] = values[key]
       }
@@ -471,7 +473,7 @@ export default class Poracle {
                 ),
               )
             }
-            fields.forEach(
+            new Set(fields).forEach(
               (field) =>
                 (newPokemon[field] =
                   pkmn[field] === undefined ? defaults[field] : pkmn[field]),
@@ -560,6 +562,16 @@ export default class Poracle {
               }-${item.max_sta}${item.clean ? ` | ${t('clean')} ` : ''}${
                 item.distance ? ` | d${item.distance}` : ''
               }`
+        }${
+          item.size > 1 || item.max_size < 5
+            ? `${t('size', 'Size')}:${
+                item.size === item.max_size
+                  ? `size:${t(`size_${item.size}`)}`
+                  : `size:${t(`size_${item.size}`)}-${t(
+                      `size_${item.max_size}`,
+                    )}`
+              }`
+            : ''
         }`
       default:
         return item.description

src/services/queries/webhook.js

@@ -152,6 +152,8 @@ const Pokemon = gql`
       pvp_ranking_worst
       pvp_ranking_cap
       rarity
+      size
+      max_size
       sta
       template
       uid