diff options
author | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
commit | 81391fa162d6f04771b535ace95e53e2d1b45777 (patch) | |
tree | 7ad6e0ff6be63bed9cf9d69408378ba69e04e1cc /synapse/handlers/groups_local.py | |
parent | Remove unnecessary condition (diff) | |
parent | Merge pull request #2766 from matrix-org/rav/room_event (diff) | |
download | synapse-81391fa162d6f04771b535ace95e53e2d1b45777.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_storage_refactor
Diffstat (limited to 'synapse/handlers/groups_local.py')
-rw-r--r-- | synapse/handlers/groups_local.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/groups_local.py b/synapse/handlers/groups_local.py index 7e5d3f148d..e4d0cc8b02 100644 --- a/synapse/handlers/groups_local.py +++ b/synapse/handlers/groups_local.py @@ -383,11 +383,12 @@ class GroupsLocalHandler(object): defer.returnValue({"groups": result}) else: - result = yield self.transport_client.get_publicised_groups_for_user( - get_domain_from_id(user_id), user_id + bulk_result = yield self.transport_client.bulk_get_publicised_groups( + get_domain_from_id(user_id), [user_id], ) + result = bulk_result.get("users", {}).get(user_id) # TODO: Verify attestations - defer.returnValue(result) + defer.returnValue({"groups": result}) @defer.inlineCallbacks def bulk_get_publicised_groups(self, user_ids, proxy=True): |