mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix up rest tests

Browse source
This commit is contained in:
Eric Eastwood 2024-10-09 13:02:32 -05:00
parent f691c9bdc9
commit 10441a43af
2 changed files with 15 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
synapse/handlers/sliding_sync/__init__.py
View file

@ -869,9 +869,6 @@ class SlidingSyncHandler:
#
# Calculate the `StateFilter` based on the `required_state` for the room
required_state_filter = StateFilter.none()
# Extra membership that we need pull out of the current state because of
# lazy-loading room members.
added_membership_state_filter = StateFilter.none()
# The requested `required_state_map` with the any lazy membership expanded and
# `$ME` replaced with the user's ID. This allows us to see what membership we've
# sent down to the client in the next request.
@ -965,37 +962,12 @@ class SlidingSyncHandler:
).union(timeline_membership)
)
# TODO
# Update the required state filter so we pick up the new
# membership
for user_id in timeline_membership:
required_state_types.append(
(EventTypes.Member, user_id)
)
# TODO
if prev_room_sync_config is not None:
previous_memberships_given_to_client = (
prev_room_sync_config.required_state_map.get(
EventTypes.Member, set()
)
)
# Find what new memberships we need to send down
added_membership_user_ids: List[str] = []
for user_id in (
timeline_membership
- previous_memberships_given_to_client
):
added_membership_user_ids.append(user_id)
if added_membership_user_ids:
added_membership_state_filter = (
StateFilter.from_types(
[
(EventTypes.Member, user_id)
for user_id in added_membership_user_ids
]
)
)
elif state_key == StateValues.ME:
num_others += 1
required_state_types.append((state_type, user.to_string()))
@ -1069,18 +1041,6 @@ class SlidingSyncHandler:
else:
assert from_bound is not None
# If we're lazy-loading membership, we need to fetch the current state for
# the new members we haven't seen before in the timeline. If we don't do
# this we'd only send down membership when it changes.
if added_membership_state_filter != StateFilter.none():
state_ids = await self.get_current_state_ids_at(
room_id=room_id,
room_membership_for_user_at_to_token=room_membership_for_user_at_to_token,
state_filter=added_membership_state_filter,
to_token=to_token,
)
room_state_delta_id_map.update(state_ids)
if prev_room_sync_config is not None:
# Check if there are any changes to the required state config
# that we need to handle.
@ -1182,10 +1142,9 @@ class SlidingSyncHandler:
# sensible order again.
bump_stamp = 0
logger.info("asdf expanded_required_state_map %s", expanded_required_state_map)
logger.info("asdf changed_required_state_map %s", changed_required_state_map)
room_sync_required_state_map_to_persist = expanded_required_state_map
room_sync_required_state_map_to_persist: Mapping[str, AbstractSet[str]] = (
expanded_required_state_map
)
if changed_required_state_map:
room_sync_required_state_map_to_persist = changed_required_state_map

14
tests/rest/client/sliding_sync/test_rooms_required_state.py
View file

@ -546,7 +546,9 @@ class SlidingSyncRoomsRequiredStateTestCase(SlidingSyncBase):
[EventTypes.Create, ""],
[EventTypes.Member, StateValues.LAZY],
]
response_body, _ = self.do_sync(sync_body, since=from_token, tok=user1_tok)
response_body, from_token = self.do_sync(
sync_body, since=from_token, tok=user1_tok
)
state_map = self.get_success(
self.storage_controllers.state.get_current_state(room_id1)
@ -566,7 +568,9 @@ class SlidingSyncRoomsRequiredStateTestCase(SlidingSyncBase):
self.assertIsNone(response_body["rooms"][room_id1].get("invite_state"))
# Send a message so the room comes down sync.
self.helper.send(room_id1, "4", tok=user2_tok)
self.helper.send(room_id1, "7", tok=user2_tok)
self.helper.send(room_id1, "8", tok=user4_tok)
self.helper.send(room_id1, "9", tok=user4_tok)
# Make another incremental Sliding Sync request
response_body, _ = self.do_sync(sync_body, since=from_token, tok=user1_tok)
@ -575,7 +579,7 @@ class SlidingSyncRoomsRequiredStateTestCase(SlidingSyncBase):
# but since we've seen both memberships in the last sync, they shouldn't appear
# again.
self._assertRequiredStateIncludes(
response_body["rooms"][room_id1]["required_state"],
response_body["rooms"][room_id1].get("required_state", []),
set(),
exact=True,
)
@ -631,7 +635,9 @@ class SlidingSyncRoomsRequiredStateTestCase(SlidingSyncBase):
[EventTypes.Create, ""],
[EventTypes.Member, StateValues.LAZY],
]
response_body, _ = self.do_sync(sync_body, since=from_token, tok=user1_tok)
response_body, from_token = self.do_sync(
sync_body, since=from_token, tok=user1_tok
)
state_map = self.get_success(
self.storage_controllers.state.get_current_state(room_id1)