Skip to content

Sync Dev to Main#1187

Merged
Mygod merged 41 commits intomainfrom
develop
Mar 15, 2026
Merged

Sync Dev to Main#1187
Mygod merged 41 commits intomainfrom
develop

Conversation

@Mygod
Copy link
Collaborator

@Mygod Mygod commented Jan 17, 2026

No description provided.

Mygod and others added 22 commits December 9, 2025 11:58
## [1.40.2-develop.1](v1.40.1...v1.40.2-develop.1) (2025-12-10)

### Bug Fixes

* battle/raid filtering race condition ([2a9cbbf](2a9cbbf))
* ground raid/battle icons ([cd01a92](cd01a92))
* weather icon in pokemon background popup ([21b50f5](21b50f5))
# [1.41.0-develop.1](v1.40.2-develop.1...v1.41.0-develop.1) (2025-12-11)

### Bug Fixes

* battle/raid icon max height ([497f350](497f350))
* no scrollbars plz ([907ca33](907ca33))

### Features

* dynamic placed Pokemon dropdown height ([8a0447c](8a0447c))
* support stationed pokemon extras ([4f5aace](4f5aace))
# [1.41.0-develop.2](v1.41.0-develop.1...v1.41.0-develop.2) (2025-12-15)

### Bug Fixes

* remove extra Forms ([0f157ed](0f157ed))
# [1.41.0-develop.3](v1.41.0-develop.2...v1.41.0-develop.3) (2025-12-16)

### Bug Fixes

* logic bug in loading non-clustered elements ([#1161](#1161)) ([a2c7f17](a2c7f17))
* more robust discord handling ([#1181](#1181)) ([b579ded](b579ded))

### Features

* default clientPrompt to none to skip permission reapproval ([d3ea283](d3ea283))
# [1.41.0-develop.4](v1.41.0-develop.3...v1.41.0-develop.4) (2025-12-31)

### Bug Fixes

* area reload ([cea3141](cea3141))
* Escapes XML in GPX route data

Ensures route names and descriptions are properly escaped
when generating GPX files, preventing potential XML parsing issues.
Sanitizes the filename to be downloaded.

* Prettier

* fix: filename sanitizer to also strip backslashes for Windows safety

---------

Co-authored-by: Mygod <[email protected]>
# [1.41.0-develop.5](v1.41.0-develop.4...v1.41.0-develop.5) (2026-01-08)

### Bug Fixes

* escape gpx xml ([#1186](#1186)) ([7bd5ce1](7bd5ce1))
Copy link

Copilot AI left a comment

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 syncs the development branch to main, bringing together accumulated features and bug fixes from the 1.41.0 development cycle. The changes include support for additional Pokémon display attributes at stations, improvements to UI components, security enhancements for GPX export, and Discord client robustness improvements.

Changes:

  • Added support for stationed Pokémon extras (shiny, temp evolution, alignment, badge, background)
  • Introduced reusable overlay icon rendering utility for map markers
  • Enhanced form display options with configurable suffix appending
  • Improved GPX export with XML escaping and filename sanitization
  • Enhanced Discord client error handling for missing members
  • Dynamic sizing for stationed Pokémon grid display

Reviewed changes

Copilot reviewed 25 out of 26 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
src/utils/renderOverlayIcon.js New utility function for rendering standardized overlay icons on map markers
src/utils/getFormDisplay.js Added appendFormSuffix option to control form suffix display
src/services/queries/station.js Extended GraphQL query to fetch additional Pokémon display fields
src/services/Assets.js Updated getPokemonByDisplay to handle new display properties including temp evolution
src/pages/map/components/Clustering.jsx Fixed clustering logic to respect IGNORE_CLUSTERING category setting
src/hooks/useTranslateById.js Added omitFormSuffix option for translation customization
src/features/station/useStationMarker.js Refactored battle icon rendering to use new renderOverlayIcon utility
src/features/station/StationPopup.jsx Implemented dynamic grid sizing and background visuals for stationed Pokémon display
src/features/route/RoutePopup.jsx Added XML escaping and filename sanitization for GPX export security
src/features/pokemon/PokemonPopup.jsx Enhanced weather icon rendering with background visual support
src/features/gym/gymMarker.js Refactored raid icon rendering to use new renderOverlayIcon utility
src/features/drawer/gyms/Raids.jsx Improved raid tier filtering to preserve unavailable stored tiers
src/features/drawer/components/SelectorList.jsx Applied omitFormSuffix option to selector list translations
src/features/drawer/Stations.jsx Improved battle tier filtering to preserve unavailable stored tiers
src/components/virtual/VirtualGrid.jsx Added scrollerRef prop support for external scroll container access
src/components/virtual/SelectorItem.jsx Applied omitFormSuffix option to selector item translations
src/components/filters/Advanced.jsx Applied omitFormSuffix option to advanced filter titles
src/assets/css/main.css Added CSS for marker overlay icons and consolidated pokestop marker styles
server/src/utils/reloadConfig.js Fixed config reload to prime areas early preventing getSafe failures
server/src/services/DiscordClient.js Enhanced error handling with specific logging for member not found errors
server/src/graphql/typeDefs/scanner.graphql Extended StationPokemon type with additional display fields
packages/types/lib/scanner.d.ts Updated StationPokemon interface to extend PokemonDisplay
packages/config/.configref Updated config reference version
package.json Bumped version to 1.41.0-develop.5
config/default.json Changed Discord clientPrompt default from "consent" to "none"
CHANGELOG.md Added changelog entries for develop releases
Comments suppressed due to low confidence (1)

src/features/route/RoutePopup.jsx:423

  • The waypoint data in the GPX output is not properly escaped. While route.name and route.description are now escaped, the waypoint.lat_degrees, waypoint.lng_degrees, and waypoint.elevation_in_meters values are inserted directly into XML attributes without escaping. If these values could contain special XML characters, they should also be escaped.
    ${route.waypoints
      .map(
        (waypoint) =>
          `<rtept lat="${waypoint.lat_degrees}" lon="${waypoint.lng_degrees}"><ele>${waypoint.elevation_in_meters}</ele></rtept>`,
      )

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Mygod and others added 5 commits February 16, 2026 16:01
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-version: 4.17.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mygod <[email protected]>
Bumps [@apollo/server](https://github.com/apollographql/apollo-server/tree/HEAD/packages/server) from 4.11.0 to 5.4.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/packages/server/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/@apollo/[email protected]/packages/server)

---
updated-dependencies:
- dependency-name: "@apollo/server"
  dependency-version: 5.4.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot and others added 13 commits February 16, 2026 16:32
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# [1.41.0-develop.6](v1.41.0-develop.5...v1.41.0-develop.6) (2026-02-16)

### Bug Fixes

* im dumdum ([ce37e2a](ce37e2a))
* showcase icons display ([b626d3d](b626d3d))

### Features

* ar/no-ar quest dot badge ([8adba28](8adba28))
Dependabot u so rude.
# [1.41.0-develop.7](v1.41.0-develop.6...v1.41.0-develop.7) (2026-02-17)

### Bug Fixes

* properly migrate to express 5 ([3907656](3907656))
# [1.41.0-develop.8](v1.41.0-develop.7...v1.41.0-develop.8) (2026-02-18)

### Bug Fixes

* hidden power in raids are fighting type ([018ba93](018ba93))
# [1.41.0-develop.9](v1.41.0-develop.8...v1.41.0-develop.9) (2026-02-19)

### Bug Fixes

* pokemon onlyManualId filter in expert sql mode ([ee176da](ee176da))
# [1.41.0-develop.10](v1.41.0-develop.9...v1.41.0-develop.10) (2026-03-10)

### Bug Fixes

* ditto shenanigans ([#1193](#1193)) ([647a175](647a175))
Bumps [rollup](https://github.com/rollup/rollup) from 4.48.1 to 4.59.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](rollup/rollup@v4.48.1...v4.59.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-version: 4.59.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Mygod Mygod requested a review from Copilot March 15, 2026 01:47
@Mygod
Copy link
Collaborator Author

Mygod commented Mar 15, 2026

@codex review

# [1.41.0-develop.11](v1.41.0-develop.10...v1.41.0-develop.11) (2026-03-15)

### Bug Fixes

* sentry node version ([8640ee0](8640ee0))
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 43 out of 45 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8640ee0da6

ℹ️ 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".

@Mygod Mygod merged commit a12c2e8 into main Mar 15, 2026
@github-actions
Copy link

🎉 This PR is included in version 1.41.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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants