summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorPaul Evans <leonerd@leonerd.org.uk>2016-08-25 18:49:18 +0100
committerGitHub <noreply@github.com>2016-08-25 18:49:18 +0100
commit1a1e198f72a1ce0124ee0060be5b27cb8c6d5e5a (patch)
tree3f78b4a5870743e84c984446231546011da0927c /synapse/api
parentMerge pull request #1041 from matrix-org/paul/third-party-lookup (diff)
parentJust sprintf the 'kind' argument into uri directly (diff)
downloadsynapse-1a1e198f72a1ce0124ee0060be5b27cb8c6d5e5a.tar.xz
Merge pull request #1044 from matrix-org/paul/third-party-lookup
Root the 3PE lookup API within /_matrix/app/unstable
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py5
-rw-r--r--synapse/api/urls.py1
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 8cf4d6169c..a8123cddcb 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -85,3 +85,8 @@ class RoomCreationPreset(object):
     PRIVATE_CHAT = "private_chat"
     PUBLIC_CHAT = "public_chat"
     TRUSTED_PRIVATE_CHAT = "trusted_private_chat"
+
+
+class ThirdPartyEntityKind(object):
+    USER = "user"
+    LOCATION = "location"
diff --git a/synapse/api/urls.py b/synapse/api/urls.py
index 0fd9b7f244..91a33a3402 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -25,4 +25,3 @@ SERVER_KEY_PREFIX = "/_matrix/key/v1"
 SERVER_KEY_V2_PREFIX = "/_matrix/key/v2"
 MEDIA_PREFIX = "/_matrix/media/r0"
 LEGACY_MEDIA_PREFIX = "/_matrix/media/v1"
-APP_SERVICE_PREFIX = "/_matrix/appservice/v1"