Skip to content

Commit ece3197

Browse files
TurtIeSocksTurtIeSocks
authored
Merge pull request #1041 from WatWowMap/develop
Sync Dev to Main
2 parents 1a6f284 + 0cf630c commit ece3197

25 files changed

Lines changed: 313 additions & 489 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# [1.34.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.33.1...v1.34.0-develop.1) (2024-08-20)
2+
3+
4+
### Bug Fixes
5+
6+
* `GET /api/v1/trial/status/:strategy` endpoint ([78862b6](https://github.com/WatWowMap/ReactMap/commit/78862b60237c103de91bdeca6f04d93c9566bc86))
7+
8+
9+
### Features
10+
11+
* more nest viewing options ([959116d](https://github.com/WatWowMap/ReactMap/commit/959116db9caffd7ffa0236237397b18d36a36559))
12+
113
## [1.33.1](https://github.com/WatWowMap/ReactMap/compare/v1.33.0...v1.33.1) (2024-08-17)
214

315

‎config/custom-environment-variables.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,8 @@
10121012
"avgSliderStep": {
10131013
"__name": "DEFAULT_FILTERS_NESTS_AVG_SLIDER_STEP",
10141014
"__format": "number"
1015-
}
1015+
},
1016+
"active": "DEFAULT_FILTERS_NESTS_ACTIVE"
10161017
},
10171018
"pokestops": {
10181019
"enabled": {

‎config/default.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,8 @@
474474
"allPokemon": true,
475475
"onlyShowAvailable": true,
476476
"avgFilter": [0, 100],
477-
"avgSliderStep": 1
477+
"avgSliderStep": 1,
478+
"active": "active"
478479
},
479480
"pokestops": {
480481
"enabled": false,

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reactmap",
3-
"version": "1.33.1",
3+
"version": "1.34.0-develop.1",
44
"private": true,
55
"description": "React based frontend map.",
66
"license": "MIT",
@@ -35,7 +35,7 @@
3535
"nodemonConfig": {
3636
"watch": [
3737
"server/src/**/*.js",
38-
"server/src/configs/default.json",
38+
"config/default.json",
3939
"packages/**/*"
4040
],
4141
"ignore": [
@@ -193,7 +193,7 @@
193193
"@types/node-fetch": "2.6.1",
194194
"@types/react": "^18.3.3",
195195
"@types/react-dom": "^18.3.0",
196-
"@vitejs/plugin-react": "^4.3.1",
196+
"@vitejs/plugin-react-swc": "3.7.0",
197197
"commitizen": "^4.3.0",
198198
"cz-conventional-commit": "^1.0.6",
199199
"eslint": "^8.44.0",

‎packages/config/.configref‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24232
1+
24258

‎server/src/filters/builder/base.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ function buildDefaultFilters(perms) {
6666
enabled: defaultFilters.nests.enabled,
6767
onlyShowAvailable: defaultFilters.nests.onlyShowAvailable,
6868
pokemon: defaultFilters.nests.pokemon,
69-
polygons: defaultFilters.nests.polygons,
7069
avgFilter: defaultFilters.nests.avgFilter,
70+
polygons: defaultFilters.nests.polygons,
7171
standard: new BaseFilter(),
7272
filter: pokemon.nests,
73+
active: defaultFilters.nests.active,
7374
}
7475
: undefined,
7576
pokestops:

‎server/src/models/Nest.js‎

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// @ts-check
2-
/* eslint-disable no-nested-ternary */
32
const { Model } = require('objection')
43
const i18next = require('i18next')
54
const config = require('@rm/config')
@@ -28,18 +27,29 @@ class Nest extends Model {
2827
static async getAll(perms, args, { polygon }) {
2928
const { areaRestrictions } = perms
3029
const { minLat, minLon, maxLat, maxLon, filters } = args
31-
const pokemon = []
32-
Object.keys(filters).forEach((pkmn) => {
33-
if (!pkmn.startsWith('o')) {
34-
pokemon.push(pkmn.split('-')[0])
35-
}
36-
})
3730
const query = this.query()
3831
.select(['*', 'nest_id AS id'])
39-
.whereNotNull('pokemon_id')
32+
// .whereNotNull('pokemon_id')
4033
.whereBetween('lat', [minLat, maxLat])
4134
.andWhereBetween('lon', [minLon, maxLon])
42-
.whereIn('pokemon_id', pokemon)
35+
36+
const pokemon = []
37+
if (filters.onlyPokemon) {
38+
Object.keys(filters).forEach((pkmn) => {
39+
if (!pkmn.startsWith('o')) {
40+
pokemon.push(pkmn.split('-')[0])
41+
}
42+
})
43+
}
44+
45+
if (pokemon.length) {
46+
query.whereIn('pokemon_id', pokemon)
47+
}
48+
if (filters.onlyActive === 'inactive') {
49+
query.where('active', false)
50+
} else if (filters.onlyActive === 'active') {
51+
query.where('active', true)
52+
}
4353
if (
4454
!config
4555
.getSafe('defaultFilters.nests.avgFilter')
@@ -91,24 +101,27 @@ class Nest extends Model {
91101
static secondaryFilter(queryResults, filters, polygon) {
92102
const returnedResults = []
93103
queryResults.forEach((pkmn) => {
94-
if (pkmn.pokemon_form == 0 || pkmn.pokemon_form === null) {
95-
const formId =
96-
state.event.masterfile.pokemon[pkmn.pokemon_id].defaultFormId
97-
if (formId) pkmn.pokemon_form = formId
98-
}
99-
if (filters[`${pkmn.pokemon_id}-${pkmn.pokemon_form}`]) {
100-
pkmn.polygon_path = polygon
101-
? typeof pkmn.polygon === 'string' && pkmn.polygon
102-
? pkmn.polygon
103-
: JSON.stringify(
104-
pkmn.polygon || { type: 'Polygon', coordinates: [] },
105-
)
106-
: JSON.stringify({
107-
type: 'Polygon',
108-
coordinates: JSON.parse(pkmn.polygon_path || '[]').map((line) =>
109-
line.map((point) => [point[1], point[0]]),
110-
),
111-
})
104+
pkmn.polygon_path = polygon
105+
? typeof pkmn.polygon === 'string' && pkmn.polygon
106+
? pkmn.polygon
107+
: JSON.stringify(pkmn.polygon || { type: 'Polygon', coordinates: [] })
108+
: JSON.stringify({
109+
type: 'Polygon',
110+
coordinates: JSON.parse(pkmn.polygon_path || '[]').map((line) =>
111+
line.map((point) => [point[1], point[0]]),
112+
),
113+
})
114+
115+
if (pkmn.pokemon_id && filters.onlyPokemon) {
116+
if (pkmn.pokemon_form == 0 || pkmn.pokemon_form === null) {
117+
const formId =
118+
state.event.masterfile.pokemon[pkmn.pokemon_id].defaultFormId
119+
if (formId) pkmn.pokemon_form = formId
120+
}
121+
if (filters[`${pkmn.pokemon_id}-${pkmn.pokemon_form}`]) {
122+
returnedResults.push(pkmn)
123+
}
124+
} else {
112125
returnedResults.push(pkmn)
113126
}
114127
})

‎server/src/routes/api/v1/trial.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ router.get('/status', async (req, res) => {
4141

4242
router.get('/status/:strategy', async (req, res) => {
4343
try {
44-
const status = state.getTrialStatus()
45-
res.status(200).json({ status })
44+
res.status(200).json({ status: state.getTrialStatus(req.params.strategy) })
4645
} catch (e) {
4746
log.error(TAGS.api, e)
4847
res.status(404).json({ status: 'error', message: e.message })

‎server/src/services/DbCheck.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ module.exports = class DbCheck extends Logger {
7070
this.endpoints[i] = schema
7171
return null
7272
}
73-
const logger = new Logger('knex', schema.database)
73+
const { log } = new Logger('knex', schema.database)
7474
return knex({
7575
client: 'mysql2',
7676
connection: {
@@ -88,12 +88,12 @@ module.exports = class DbCheck extends Logger {
8888
conn.query('SET time_zone="+00:00";', (err) => done(err, conn)),
8989
},
9090
log: {
91-
warn: (message) => logger.warn(message),
92-
error: (message) => logger.error(message),
91+
warn: (message) => log.warn(message),
92+
error: (message) => log.error(message),
9393
debug: (message) =>
94-
logger[
95-
config.getSafe('devOptions.queryDebug') ? 'info' : 'debug'
96-
](message),
94+
log[config.getSafe('devOptions.queryDebug') ? 'info' : 'debug'](
95+
message,
96+
),
9797
enableColors: true,
9898
},
9999
})

‎server/src/services/EventManager.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// @ts-check
22
const { promises: fs } = require('fs')
33
const path = require('path')
4-
const Ohbem = require('ohbem')
54
const { default: fetch } = require('node-fetch')
65

76
const config = require('@rm/config')
@@ -168,7 +167,7 @@ class EventManager extends Logger {
168167
/**
169168
*
170169
* @param {import('./DbCheck')} Db
171-
* @param {import('./PvpWrapper')} Pvp
170+
* @param {import('./PvpWrapper').PvpWrapper | null} Pvp
172171
*/
173172
startIntervals(Db, Pvp) {
174173
this.clearIntervals()
@@ -265,7 +264,7 @@ class EventManager extends Logger {
265264
if (Pvp) {
266265
this.intervals.pvp = setInterval(
267266
async () => {
268-
Pvp.updatePokemonData(await Ohbem.fetchPokemonData())
267+
await Pvp.fetchLatestPokemon()
269268
await this.chatLog('event', {
270269
description: 'Refreshed PVP masterfile',
271270
})

0 commit comments

Comments
 (0)