summary refs log tree commit diff
path: root/synapse/rest/client/sync.py
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-04-07 09:29:56 -0400
committerGitHub <noreply@github.com>2022-04-07 09:29:56 -0400
commit1a90c1e3af71fe57c5a4bce52c60e6cd7509b0c2 (patch)
tree005baebbda094b30147fe92db5a4cf9669ddee05 /synapse/rest/client/sync.py
parentAdd opentracing spans to calls to external cache (#12380) (diff)
downloadsynapse-1a90c1e3af71fe57c5a4bce52c60e6cd7509b0c2.tar.xz
Do not add groups to sync results if disabled. (#12408)
Diffstat (limited to 'synapse/rest/client/sync.py')
-rw-r--r--synapse/rest/client/sync.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py
index 0bf32f873b..2e25e8638b 100644
--- a/synapse/rest/client/sync.py
+++ b/synapse/rest/client/sync.py
@@ -301,14 +301,13 @@ class SyncRestServlet(RestServlet):
         if archived:
             response["rooms"][Membership.LEAVE] = archived
 
-        # By the time we get here groups is no longer optional.
-        assert sync_result.groups is not None
-        if sync_result.groups.join:
-            response["groups"][Membership.JOIN] = sync_result.groups.join
-        if sync_result.groups.invite:
-            response["groups"][Membership.INVITE] = sync_result.groups.invite
-        if sync_result.groups.leave:
-            response["groups"][Membership.LEAVE] = sync_result.groups.leave
+        if sync_result.groups is not None:
+            if sync_result.groups.join:
+                response["groups"][Membership.JOIN] = sync_result.groups.join
+            if sync_result.groups.invite:
+                response["groups"][Membership.INVITE] = sync_result.groups.invite
+            if sync_result.groups.leave:
+                response["groups"][Membership.LEAVE] = sync_result.groups.leave
 
         return response