Merge pull request #929 from WatWowMap/rework-searching

Rework searching

packages/locales/lib/human/en.json

@@ -310,6 +310,7 @@
   "global_search_nests": "Enter Nest Pokémon Name...",
   "global_search_raids": "Enter Raid Boss Name...",
   "global_search_pokemon": "Enter Pokemon Name...",
+  "global_search_invasions": "Enter Grunt Type, Name, or Pokemon reward name...",
   "raid_level_badges": "Raid Level Badges",
   "options": "Options",
   "profile": "Profile",

packages/logger/lib/index.js

@@ -55,6 +55,7 @@ const HELPERS = /** @type {const} */ ({
   portals: chalk.hex('#795548')('[PORTALS]'),
   route: chalk.hex('#607d8b')('[ROUTE]'),
   routes: chalk.hex('#9e9e9e')('[ROUTES]'),
+  search: chalk.hex('#795548')('[SEARCH]'),
 
   custom: (text = '', color = '#64b5f6') =>
     chalk.hex(color)(`[${text.toUpperCase()}]`),

packages/types/lib/scanner.d.ts

@@ -237,6 +237,7 @@ export interface Pokemon {
   pvp_rankings_great_league?: PvpEntry[]
   pvp_rankings_ultra_league?: PvpEntry[]
   distance?: number
+  shiny?: boolean
 }
 
 export type FullPokemon = FullModel<Pokemon, PokemonModel>

server/src/configs/default.json

@@ -44,7 +44,8 @@
       "gyms": true,
       "portals": true,
       "nests": true,
-      "pokemon": true
+      "pokemon": true,
+      "invasions": true
     },
     "queryUpdateHours": {
       "pokemon": 0.17,
@@ -98,6 +99,8 @@
     "portalUpdateLimit": 30,
     "weatherCellLimit": 3,
     "searchResultsLimit": 15,
+    "searchSoftKmLimit": 10,
+    "searchHardKmLimit": 100,
     "nestHemisphere": "north",
     "gymValidDataLimit": 30,
     "hideOldGyms": false,

server/src/graphql/resolvers.js

@@ -443,6 +443,16 @@ const resolvers = {
       }
       return []
     },
+    searchInvasion: (_, args, { perms, Db }) => {
+      const { category, search } = args
+      if (perms?.[category] && /^[0-9\s\p{L}]+$/u.test(search)) {
+        if (!search || !search.trim()) {
+          return []
+        }
+        return Db.search('Pokestop', perms, args, 'searchInvasions')
+      }
+      return []
+    },
     searchLure: (_, args, { perms, Db }) => {
       const { category, search } = args
       if (perms?.[category] && /^[0-9\s\p{L}]+$/u.test(search)) {
@@ -465,7 +475,7 @@ const resolvers = {
     },
     searchable: (_, __, { perms }) => {
       const options = config.getSafe('api.searchable')
-      return Object.keys(options).filter((k) => options[k] && perms[k])
+      return Object.keys(options).filter((k) => perms[k] && options[k])
     },
     spawnpoints: (_, args, { perms, Db }) => {
       if (perms?.spawnpoints) {

server/src/graphql/typeDefs/index.graphql

@@ -91,6 +91,14 @@ type Query {
     locale: String
     onlyAreas: [String]
   ): [SearchLure]
+  searchInvasion(
+    search: String
+    category: String
+    lat: Float
+    lon: Float
+    locale: String
+    onlyAreas: [String]
+  ): [SearchInvasion]
   searchQuest(
     search: String
     category: String

server/src/graphql/typeDefs/map.graphql

@@ -83,6 +83,24 @@ type SearchLure {
   lure_expire_timestamp: Int
 }
 
+type SearchInvasion {
+  id: ID
+  name: String
+  url: String
+  lat: Float
+  lon: Float
+  distance: Float
+  grunt_type: Int
+  incident_expire_timestamp: Int
+  confirmed: Boolean
+  slot_1_pokemon_id: Int
+  slot_1_form: Int
+  slot_2_pokemon_id: Int
+  slot_2_form: Int
+  slot_3_pokemon_id: Int
+  slot_3_form: Int
+}
+
 type SearchQuest {
   id: ID
   name: String

server/src/models/Gym.js

@@ -459,7 +459,7 @@ class Gym extends Model {
     }
   }
 
-  static async search(perms, args, { isMad }, distance) {
+  static async search(perms, args, { isMad }, distance, bbox) {
     const { areaRestrictions } = perms
     const { onlyAreas = [], search } = args
     const query = this.query()
@@ -471,6 +471,8 @@ class Gym extends Model {
         'url',
         distance,
       ])
+      .whereBetween(isMad ? 'latitude' : 'lat', [bbox.minLat, bbox.maxLat])
+      .andWhereBetween(isMad ? 'longitude' : 'lon', [bbox.minLon, bbox.maxLon])
       .whereRaw(`LOWER(name) LIKE '%${search}%'`)
       .limit(searchResultsLimit)
       .orderBy('distance')
@@ -485,7 +487,13 @@ class Gym extends Model {
     return query
   }
 
-  static async searchRaids(perms, args, { isMad, hasAlignment }, distance) {
+  static async searchRaids(
+    perms,
+    args,
+    { isMad, hasAlignment },
+    distance,
+    bbox,
+  ) {
     const { search, locale, onlyAreas = [] } = args
     const pokemonIds = Object.keys(Event.masterfile.pokemon).filter((pkmn) =>
       i18next.t(`poke_${pkmn}`, { lng: locale }).toLowerCase().includes(search),
@@ -507,6 +515,8 @@ class Gym extends Model {
           : 'raid_pokemon_evolution',
         distance,
       ])
+      .whereBetween(isMad ? 'latitude' : 'lat', [bbox.minLat, bbox.maxLat])
+      .andWhereBetween(isMad ? 'longitude' : 'lon', [bbox.minLon, bbox.maxLon])
       .whereIn(isMad ? 'pokemon_id' : 'raid_pokemon_id', pokemonIds)
       .limit(searchResultsLimit)
       .orderBy('distance')

server/src/models/Nest.js

@@ -139,9 +139,10 @@ class Nest extends Model {
    * @param {object} args
    * @param {import("@rm/types").DbContext} ctx
    * @param {import('objection').Raw} distance
+   * @param {ReturnType<typeof import("server/src/services/functions/getBbox").getBboxFromCenter>} bbox
    * @returns {Promise<FullNest[]>}
    */
-  static async search(perms, args, { isMad }, distance) {
+  static async search(perms, args, { isMad }, distance, bbox) {
     const { search, locale, onlyAreas = [] } = args
     const pokemonIds = Object.keys(Event.masterfile.pokemon).filter((pkmn) =>
       i18next.t(`poke_${pkmn}`, { lng: locale }).toLowerCase().includes(search),
@@ -159,6 +160,8 @@ class Nest extends Model {
         'pokemon_form AS nest_pokemon_form',
         distance,
       ])
+      .whereBetween(isMad ? 'latitude' : 'lat', [bbox.minLat, bbox.maxLat])
+      .andWhereBetween(isMad ? 'longitude' : 'lon', [bbox.minLon, bbox.maxLon])
       .whereNotNull('pokemon_id')
       .where((builder) => {
         builder

server/src/models/Pokemon.js

@@ -567,9 +567,10 @@ class Pokemon extends Model {
    * @param {object} args
    * @param {import("@rm/types").DbContext} ctx
    * @param {number} distance
+   * @param {ReturnType<typeof import("server/src/services/functions/getBbox").getBboxFromCenter>} bbox
    * @returns {Promise<Partial<import("@rm/types").Pokemon>[]>}
    */
-  static async search(perms, args, { isMad, mem, secret }, distance) {
+  static async search(perms, args, { isMad, mem, secret }, distance, bbox) {
     const { search, locale, onlyAreas = [] } = args
     const pokemonIds = Object.keys(Event.masterfile.pokemon).filter((pkmn) =>
       i18next.t(`poke_${pkmn}`, { lng: locale }).toLowerCase().includes(search),
@@ -578,6 +579,8 @@ class Pokemon extends Model {
     const query = this.query()
       .select(['pokemon_id', distance])
       .whereIn('pokemon_id', pokemonIds)
+      .whereBetween(isMad ? 'latitude' : 'lat', [bbox.minLat, bbox.maxLat])
+      .andWhereBetween(isMad ? 'longitude' : 'lon', [bbox.minLon, bbox.maxLon])
       .andWhere(
         isMad ? 'disappear_time' : 'expire_timestamp',
         '>=',
@@ -618,7 +621,15 @@ class Pokemon extends Model {
               latitude: args.lat,
               longitude: args.lon,
             },
-            limit: searchResultsLimit * 4,
+            min: {
+              latitude: bbox.minLat,
+              longitude: bbox.minLon,
+            },
+            max: {
+              latitude: bbox.maxLat,
+              longitude: bbox.maxLon,
+            },
+            limit: searchResultsLimit,
             searchIds: pokemonIds.map((id) => +id),
             global: {},
             filters: {},
@@ -627,11 +638,10 @@ class Pokemon extends Model {
       'POST',
       secret,
     )
+    if (!results) return []
     return results
       .filter(
-        (item, i) =>
-          i < searchResultsLimit &&
-          (!mem || filterRTree(item, perms.areaRestrictions, onlyAreas)),
+        (item) => !mem || filterRTree(item, perms.areaRestrictions, onlyAreas),
       )
       .map((poke) => ({
         ...poke,