Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-03 04:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

No need to check from/to token relationship

Browse source 
See https://github.com/element-hq/synapse/pull/17187#discussion_r1627771338

`get_membership_changes_for_user(from_key=xxx, to_key=xxx)` will handle
getting out what we need and filter the results based on the tokens
(even in cases where the from_key is ahead of the to_key).
This commit is contained in:
Eric Eastwood 2024-06-05 11:22:51 -05:00
parent 6a6cdc61f3
commit 278ba63953
1 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
synapse/handlers/sliding_sync.py
View file

@ -392,7 +392,6 @@ class SlidingSyncHandler:
# First grab a current snapshot rooms for the user
# (also handles forgotten rooms)
token_before_rooms = self.event_sources.get_current_token()
room_for_user_list = await self.store.get_rooms_for_local_user_where_membership_is(
user_id=user_id,
# We want to fetch any kind of membership (joined and left rooms) in order
@ -452,26 +451,6 @@ class SlidingSyncHandler:
if membership_snapshot_token.is_before_or_eq(to_token.room_key):
return sync_room_id_set
# We assume the `from_token` is before or at-least equal to the `to_token`
assert from_token is None or from_token.room_key.is_before_or_eq(
to_token.room_key
), f"{from_token.room_key if from_token else None} <= {to_token.room_key}"
# We assume the `from_token`/`to_token` is before `membership_snapshot_token` or
# at-least before the current stream positions at the time we queried for
# `membership_snapshot_token`. The closest we can get to the current stream
# positions at the time is `token_before_rooms`. Otherwise, we just need to
# give-up and throw an error.
best_effort_stream_positions_at_snapshot_time_token = (
membership_snapshot_token.copy_and_advance(token_before_rooms.room_key)
)
assert from_token is None or from_token.room_key.is_before_or_eq(
best_effort_stream_positions_at_snapshot_time_token
), f"{from_token.room_key if from_token else None} <= {best_effort_stream_positions_at_snapshot_time_token}"
assert to_token.room_key.is_before_or_eq(
best_effort_stream_positions_at_snapshot_time_token
), f"{to_token.room_key} <= {best_effort_stream_positions_at_snapshot_time_token}"
# Since we fetched the users room list at some point in time after the from/to
# tokens, we need to revert/rewind some membership changes to match the point in
# time of the `to_token`. In particular, we need to make these fixups: