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

Make self membership less prone to races #2277

Merged
merged 1 commit into from
Apr 6, 2022

Conversation

robintown
Copy link
Member

@robintown robintown commented Apr 6, 2022

Previously, if you tried to peek a room while the sync loop was still pulling in your own join event for that room, the peek could end up overwriting the synced membership with null, causing the room to get stuck in a 'peeking' state. By bundling the call to updateMyMembership with recalculate, we ensure that it the actual latest membership value gets set.

Type: defect

Closes element-hq/element-web#21661.


Here's what your changelog entry will look like:

🐛 Bug Fixes

@robintown robintown requested a review from a team as a code owner April 6, 2022 04:21
@codecov-commenter
Copy link

codecov-commenter commented Apr 6, 2022

Codecov Report

Merging #2277 (515df0f) into develop (b832129) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop    #2277      +/-   ##
===========================================
+ Coverage    58.99%   59.00%   +0.01%     
===========================================
  Files           91       91              
  Lines        16337    16337              
  Branches      3768     3769       +1     
===========================================
+ Hits          9638     9640       +2     
+ Misses        6699     6697       -2     
Impacted Files Coverage Δ
src/sync.ts 65.73% <ø> (+0.15%) ⬆️
src/models/room.ts 54.49% <100.00%> (+0.13%) ⬆️

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.

Looks great to me 👍

@robintown robintown merged commit 3322b47 into matrix-org:develop Apr 6, 2022
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Apr 30, 2022
* Add MatrixClient.doesServerSupportLogoutDevices() for MSC2457 ([\matrix-org#2297](matrix-org#2297)).
* Live location sharing - expose room liveBeaconIds ([\matrix-org#2296](matrix-org#2296)).
* Support for MSC2457 logout_devices param for setPassword() ([\matrix-org#2285](matrix-org#2285)).
* Stabilise token authenticated registration support ([\matrix-org#2181](matrix-org#2181)). Contributed by @govynnus.
* Live location sharing - Aggregate beacon locations on beacons ([\matrix-org#2268](matrix-org#2268)).
* Prevent duplicated re-emitter setups in event-mapper ([\matrix-org#2293](matrix-org#2293)).
* Make self membership less prone to races ([\matrix-org#2277](matrix-org#2277)). Fixes element-hq/element-web#21661.
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.

Joined room shows preview instead of timeline
3 participants