Skip to content

feat: cooldown bypass for scan on demand#1137

Merged
Mygod merged 1 commit into
WatWowMap:developfrom
Mygod:cooldown-bypass
Nov 20, 2025
Merged

feat: cooldown bypass for scan on demand#1137
Mygod merged 1 commit into
WatWowMap:developfrom
Mygod:cooldown-bypass

Conversation

@Mygod

@Mygod Mygod commented Sep 25, 2025

Copy link
Copy Markdown
Collaborator

Fixes #947. I couldn't test this one either so summoning testers. @kamieniarz @nileplumb @prof-miles0 @Shyvadi

Token usage: total=174,962 input=151,324 (+ 3,689,216 cached) output=23,638 (reasoning 14,912)
To continue this session, run codex resume 01997f21-2a4c-7cc0-b4e5-df3f069eb4fb.

@Mygod
Mygod requested a review from Shyvadi September 25, 2025 04:42
@Mygod Mygod added the Enhancement New feature or request label Sep 25, 2025
@Mygod Mygod changed the title feat: cooldown bypass feat: cooldown bypass for scan on demand Sep 25, 2025
@kamieniarz

kamieniarz commented Sep 25, 2025

Copy link
Copy Markdown
Contributor

Works great with discord, thanks!

@Mygod
Mygod requested a review from Copilot September 25, 2025 06:48

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This pull request implements cooldown bypass functionality for scanner modes, allowing certain roles to skip cooldown restrictions when using scan-on-demand features. The changes add a new permission system that determines which scanner modes should bypass cooldowns based on user roles and provider type.

Key changes:

  • Added scannerCooldownBypass function to determine bypass permissions
  • Enhanced mergePerms utility to handle merging of both existing and incoming permission keys
  • Integrated cooldown bypass logic into scanner configuration and execution

Reviewed Changes

Copilot reviewed 9 out of 11 changed files in this pull request and generated no comments.

Show a summary per file
File Description
server/src/utils/scannerPerms.js Adds new scannerCooldownBypass function to determine bypass permissions
server/src/utils/mergePerms.js Enhances permission merging to handle cases where keys exist in only one object
server/src/services/TelegramClient.js Integrates cooldown bypass permissions for Telegram users
server/src/services/LocalClient.js Adds cooldown bypass support for local authentication
server/src/services/DiscordClient.js Implements cooldown bypass permissions for Discord users
server/src/routes/rootRouter.js Initializes empty cooldown bypass array in settings
server/src/graphql/resolvers.js Implements cooldown bypass logic in scanner configuration and execution
config/default.json Adds cooldown bypass configuration structure
config/custom-environment-variables.json Defines environment variables for cooldown bypass settings

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@Mygod
Mygod marked this pull request as ready for review September 25, 2025 06:48
@Mygod

Mygod commented Sep 26, 2025

Copy link
Copy Markdown
Collaborator Author

Everyone else: if you tested and it is working well, please also leave a note so I can know. :)

@nileplumb

nileplumb commented Sep 26, 2025 via email

Copy link
Copy Markdown

@Mygod
Mygod merged commit 9ceefef into WatWowMap:develop Nov 20, 2025
4 checks passed
@Mygod
Mygod deleted the cooldown-bypass branch November 20, 2025 20:03
github-actions Bot pushed a commit that referenced this pull request Nov 20, 2025
# [1.40.0-develop.28](v1.40.0-develop.27...v1.40.0-develop.28) (2025-11-20)

### Bug Fixes

* alias support for cooldown ([73e8157](73e8157))

### Features

* cooldown bypass ([#1137](#1137)) ([9ceefef](9ceefef))
@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 1.40.0-develop.28 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

github-actions Bot pushed a commit that referenced this pull request Nov 24, 2025
# [1.40.0](v1.39.0...v1.40.0) (2025-11-24)

### Bug Fixes

* alias support for cooldown ([73e8157](73e8157))
* always show end route count ([5226575](5226575))
* apply to all should flip global ([5c23140](5c23140))
* backup error handling ([c6585e6](c6585e6))
* battle popup caching issue ([8cac1ce](8cac1ce))
* better hoverability on shiny rate ([e29a68b](e29a68b))
* default icon/audio selection ([248edda](248edda))
* dup gym pokemon ([d099945](d099945))
* dup keys ([91f1f58](91f1f58))
* eggs available ([48580d1](48580d1))
* expert filter per-Pokemon ([f06fae8](f06fae8))
* extra space around placed pokemon ([898e1e2](898e1e2))
* fix AdvAccordion backgroundColor ([4061ee2](4061ee2))
* gym range color should dynamically update ([7f9f95b](7f9f95b))
* improve touch tooltip experience ([945c24a](945c24a))
* isolate pokemon popup open state ([dc5fdc0](dc5fdc0))
* more robust translation fetching ([eaa2acf](eaa2acf))
* pvp50 enabled by default ([ad2df83](ad2df83))
* refine gym defender time ([30106c2](30106c2))
* refine station timer ([1353beb](1353beb))
* resetState respects server default ([e85f1e4](e85f1e4))
* route badge color should be consistent with their roles ([0c32962](0c32962))
* route crash ([206f558](206f558))
* seen raid level ([6c543c3](6c543c3))
* self loop route counting ([e415caa](e415caa))
* separate station/battle opacity ([ccdbcec](ccdbcec))
* showcase icon missing when invasion blocked ([12e6512](12e6512))
* station display ([3d72e14](3d72e14))
* stationed pokemon maxHeight ([5c46dbd](5c46dbd)), closes [#1078](#1078)
* unknown_costume translatable ([3f4bb57](3f4bb57))
* update for Golbat [#312](#312) ([#1151](#1151)) ([3bd05d4](3bd05d4))

### Features

* (quest) pokemon background on map ([0676dd4](0676dd4))
* background support in popups ([#1152](#1152)) ([3354ef7](3354ef7))
* better nearby pokemon display and randomization ([425f840](425f840))
* configurable inactive station limit ([f8efbcd](f8efbcd))
* cooldown bypass ([#1137](#1137)) ([9ceefef](9ceefef))
* display amount in quest tooltip ([5e57d50](5e57d50))
* estimated max battle cp ([275f6f4](275f6f4))
* expired stations ([0521045](0521045))
* faster extraUserFields ([#1144](#1144)) ([2216787](2216787))
* gym defender updates every second ([e99d020](e99d020))
* jump to area ([#1149](#1149)) ([179ca24](179ca24))
* max battle stats display ([211e0ea](211e0ea))
* mega energy marker can be taller ([5dad220](5dad220))
* more compact pokestop marker ([622ae3d](622ae3d))
* persistent popups ([5cd5be0](5cd5be0)), closes [#1135](#1135)
* quest bread mode ([b0fcf4f](b0fcf4f))
* reworked placed pokemon in station popup ([252f327](252f327))
* search auto focus ([29f1cef](29f1cef))
* show caught Pokemon in raid popup ([95eda89](95eda89))
* support tappable seen_type ([c74c607](c74c607))
* tappable from lure in popup ([69ce017](69ce017))
* tappables ([#1143](#1143)) ([943019f](943019f))
@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 1.40.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants