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

Ensure rooms are recalculated on re-invites #2374

Merged
merged 4 commits into from
May 18, 2022

Conversation

turt2live
Copy link
Member

@turt2live turt2live commented May 17, 2022

Fixes element-hq/element-web#22106

Reviewer: This has two commits: a failing test and the fix. This is to demonstrate that the test actually works, because I don't exactly have confidence in it myself.


Here's what your changelog entry will look like:

🐛 Bug Fixes

@turt2live turt2live force-pushed the travis/room-list/fix-invite-archive-invite branch from d056d14 to 5ea0ed1 Compare May 17, 2022 03:38
@turt2live turt2live marked this pull request as ready for review May 17, 2022 03:48
@turt2live turt2live requested a review from a team as a code owner May 17, 2022 03:48
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 otherwise

spec/integ/matrix-client-syncing.spec.js Show resolved Hide resolved
@@ -1166,6 +1166,9 @@ export class SyncApi {
room.recalculate();
client.store.storeRoom(room);
client.emit(ClientEvent.Room, room);
} else {
// Update room state for invite->reject->invite cycles
room.recalculate();
Copy link
Member

Choose a reason for hiding this comment

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

Can we not just move the recalculate out to before the if?

Copy link
Member Author

Choose a reason for hiding this comment

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

We can, but then the comment is less clear imo

@turt2live turt2live enabled auto-merge (squash) May 18, 2022 04:31
@turt2live
Copy link
Member Author

Slightly worried about this change: if people notice performance regressions, please flag.

@turt2live turt2live merged commit 2dccefb into develop May 18, 2022
@turt2live turt2live deleted the travis/room-list/fix-invite-archive-invite branch May 18, 2022 04:37
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Jun 7, 2022
* Convert `getLocalAliases` to a stable API call ([\matrix-org#2402](matrix-org#2402)).
* Fix request, crypto, and bs58 imports ([\matrix-org#2414](matrix-org#2414)). Fixes matrix-org#2415.
* Update relations after every decryption attempt ([\matrix-org#2387](matrix-org#2387)). Fixes element-hq/element-web#22258. Contributed by @weeman1337.
* Fix degraded mode for the IDBStore and test it ([\matrix-org#2400](matrix-org#2400)). Fixes matrix-org/element-web-rageshakes#13170.
* Don't cancel SAS verifications if `ready` is received after `start` ([\matrix-org#2250](matrix-org#2250)).
* Prevent overlapping sync accumulator persists ([\matrix-org#2392](matrix-org#2392)). Fixes vector-im/element-web#21541.
* Fix behaviour of isRelation with relation m.replace for state events ([\matrix-org#2389](matrix-org#2389)). Fixes element-hq/element-web#22280.
* Fixes matrix-org#2384 ([\matrix-org#2385](matrix-org#2385)). Fixes undefined/matrix-js-sdk#2384. Contributed by @schmop.
* Ensure rooms are recalculated on re-invites ([\matrix-org#2374](matrix-org#2374)). Fixes element-hq/element-web#22106.
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.

Re-inviting to a rejected invite isn't syncing
2 participants