diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
| commit | 57e0e619f3ddc68673a0d7b345203b1a52ff1fa1 (patch) | |
| tree | d7c45715bc9313f7602243b1cd614d95d1a24858 /synapse/media/v1/media_repository.py | |
| parent | Add beginnings of upgrade script (diff) | |
| parent | Still send typing notifications to myself if I'm the only one in the room (it... (diff) | |
| download | synapse-57e0e619f3ddc68673a0d7b345203b1a52ff1fa1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: tests/handlers/test_room.py
Diffstat (limited to 'synapse/media/v1/media_repository.py')
| -rw-r--r-- | synapse/media/v1/media_repository.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/media/v1/media_repository.py b/synapse/media/v1/media_repository.py index a0dc56be4b..cbc49aa325 100644 --- a/synapse/media/v1/media_repository.py +++ b/synapse/media/v1/media_repository.py @@ -26,7 +26,7 @@ logger = logging.getLogger(__name__) class MediaRepositoryResource(Resource): - """Profiles file uploading and downloading. + """File uploading and downloading. Uploads are POSTed to a resource which returns a token which is used to GET the download:: @@ -39,9 +39,9 @@ class MediaRepositoryResource(Resource): <= HTTP/1.1 200 OK Content-Type: application/json - { "token": <media-id> } + { "content-uri": "mxc://<server-name>/<media-id>" } - => GET /_matrix/media/v1/download/<media-id> HTTP/1.1 + => GET /_matrix/media/v1/download/<server-name>/<media-id> HTTP/1.1 <= HTTP/1.1 200 OK Content-Type: <media-type> @@ -52,8 +52,8 @@ class MediaRepositoryResource(Resource): Clients can get thumbnails by supplying a desired width and height and thumbnailing method:: - => GET /_matrix/media/v1 - /thumbnail/<media-id>?width=<w>&height=<h>&method=<m> HTTP/1.1 + => GET /_matrix/media/v1/thumbnail/<server_name> + /<media-id>?width=<w>&height=<h>&method=<m> HTTP/1.1 <= HTTP/1.1 200 OK Content-Type: image/jpeg or image/png |