mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-18 08:54:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed include_leave flag being ignored on sync

Browse source
This commit is contained in:
Francesco Stefanini 2024-05-27 15:19:57 +02:00
parent 8cdd2d214e
commit ffa4b80152
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
synapse/handlers/sync.py
View file

@ -2708,10 +2708,15 @@ class SyncHandler:
since_token = sync_result_builder.since_token since_token = sync_result_builder.since_token
now_token = sync_result_builder.now_token now_token = sync_result_builder.now_token
sync_config = sync_result_builder.sync_config sync_config = sync_result_builder.sync_config
membership_list = [Membership.INVITE, Membership.JOIN, Membership.KNOCK]
if sync_config.filter_collection.include_leave:
membership_list.append(Membership.LEAVE)
membership_list.append(Membership.BAN)
room_list = await self.store.get_rooms_for_local_user_where_membership_is( room_list = await self.store.get_rooms_for_local_user_where_membership_is(
user_id=user_id, user_id=user_id,
membership_list=Membership.LIST, membership_list=membership_list,
excluded_rooms=sync_result_builder.excluded_room_ids, excluded_rooms=sync_result_builder.excluded_room_ids,
) )
@ -2745,12 +2750,6 @@ class SyncHandler:
knock = await self.store.get_event(event.event_id) knock = await self.store.get_event(event.event_id)
knocked.append(KnockedSyncResult(room_id=event.room_id, knock=knock)) knocked.append(KnockedSyncResult(room_id=event.room_id, knock=knock))
elif event.membership in (Membership.LEAVE, Membership.BAN): elif event.membership in (Membership.LEAVE, Membership.BAN):
# Always send down rooms we were banned from or kicked from.
if not sync_config.filter_collection.include_leave:
if event.membership == Membership.LEAVE:
if user_id == event.sender:
continue
leave_token = now_token.copy_and_replace( leave_token = now_token.copy_and_replace(
StreamKeyType.ROOM, RoomStreamToken(stream=event.event_pos.stream) StreamKeyType.ROOM, RoomStreamToken(stream=event.event_pos.stream)
) )