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

Ignore m.replace relations on state events, they're invalid #2306

Merged
merged 6 commits into from
Apr 26, 2022

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Apr 20, 2022

Fixes element-hq/element-web#21851


Here's what your changelog entry will look like:

🐛 Bug Fixes

@t3chguy t3chguy requested a review from a team as a code owner April 20, 2022 07:52
@t3chguy t3chguy enabled auto-merge (squash) April 20, 2022 07:53
@codecov-commenter
Copy link

codecov-commenter commented Apr 20, 2022

Codecov Report

Merging #2306 (3db907e) into develop (d82cdd3) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop    #2306      +/-   ##
===========================================
+ Coverage    59.74%   59.76%   +0.01%     
===========================================
  Files           91       91              
  Lines        16448    16450       +2     
  Branches      3795     3796       +1     
===========================================
+ Hits          9827     9831       +4     
+ Misses        6621     6619       -2     
Impacted Files Coverage Δ
src/models/event.ts 71.05% <100.00%> (+0.61%) ⬆️

@t3chguy t3chguy disabled auto-merge April 20, 2022 08:31
@t3chguy t3chguy requested a review from germain-gg April 20, 2022 08:34
@t3chguy t3chguy enabled auto-merge (squash) April 20, 2022 08:34
@andybalaam
Copy link
Contributor

@kerryarchibald aren't we relying on replacing state events to stop sharing a live location?

I discussed that approach with @ara4n yesterday and we thought it might be a good way to keep a state event's ID consistent even as we make updates (such as set "live" to false on a live location share).

@andybalaam
Copy link
Contributor

I commented here: matrix-org/matrix-spec-proposals#2676 (review) since it seems a better place to discuss this than on this PR.

Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

Code looks good to me 👍

@kerryarchibald
Copy link
Contributor

Can be merged after matrix-org/matrix-react-sdk#8390

@kerryarchibald kerryarchibald enabled auto-merge (squash) April 26, 2022 10:00
@kerryarchibald kerryarchibald merged commit ba06e43 into develop Apr 26, 2022
@kerryarchibald kerryarchibald deleted the t3chguy/fix/21851 branch April 26, 2022 10:02
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request May 10, 2022
* Live location sharing: handle encrypted messages in processBeaconEvents ([\matrix-org#2327](matrix-org#2327)).
* Fix race conditions around threads ([\matrix-org#2331](matrix-org#2331)). Fixes element-hq/element-web#21627.
* Ignore m.replace relations on state events, they're invalid ([\matrix-org#2306](matrix-org#2306)). Fixes element-hq/element-web#21851.
* fix example in readme ([\matrix-org#2315](matrix-org#2315)).
* Don't decrement the length count of a thread when root redacted ([\matrix-org#2314](matrix-org#2314)).
* Prevent attempt to create thread with id "undefined" ([\matrix-org#2308](matrix-org#2308)).
* Update threads handling for replies-to-thread-responses as per MSC update ([\matrix-org#2305](matrix-org#2305)). Fixes element-hq/element-web#19678.
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.

Timeline displays edits to state events incorrectly
5 participants