Sync Dev & Main #577
Merged
Sync Dev & Main #577
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- add some logic to keep the latest updated when deduping - add a dev log for gql returns - redo deduping logic fn with a few optimizations + the updated logic check - Remove legacy dbSelection fn - Remove ui if no respective models are present - Change device last_seen to updated for consistency
- Only show return amount if it's defined - Add power up check - Remove min connections
Bumps [apollo-server-core](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-core) from 3.5.0 to 3.10.1. - [Release notes](https://github.com/apollographql/apollo-server/releases) - [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-core@3.10.1/packages/apollo-server-core) --- updated-dependencies: - dependency-name: apollo-server-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [passport](https://github.com/jaredhanson/passport) from 0.4.1 to 0.6.0. - [Release notes](https://github.com/jaredhanson/passport/releases) - [Changelog](https://github.com/jaredhanson/passport/blob/master/CHANGELOG.md) - [Commits](jaredhanson/passport@v0.4.1...v0.6.0) --- updated-dependencies: - dependency-name: passport dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…-server-core-3.10.1 Bump apollo-server-core from 3.5.0 to 3.10.1
smarter deduping
`SCANNER_DB_USER` and `MANUAL_DB_USER` were mislabeled and do not match the consts in [/server/src/services/config.js](https://github.com/WatWowMap/ReactMap/blob/254c96a29238ce6b14a42d9d630139dcd2fab22f/server/src/services/config.js#L17) This commit changes the mentioned environment variables to be `SCANNER_DB_USERNAME` and `MANUAL_DB_USERNAME` respectively.
Fix mislabeled environment variables
- Adds proper support for filtering XP amounts - Builds 100 - 1000 by default - MAD support is pending schema review - Bump to version 1.4.0
Files changed:\nM server/src/configs/custom-environment-variables.json
- remove config item to enable the general quest reward type filters - make them always be enabled for future quest reward type filtering - auto add them to "available" if they're found in db but not being accounted for specifically
Full XP Filtering Support
- Change MAD XP amount column from `quest_item_id` => `quest_stardust` amount - Ref Map-A-Droid/MAD#1272
- wrap a couple of async functions in try/catch blocks - fix mysql session for mysql2 bindings - Add config value for session check interval
Files changed:\nM server/src/configs/custom-environment-variables.json
Add a couple of try catches
- Allow `messageOfTheDay.json`, `loginPage.json`, and `donationPage.json` in the config folder - Works with multiDomains by adding a folder and named jsons instead: `server/src/configs/loginPage/subDomain_1.json` `server/src/configs/loginPage/subDomain_2.json`
Extract Config Pages
…rt-0.6.0 Bump passport from 0.4.1 to 0.6.0
- Add Discord and Telegram endpoints by ID - Add feedback if no user is found
Update user api
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.