Incident filtering fixes#1216
Conversation
There was a problem hiding this comment.
Pull request overview
Fixes incident/invasion filtering behavior so Rocket invasions are handled consistently across client marker rendering and server-side filtering, while reducing duplication in invasion metadata refresh logic.
Changes:
- Client: stop clearing
markerInvasionswhen an incident “blocker” is present so invasions can still influence marker state/rendering. - Server: centralize invasion state updates into
EventManager.setInvasions()(used both at startup and on refresh) to keepinvasions,rocketGruntIDs, androcketLeaderIDsin sync. - Server: refactor Rocket invasion filtering into
Pokestop.invasionMatchesFilters()and add clearer, early-return exclusions (confirmed-only, exclude grunts/leaders, MAD made-up invasions).
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/features/pokestop/incidentPriority.js | Ensures invasions remain part of marker incident state even when a stronger blocker exists. |
| server/src/services/EventManager.js | Adds setInvasions() helper to keep invasion metadata and derived Rocket ID lists consistent. |
| server/src/models/Pokestop.js | Extracts invasion filter logic into reusable helpers and aligns filtering with new exclusion options. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 21b265a113
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
🎉 This PR is included in version 1.43.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
No description provided.