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.

Sign up for GitHub

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

Jump to bottom

Re-insert room IDs when decrypting bundled redaction events returned by /sync #2531

Merged
merged 14 commits into from
Jul 21, 2022
Merged

Re-insert room IDs when decrypting bundled redaction events returned by /sync #2531

merged 14 commits into from
Jul 21, 2022

Conversation

duxovni
Copy link
Contributor

@duxovni duxovni commented Jul 18, 2022 •
edited by github-actions bot
Loading

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md) N/A

Here's what your changelog entry will look like:

🐛 Bug Fixes

  • Re-insert room IDs when decrypting bundled redaction events returned by /sync (#2531). Contributed by @duxovni.

duxovni added 10 commits July 14, 2022 11:41
@duxovni
Begin rewriting megolm integration tests with async arrow functions
8a3f45e
@duxovni
Rewrite more megolm integration tests with async arrow functions
862eb3f
@duxovni
Rewrite "We should start a new megolm session when a device is blocked"
aba6b23
@duxovni
Rewrite "Alice should send to her other devices"
43665d5
@duxovni
Rewrite "Alice should wait for device list to complete when sending a…
0fe46b2 
… megolm message"
@duxovni
Rewrite "Alice exports megolm keys and imports them to a new device"
29cb19b
@duxovni
Rewrite "Alice receives an untrusted megolm key, only to receive the …
07785ca 
…trusted one shortly after"
@duxovni
Rewrite "Alice can decrypt a message with falsey content"
58e8784
@duxovni
Fix comment typo, remove unnecessary separate, assignments
7592acc
@duxovni
Re-insert room IDs when decrypting bundled redaction events returned …
ac0c41b 
…by `/sync`
@duxovni duxovni requested a review from a team as a code owner July 18, 2022 18:23
@duxovni duxovni requested review from andybalaam, germain-gg and turt2live and removed request for a team July 18, 2022 18:23
@duxovni
Copy link
Contributor Author

duxovni commented Jul 18, 2022

Is the tool that's generating the changelog entry broken? It seems to have lost the actual PR title :/

@t3chguy
Copy link
Member

t3chguy commented Jul 19, 2022 •
edited
Loading

@duxovni its because you have Notes: in the PR body

Notes: Add super cool feature

@turt2live turt2live mentioned this pull request Jul 19, 2022
Open
turt2live
turt2live approved these changes Jul 19, 2022
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

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

lgtm - though you'll have to remove the template's Notes section apparently

Base automatically changed from fayed/typescriptify_megolm_integ_2 to develop July 21, 2022 10:41
@duxovni duxovni enabled auto-merge (squash) July 21, 2022 10:50
@duxovni duxovni merged commit 5367ee1 into develop Jul 21, 2022
@duxovni duxovni deleted the fayed/bundled_encrypted_redaction_room_id branch July 21, 2022 10:55
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Aug 22, 2022
@su-ex
Merge tag 'v19.2.0' into sc
1b4d5ed 
* Remove unstable support for `m.room_key.withheld` ([\matrix-org#2512](matrix-org#2512)). Fixes matrix-org#2233.
* Sliding sync: add missing filters from latest MSC ([\matrix-org#2555](matrix-org#2555)).
* Use stable prefixes for MSC3827 ([\matrix-org#2537](matrix-org#2537)).
* Add support for MSC3575: Sliding Sync ([\matrix-org#2242](matrix-org#2242)).
* Correct the units in TURN servers expiry documentation ([\matrix-org#2520](matrix-org#2520)).
* Re-insert room IDs when decrypting bundled redaction events returned by `/sync` ([\matrix-org#2531](matrix-org#2531)). Contributed by @duxovni.
@richvdh richvdh mentioned this pull request Jan 17, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turt2live turt2live turt2live approved these changes

@andybalaam andybalaam Awaiting requested review from andybalaam andybalaam is a code owner automatically assigned from matrix-org/element-web-reviewers

@germain-gg germain-gg Awaiting requested review from germain-gg germain-gg is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Defect
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@duxovni @t3chguy @turt2live