summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuke Barnard <luke@matrix.org>2017-11-16 17:55:15 +0000
committerLuke Barnard <luke@matrix.org>2017-11-16 17:55:15 +0000
commit5b48eec4a12032df0c17f054bb50ebb510bd9ae5 (patch)
treea8b2c86d7ca71fe8a867239a88f008b3329cb220
parentCheck group_id belongs to this domain (diff)
downloadsynapse-5b48eec4a12032df0c17f054bb50ebb510bd9ae5.tar.xz
Make sure we check AS groups for lookup on bulk
-rw-r--r--synapse/handlers/groups_local.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/groups_local.py b/synapse/handlers/groups_local.py
index 5cc4b86afd..7e5d3f148d 100644
--- a/synapse/handlers/groups_local.py
+++ b/synapse/handlers/groups_local.py
@@ -421,4 +421,9 @@ class GroupsLocalHandler(object):
                 uid
             )
 
+            # Check AS associated groups for this user - this depends on the
+            # RegExps in the AS registration file (under `users`)
+            for app_service in self.store.get_app_services():
+                results[uid].extend(app_service.get_groups_for_user(uid))
+
         defer.returnValue({"users": results})