chore: code style

Author: Mygod

server/src/models/Gym.js

@@ -136,13 +136,9 @@ class Gym extends Model {
     const latCol = isMad ? 'latitude' : 'lat'
     const lonCol = isMad ? 'longitude' : 'lon'
     const idCol = isMad ? 'gym.gym_id' : 'id'
-    const manualId =
-      typeof onlyManualId === 'string' || typeof onlyManualId === 'number'
-        ? onlyManualId
-        : null
 
     applyManualIdFilter(query, {
-      manualId,
+      manualId: onlyManualId,
       latColumn: latCol,
       lonColumn: lonCol,
       idColumn: idCol,

server/src/models/Nest.js

@@ -28,14 +28,9 @@ class Nest extends Model {
   static async getAll(perms, args, { polygon }) {
     const { areaRestrictions } = perms
     const { minLat, minLon, maxLat, maxLon, filters } = args
-    const manualId =
-      typeof filters.onlyManualId === 'string' ||
-      typeof filters.onlyManualId === 'number'
-        ? filters.onlyManualId
-        : null
     const query = this.query().select(['*', 'nest_id AS id'])
     applyManualIdFilter(query, {
-      manualId,
+      manualId: filters.onlyManualId,
       latColumn: 'lat',
       lonColumn: 'lon',
       idColumn: 'nest_id',

server/src/models/Pokemon.js

@@ -14,7 +14,10 @@ const config = require('@rm/config')
 const { getAreaSql } = require('../utils/getAreaSql')
 const { filterRTree } = require('../utils/filterRTree')
 const { fetchJson } = require('../utils/fetchJson')
-const { applyManualIdFilter } = require('../utils/manualFilter')
+const {
+  applyManualIdFilter,
+  normalizeManualId,
+} = require('../utils/manualFilter')
 const {
   IV_CALC,
   LEVEL_CALC,
@@ -147,15 +150,11 @@ class Pokemon extends Model {
       if (!noPokemonSelect) return []
     }
 
-    const manualIdRaw =
-      typeof args.filters.onlyManualId === 'string' ||
-      typeof args.filters.onlyManualId === 'number'
-        ? args.filters.onlyManualId
-        : null
-
     const query = this.query()
 
-    let manualId = null
+    const manualIdFilter = normalizeManualId(args.filters.onlyManualId)
+
+    let manualId = manualIdFilter
 
     const pokemonIds = []
     const pokemonForms = []
@@ -184,7 +183,7 @@ class Pokemon extends Model {
         isMad ? this.knex().fn.now() : ts,
       )
       manualId = applyManualIdFilter(query, {
-        manualId: manualIdRaw,
+        manualId: manualIdFilter,
         latColumn: isMad ? 'pokemon.latitude' : 'lat',
         lonColumn: isMad ? 'pokemon.longitude' : 'lon',
         idColumn: isMad ? 'pokemon.encounter_id' : 'id',
@@ -256,8 +255,6 @@ class Pokemon extends Model {
       if (!getAreaSql(query, areaRestrictions, onlyAreas, isMad, 'pokemon')) {
         return []
       }
-    } else {
-      manualId = manualIdRaw
     }
 
     const filters = mem
@@ -687,11 +684,7 @@ class Pokemon extends Model {
     const { isMad, hasSize, hasHeight, mem, secret, httpAuth } = ctx
     const ts = Math.floor(Date.now() / 1000)
     const { filterMap, globalFilter } = this.getFilters(perms, args, ctx)
-    const manualIdRaw =
-      typeof args.filters.onlyManualId === 'string' ||
-      typeof args.filters.onlyManualId === 'number'
-        ? args.filters.onlyManualId
-        : null
+    const manualIdFilter = normalizeManualId(args.filters.onlyManualId)
     const queryLimits = config.getSafe('api.queryLimits')
 
     if (!perms.iv && !perms.pvp) {
@@ -732,7 +725,7 @@ class Pokemon extends Model {
       return []
     }
     const manualId = applyManualIdFilter(query, {
-      manualId: manualIdRaw,
+      manualId: manualIdFilter,
       latColumn: isMad ? 'pokemon.latitude' : 'lat',
       lonColumn: isMad ? 'pokemon.longitude' : 'lon',
       idColumn: isMad ? 'pokemon.encounter_id' : 'id',

server/src/models/Pokestop.js

@@ -139,12 +139,6 @@ class Pokestop extends Model {
     const ts = Math.floor(Date.now() / 1000)
     const { queryLimits, stopValidDataLimit, hideOldPokestops } =
       config.getSafe('api')
-    const manualId =
-      typeof args.filters.onlyManualId === 'string' ||
-      typeof args.filters.onlyManualId === 'number'
-        ? args.filters.onlyManualId
-        : null
-
     const {
       lures: lurePerms,
       quests: questPerms,
@@ -191,7 +185,7 @@ class Pokestop extends Model {
     }
     Pokestop.joinIncident(query, hasMultiInvasions, isMad, multiInvasionMs)
     applyManualIdFilter(query, {
-      manualId,
+      manualId: args.filters.onlyManualId,
       latColumn: isMad ? 'latitude' : 'lat',
       lonColumn: isMad ? 'longitude' : 'lon',
       idColumn: isMad ? 'pokestop.pokestop_id' : 'id',

server/src/models/Portal.js

@@ -29,14 +29,9 @@ class Portal extends Model {
       maxLat,
       maxLon,
     } = args
-    const manualId =
-      typeof args.filters.onlyManualId === 'string' ||
-      typeof args.filters.onlyManualId === 'number'
-        ? args.filters.onlyManualId
-        : null
     const query = this.query()
     applyManualIdFilter(query, {
-      manualId,
+      manualId: args.filters.onlyManualId,
       latColumn: 'lat',
       lonColumn: 'lon',
       idColumn: 'id',

server/src/models/Route.js

@@ -45,12 +45,6 @@ class Route extends Model {
     const ts =
       getEpoch() - config.getSafe('api.routeUpdateLimit') * 24 * 60 * 60
     const distanceInMeters = (onlyDistance || [0.5, 100]).map((x) => x * 1000)
-    const manualId =
-      typeof args.filters.onlyManualId === 'string' ||
-      typeof args.filters.onlyManualId === 'number'
-        ? args.filters.onlyManualId
-        : null
-
     const startLatitude = isMad ? 'start_poi_latitude' : 'start_lat'
     const startLongitude = isMad ? 'start_poi_longitude' : 'start_lon'
     const distanceMeters = isMad ? 'route_distance_meters' : 'distance_meters'
@@ -61,8 +55,8 @@ class Route extends Model {
     const query = this.query().select(
       isMad ? GET_MAD_ALL_SELECT : GET_ALL_SELECT,
     )
-    applyManualIdFilter(query, {
-      manualId,
+    const manualId = applyManualIdFilter(query, {
+      manualId: args.filters.onlyManualId,
       latColumn: startLatitude,
       lonColumn: startLongitude,
       idColumn,

server/src/models/Station.js

@@ -31,12 +31,6 @@ class Station extends Model {
       onlyGmaxStationed,
     } = args.filters
     const ts = getEpoch()
-    const manualId =
-      typeof args.filters.onlyManualId === 'string' ||
-      typeof args.filters.onlyManualId === 'number'
-        ? args.filters.onlyManualId
-        : null
-
     const select = [
       'id',
       'name',
@@ -49,7 +43,7 @@ class Station extends Model {
 
     const query = this.query()
     applyManualIdFilter(query, {
-      manualId,
+      manualId: args.filters.onlyManualId,
       latColumn: 'lat',
       lonColumn: 'lon',
       idColumn: 'id',

server/src/utils/manualFilter.js

@@ -1,5 +1,21 @@
 // @ts-check
 
+/**
+ * @param {unknown} manualId
+ * @returns {string | number | null}
+ */
+function normalizeManualId(manualId) {
+  if (
+    manualId === undefined ||
+    manualId === null ||
+    manualId === '' ||
+    (typeof manualId !== 'string' && typeof manualId !== 'number')
+  ) {
+    return null
+  }
+  return manualId
+}
+
 /**
  * @param {import('objection').QueryBuilder} query
  * @param {{
@@ -20,13 +36,7 @@ function applyManualIdFilter(query, options) {
     bounds,
   } = options
 
-  const manualId =
-    rawManual !== undefined &&
-    rawManual !== null &&
-    rawManual !== '' &&
-    (typeof rawManual === 'string' || typeof rawManual === 'number')
-      ? rawManual
-      : null
+  const manualId = normalizeManualId(rawManual)
 
   if (manualId !== null) {
     query.where((builder) => {
@@ -44,4 +54,4 @@ function applyManualIdFilter(query, options) {
   return manualId
 }
 
-module.exports = { applyManualIdFilter }
+module.exports = { applyManualIdFilter, normalizeManualId }