Skip to content

always hide old quests #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 13, 2022
Merged

always hide old quests #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7122840
always hide old quests
TurtIeSocks Aug 13, 2022
0313f48
lint
TurtIeSocks Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions server/src/configs/custom-environment-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,14 +917,6 @@
"gymBadgeTableName": "DATABASE_SETTINGS_GYM_BADGE_TABLE_NAME",
"sessionTableName": "DATABASE_SETTINGS_SESSION_TABLE_NAME",
"migrationTableName": "DATABASE_SETTINGS_MIGRATION_TABLE_NAME",
"joinGymBadgeTable": {
"__name": "DATABASE_SETTINGS_JOIN_GYM_BADGE_TABLE",
"__format": "boolean"
},
"hideOldQuests": {
"__name": "DATABASE_SETTINGS_HIDE_OLD_QUESTS",
"__format": "boolean"
},
"maxConnections": {
"__name": "DATABASE_SETTINGS_MAX_CONNECTIONS",
"__format": "number"
Expand Down
2 changes: 0 additions & 2 deletions server/src/configs/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,6 @@
"gymBadgeTableName": "gymBadges",
"sessionTableName": "session",
"migrationTableName": "knex_migrations",
"joinGymBadgeTable": false,
"hideOldQuests": false,
"maxConnections": 10
},
"schemas": []
Expand Down
5 changes: 2 additions & 3 deletions server/src/models/Pokestop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const {
stopValidDataLimit,
hideOldPokestops,
},
database: { settings },
map,
} = require('../services/config')

Expand Down Expand Up @@ -75,7 +74,7 @@ module.exports = class Pokestop extends Model {
ts,
midnight: clientMidnight,
} = args
const midnight = settings.hideOldQuests ? clientMidnight || 0 : 0
const midnight = clientMidnight || 0
const safeTs = ts || Math.floor(new Date().getTime() / 1000)

const {
Expand Down Expand Up @@ -1113,7 +1112,7 @@ module.exports = class Pokestop extends Model {

static async searchQuests(perms, args, { isMad, hasAltQuests }, distance) {
const { search, onlyAreas = [], locale, midnight: clientMidnight } = args
const midnight = settings.hideOldQuests ? clientMidnight : 0
const midnight = clientMidnight || 0

const pokemonIds = Object.keys(Event.masterfile.pokemon).filter((pkmn) =>
i18next
Expand Down
2 changes: 1 addition & 1 deletion src/components/markers/pokemon.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const fancyMarker = (
{pkmn.seen_type === 'nearby_cell' && (
<img
src={Icons.getMisc('grass')}
alt='nearby_cell'
alt="nearby_cell"
style={{
width: size / 1.5,
height: 'auto',
Expand Down
6 changes: 5 additions & 1 deletion src/components/tiles/Pokemon.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ const PokemonTile = ({
zIndexOffset={item.iv * 100}
position={finalLocation}
icon={
pvpCheck || glowStatus || ivCircle || weatherCheck || item.seen_type === 'nearby_cell'
pvpCheck ||
glowStatus ||
ivCircle ||
weatherCheck ||
item.seen_type === 'nearby_cell'
? fancyMarker(
url,
size,
Expand Down