From 5b48eec4a12032df0c17f054bb50ebb510bd9ae5 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 16 Nov 2017 17:55:15 +0000
Subject: [PATCH] Make sure we check AS groups for lookup on bulk

---
 synapse/handlers/groups_local.py | 5 +++++
 1 file changed, 5 insertions(+)

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})