Skip to content
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.

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

Properly re-insert room ID in bundled thread relation messages from sync #2505

Merged
merged 6 commits into from
Jul 8, 2022

Conversation

duxovni
Copy link
Contributor

@duxovni duxovni commented Jul 7, 2022

Fixes element-hq/element-web#22094.


Here's what your changelog entry will look like:

🐛 Bug Fixes

@duxovni duxovni requested a review from a team as a code owner July 7, 2022 22:10
src/sync.ts Outdated Show resolved Hide resolved
@duxovni duxovni requested a review from t3chguy July 8, 2022 20:34
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

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

LGTM but SonarQube is demanding more tests

@duxovni duxovni enabled auto-merge (squash) July 8, 2022 22:40
@duxovni duxovni merged commit 3935152 into develop Jul 8, 2022
@duxovni duxovni deleted the fayed/thread_event_room_id branch July 8, 2022 22:43
dbkr added a commit that referenced this pull request Jul 12, 2022
* Send call version `1` as a string (#2471)

* test typescriptification - backup.spec (#2468)

* renamed:    spec/unit/crypto/crypto-utils.js -> spec/unit/crypto/crypto-utils.ts

* ts fixes in crypto-utils

* renamed:    spec/unit/crypto/backup.spec.js -> spec/unit/crypto/backup.spec.ts

* ts fixes in backup.spec

* remove fit

* remove debug

* Prepare changelog for v19.0.0-rc.1

* v19.0.0-rc.1

* Update jest monorepo (#2476)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update all (#2475)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/jest to v28 (#2478)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix call.collectCallStats() (#2480)

Regressed by #2352
(you can just use RTCStatsReport as an iterator directly (which
was was what that code was doing before) which uses entries(
which gives you key/value pairs, but using forEach gives you just
the value.

* Go back to forEach in collectcallstats (#2481)

Older typescript library doesn't know about .values() on the stats
object, so it was failing in react sdk which had an older typescript.
matrix-org/matrix-react-sdk#8935 was an
attempt to upgrade it but did not seem to be helping on CI, despite
being fine locally.

* Update babel monorepo to v7.18.6 (#2477)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Expose KNOWN_SAFE_ROOM_VERSION (#2474)

* Fix return type on funcs in matrixClient to be optionally null (#2488)

* Update pull_request.yaml (#2490)

* Lock file maintenance (#2491)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Prepare changelog for v19.0.0

* v19.0.0

* Resetting package fields for development

* Improve VoIP integrations testing (#2495)

* Remove MSC3244 support (#2504)

* Actually store the identity server in the client when given as an option (#2503)

* Actually store the identity server in the client when given as an option

* Update requestRegisterEmailToken to a modern spec version too

* Properly re-insert room ID in bundled thread relation messages from sync (#2505)

Events returned by the `/sync` endpoint, including relations bundled with other events, may have their `room_id`s stripped out. This causes decryption errors if the IDs aren't repopulated.

Fixes element-hq/element-web#22094.

* Remove `setNow` from `realtime-callbacks.ts` (#2509)

Signed-off-by: Šimon Brandner <[email protected]>

* Remove dead code (#2510)

* Don't crash with undefined room in `processBeaconEvents()` (#2500)

* Add a basic PR checklist for all PRs (#2511)

It'll be mildly annoying for core developers who have to constantly remove or edit this, but it'll also serve as a good reminder to do these things.

Note that signoff is not required for core developers.

* Fix tests

Co-authored-by: Šimon Brandner <[email protected]>
Co-authored-by: Kerry <[email protected]>
Co-authored-by: RiotRobot <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Weimann <[email protected]>
Co-authored-by: texuf <[email protected]>
Co-authored-by: Michael Telatynski <[email protected]>
Co-authored-by: Travis Ralston <[email protected]>
Co-authored-by: Faye Duxovni <[email protected]>
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Aug 1, 2022
* Remove MSC3244 support ([\matrix-org#2504](matrix-org#2504)).
* `room` now exports `KNOWN_SAFE_ROOM_VERSION` ([\matrix-org#2474](matrix-org#2474)).
* Don't crash with undefined room in `processBeaconEvents()` ([\matrix-org#2500](matrix-org#2500)). Fixes matrix-org#2494.
* Properly re-insert room ID in bundled thread relation messages from sync ([\matrix-org#2505](matrix-org#2505)). Fixes element-hq/element-web#22094. Contributed by @duxovni.
* Actually store the identity server in the client when given as an option ([\matrix-org#2503](matrix-org#2503)). Fixes element-hq/element-web#22757.
* Fix call.collectCallStats() ([\matrix-org#2480](matrix-org#2480)).
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.

Lots of "Mismatched room_id for inbound group session" UTDs in threads
2 participants