diff options
author | Paul Evans <leonerd@leonerd.org.uk> | 2016-09-09 15:43:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-09 15:43:11 +0100 |
commit | 56f38d177694ca858594597a03567b7964ac44d8 (patch) | |
tree | c3239f27a6551f388a5e1211854d52edeee5071f /synapse/handlers | |
parent | Merge pull request #1094 from matrix-org/paul/get-state-whole-event (diff) | |
parent | Log if rejecting 3PE query metadata result due to type check (diff) | |
download | synapse-56f38d177694ca858594597a03567b7964ac44d8.tar.xz |
Merge pull request #1091 from matrix-org/paul/third-party-lookup
Improvements to 3PE lookup API
Diffstat (limited to 'synapse/handlers')
-rw-r--r-- | synapse/handlers/appservice.py | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py index b440280b74..88fa0bb2e4 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py @@ -176,12 +176,41 @@ class ApplicationServicesHandler(object): defer.returnValue(ret) @defer.inlineCallbacks - def get_3pe_protocols(self): + def get_3pe_protocols(self, only_protocol=None): services = yield self.store.get_app_services() protocols = {} + + # Collect up all the individual protocol responses out of the ASes for s in services: for p in s.protocols: - protocols[p] = yield self.appservice_api.get_3pe_protocol(s, p) + if only_protocol is not None and p != only_protocol: + continue + + if p not in protocols: + protocols[p] = [] + + info = yield self.appservice_api.get_3pe_protocol(s, p) + + if info is not None: + protocols[p].append(info) + + def _merge_instances(infos): + if not infos: + return {} + + # Merge the 'instances' lists of multiple results, but just take + # the other fields from the first as they ought to be identical + # copy the result so as not to corrupt the cached one + combined = dict(infos[0]) + combined["instances"] = list(combined["instances"]) + + for info in infos[1:]: + combined["instances"].extend(info["instances"]) + + return combined + + for p in protocols.keys(): + protocols[p] = _merge_instances(protocols[p]) defer.returnValue(protocols) |