summary refs log tree commit diff
path: root/synapse/media/v1
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-11 18:18:58 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-11 18:18:58 +0000
commit64bf9f54ccb4facb9b0a1ecef85e9d82b3268eda (patch)
treec8ff062cd66b0063830e32a19c279d01b6cce91a /synapse/media/v1
parentMerge pull request #23 from matrix-org/media_repository (diff)
downloadsynapse-64bf9f54ccb4facb9b0a1ecef85e9d82b3268eda.tar.xz
Fix media repository doc string to include server_name
Diffstat (limited to 'synapse/media/v1')
-rw-r--r--synapse/media/v1/media_repository.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/media/v1/media_repository.py b/synapse/media/v1/media_repository.py
index a0dc56be4b..afbe07ad74 100644
--- a/synapse/media/v1/media_repository.py
+++ b/synapse/media/v1/media_repository.py
@@ -41,7 +41,7 @@ class MediaRepositoryResource(Resource):
 
            { "token": <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