diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-15 13:53:58 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-15 13:54:10 +0000 |
| commit | 58fa6d3fc64c789a10f407532c0e7c419b0c1650 (patch) | |
| tree | 7e300b4d2beb1899834fc01dcb80238de18f9a9e /synapse/media | |
| parent | Merge branch 'develop' into typing_notifications (diff) | |
| download | synapse-58fa6d3fc64c789a10f407532c0e7c419b0c1650.tar.xz | |
return an mxc uri rather than a content_token.
Diffstat (limited to 'synapse/media')
| -rw-r--r-- | synapse/media/v1/upload_resource.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/media/v1/upload_resource.py b/synapse/media/v1/upload_resource.py index b2449ff03d..5645b0df46 100644 --- a/synapse/media/v1/upload_resource.py +++ b/synapse/media/v1/upload_resource.py @@ -95,8 +95,10 @@ class UploadResource(BaseMediaResource): yield self._generate_local_thumbnails(media_id, media_info) + content_uri = "mxc://%s/%s" % (self.server_name, media_id) + respond_with_json( - request, 200, {"content_token": media_id}, send_cors=True + request, 200, {"content_uri": content_uri}, send_cors=True ) except CodeMessageException as e: logger.exception(e) |