Revert "fix: search"

This reverts commit 26eaaab.

Author: Mygod

packages/types/lib/server.d.ts

@@ -34,6 +34,7 @@ export interface DbContext {
   hasRewardAmount: boolean
   hasPowerUp: boolean
   hasAltQuests: boolean
+  hasLayerColumn: boolean
   hasMultiInvasions: boolean
   multiInvasionMs: boolean
   hasConfirmed: boolean

server/src/models/Gym.js

@@ -384,8 +384,7 @@ class Gym extends Model {
     }
   }
 
-  // eslint-disable-next-line no-empty-pattern
-  static async search(perms, args, {}, distance, bbox) {
+  static async search(perms, args, distance, bbox) {
     const { areaRestrictions } = perms
     const { onlyAreas = [], search = '' } = args
 

server/src/models/Nest.js

@@ -164,8 +164,7 @@ class Nest extends Model {
    * @param {ReturnType<typeof import("server/src/utils/getBbox").getBboxFromCenter>} bbox
    * @returns {Promise<FullNest[]>}
    */
-  // eslint-disable-next-line no-empty-pattern
-  static async search(perms, args, {}, distance, bbox) {
+  static async search(perms, args, distance, bbox) {
     const { search, locale, onlyAreas = [] } = args
     const pokemonIds = Object.keys(state.event.masterfile.pokemon).filter(
       (pkmn) =>

server/src/models/Pokestop.js

@@ -103,8 +103,7 @@ class Pokestop extends Model {
     } = args
     const midnight = getUserMidnight(args)
     const ts = Math.floor(Date.now() / 1000)
-    const { queryLimits, stopValidDataLimit, hideOldPokestops } =
-      config.getSafe('api')
+    const { queryLimits, stopValidDataLimit } = config.getSafe('api')
 
     const {
       lures: lurePerms,
@@ -116,9 +115,7 @@ class Pokestop extends Model {
     } = perms
 
     const query = this.query()
-    if (hideOldPokestops) {
-      query.where('pokestop.updated', '>', ts - stopValidDataLimit * 86400)
-    }
+    query.where('pokestop.updated', '>', ts - stopValidDataLimit * 86400)
 
     Pokestop.joinIncident(query, hasMultiInvasions, multiInvasionMs)
     query
@@ -1320,8 +1317,7 @@ class Pokestop extends Model {
     return quest
   }
 
-  // eslint-disable-next-line no-empty-pattern
-  static async search(perms, args, {}, distance, bbox) {
+  static async search(perms, args, distance, bbox) {
     const { onlyAreas = [], search = '' } = args
     const query = this.query()
       .select(['name', 'id', 'lat', 'lon', 'url', distance])
@@ -1478,8 +1474,7 @@ class Pokestop extends Model {
     return mapped.map((result) => this.parseRdmRewards(result)).filter(Boolean)
   }
 
-  // eslint-disable-next-line no-empty-pattern
-  static async searchLures(perms, args, {}, distance, bbox) {
+  static async searchLures(perms, args, distance, bbox) {
     const { search, onlyAreas = [], locale } = args
     const ts = Math.floor(Date.now() / 1000)
 
@@ -1635,7 +1630,7 @@ class Pokestop extends Model {
    * @returns {Promise<{ hasConfirmedInvasions: boolean }>}
    */
   static async getFilterContext({ hasConfirmed }) {
-    if (!hasConfirmed) return { hasConfirmedInvasions: false }
+    if (false || !hasConfirmed) return { hasConfirmedInvasions: false }
     const result = await this.query()
       .from('incident')
       .count('id', { as: 'total' })

server/src/models/Portal.js

@@ -51,8 +51,7 @@ class Portal extends Model {
    * @param {ReturnType<typeof import("server/src/utils/getBbox").getBboxFromCenter>} bbox
    * @returns {Promise<import("@rm/types").FullPortal[]>}
    */
-  // eslint-disable-next-line no-empty-pattern
-  static async search(perms, args, {}, distance, bbox) {
+  static async search(perms, args, distance, bbox) {
     const { areaRestrictions } = perms
     const { onlyAreas = [], search = '' } = args
     const { searchResultsLimit, portalUpdateLimit } = config.getSafe('api')

server/src/models/Station.js

@@ -230,8 +230,7 @@ class Station extends Model {
    * @param {ReturnType<typeof import("server/src/utils/getBbox").getBboxFromCenter>} bbox
    * @returns {Promise<import("@rm/types").FullStation[]>}
    */
-  // eslint-disable-next-line no-empty-pattern
-  static async search(perms, args, {}, distance, bbox) {
+  static async search(perms, args, distance, bbox) {
     const { areaRestrictions } = perms
     const { onlyAreas = [], search = '', locale } = args
     const { searchResultsLimit, stationUpdateLimit } = config.getSafe('api')

server/src/services/DbManager.js

@@ -150,6 +150,7 @@ class DbManager extends Logger {
       ])
     const hasStationedGmax =
       'total_stationed_gmax' in (await schema('station').columnInfo())
+    const [hasLayerColumn] = [false]
     const [hasMultiInvasions, multiInvasionMs, hasConfirmed] = await schema(
       'incident',
     )
@@ -179,6 +180,7 @@ class DbManager extends Logger {
       hasRewardAmount,
       hasPowerUp,
       hasAltQuests,
+      hasLayerColumn,
       hasMultiInvasions,
       multiInvasionMs,
       hasConfirmed,