Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not add groups to sync results if disabled. (#12408)

This commit is contained in:
Patrick Cloke 2022-04-07 09:29:56 -04:00 committed by GitHub
parent d1cd96ce29
commit 1a90c1e3af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12408.misc Normal file
View File

@ -0,0 +1 @@
Do not include groups in the sync response when disabled.

5
synapse/handlers/sync.py
View File

@ -1155,8 +1155,9 @@ class SyncHandler:
await self.store.get_e2e_unused_fallback_key_types(user_id, device_id) await self.store.get_e2e_unused_fallback_key_types(user_id, device_id)
) )
logger.debug("Fetching group data") if self.hs_config.experimental.groups_enabled:
await self._generate_sync_entry_for_groups(sync_result_builder) logger.debug("Fetching group data")
await self._generate_sync_entry_for_groups(sync_result_builder)
num_events = 0 num_events = 0

15
synapse/rest/client/sync.py
View File

@ -301,14 +301,13 @@ class SyncRestServlet(RestServlet):
if archived: if archived:
response["rooms"][Membership.LEAVE] = archived response["rooms"][Membership.LEAVE] = archived
# By the time we get here groups is no longer optional. if sync_result.groups is not None:
assert sync_result.groups is not None if sync_result.groups.join:
if sync_result.groups.join: response["groups"][Membership.JOIN] = sync_result.groups.join
response["groups"][Membership.JOIN] = sync_result.groups.join if sync_result.groups.invite:
if sync_result.groups.invite: response["groups"][Membership.INVITE] = sync_result.groups.invite
response["groups"][Membership.INVITE] = sync_result.groups.invite if sync_result.groups.leave:
if sync_result.groups.leave: response["groups"][Membership.LEAVE] = sync_result.groups.leave
response["groups"][Membership.LEAVE] = sync_result.groups.leave
return response return response