summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2016-08-24 13:01:53 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2016-08-24 13:01:53 +0100
commit8e1ed09dff902c84beb9dff59305aa78e8772d81 (patch)
tree898bf68cae7504f87efbf61a2c9ba0c0ab412570 /synapse/rest
parentDeclare 'gitter' known protocol, with user lookup (diff)
downloadsynapse-8e1ed09dff902c84beb9dff59305aa78e8772d81.tar.xz
Move static knowledge of protocol metadata into AS handler; cache the result
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/thirdparty.py21
1 files changed, 1 insertions, 20 deletions
diff --git a/synapse/rest/client/v2_alpha/thirdparty.py b/synapse/rest/client/v2_alpha/thirdparty.py
index ae7901551b..bbc3e9b962 100644
--- a/synapse/rest/client/v2_alpha/thirdparty.py
+++ b/synapse/rest/client/v2_alpha/thirdparty.py
@@ -28,13 +28,6 @@ logger = logging.getLogger(__name__)
 class ThirdPartyProtocolsServlet(RestServlet):
     PATTERNS = client_v2_patterns("/thirdparty/protocols", releases=())
 
-    META = {
-        # TODO(paul): Declare kinds of metadata in here
-        "gitter": {
-            "user_fields": ["username"],
-        }
-    }
-
     def __init__(self, hs):
         super(ThirdPartyProtocolsServlet, self).__init__()
 
@@ -46,19 +39,7 @@ class ThirdPartyProtocolsServlet(RestServlet):
         yield self.auth.get_user_by_req(request)
 
         protocols = yield self.appservice_handler.get_3pe_protocols()
-
-        result = {}
-        # TODO(paul): Eventually this kind of metadata wants to come from the
-        #   ASes themselves
-        for protocol in protocols:
-            if protocol in self.META:
-                result[protocol] = self.META[protocol]
-            else:
-                # We don't know any metadata for it, but we'd best at least
-                # still declare that we know it exists
-                result[protocol] = {}
-
-        defer.returnValue((200, result))
+        defer.returnValue((200, protocols))
 
 
 class ThirdPartyUserServlet(RestServlet):