summary refs log tree commit diff
path: root/synapse/handlers/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-26 09:48:13 +0100
committerErik Johnston <erik@matrix.org>2016-08-26 09:48:13 +0100
commit30961182f2c7ecc596cdbe2cc06a861d0f8a2f7b (patch)
treee689fff70ffc280319bb15056c41ae0bc595c572 /synapse/handlers/appservice.py
parentMake sync not pull out full state (diff)
parentMerge pull request #1043 from matrix-org/erikj/backfill_fix (diff)
downloadsynapse-30961182f2c7ecc596cdbe2cc06a861d0f8a2f7b.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids
Diffstat (limited to 'synapse/handlers/appservice.py')
-rw-r--r--synapse/handlers/appservice.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 306686a384..b440280b74 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -176,6 +176,16 @@ class ApplicationServicesHandler(object):
         defer.returnValue(ret)
 
     @defer.inlineCallbacks
+    def get_3pe_protocols(self):
+        services = yield self.store.get_app_services()
+        protocols = {}
+        for s in services:
+            for p in s.protocols:
+                protocols[p] = yield self.appservice_api.get_3pe_protocol(s, p)
+
+        defer.returnValue(protocols)
+
+    @defer.inlineCallbacks
     def _get_services_for_event(self, event):
         """Retrieve a list of application services interested in this event.