diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-26 09:48:13 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-26 09:48:13 +0100 |
| commit | 30961182f2c7ecc596cdbe2cc06a861d0f8a2f7b (patch) | |
| tree | e689fff70ffc280319bb15056c41ae0bc595c572 /synapse/api | |
| parent | Make sync not pull out full state (diff) | |
| parent | Merge pull request #1043 from matrix-org/erikj/backfill_fix (diff) | |
| download | synapse-30961182f2c7ecc596cdbe2cc06a861d0f8a2f7b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 5 | ||||
| -rw-r--r-- | synapse/api/urls.py | 1 |
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" |