Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fetch from the r0 media path instead of the unspecced v1. (#7714)

Browse Source
This commit is contained in:
Patrick Cloke 2020-06-17 08:36:46 -04:00 committed by GitHub
parent 46613aaf79
commit 434716e1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7714.bugfix Normal file
View File

@ -0,0 +1 @@
Synapse will now fetch media from the proper specified URL (using the r0 prefix instead of the unspecified v1).

8
synapse/rest/media/v1/media_repository.py
View File

@ -338,7 +338,7 @@ class MediaRepository(object):
with self.media_storage.store_into_file(file_info) as (f, fname, finish): with self.media_storage.store_into_file(file_info) as (f, fname, finish):
request_path = "/".join( request_path = "/".join(
("/_matrix/media/v1/download", server_name, media_id) ("/_matrix/media/r0/download", server_name, media_id)
) )
try: try:
length, headers = await self.client.get_file( length, headers = await self.client.get_file(
@ -703,7 +703,7 @@ class MediaRepositoryResource(Resource):
Uploads are POSTed to a resource which returns a token which is used to GET Uploads are POSTed to a resource which returns a token which is used to GET
the download:: the download::
=> POST /_matrix/media/v1/upload HTTP/1.1 => POST /_matrix/media/r0/upload HTTP/1.1
Content-Type: <media-type> Content-Type: <media-type>
Content-Length: <content-length> Content-Length: <content-length>
@ -714,7 +714,7 @@ class MediaRepositoryResource(Resource):
{ "content_uri": "mxc://<server-name>/<media-id>" } { "content_uri": "mxc://<server-name>/<media-id>" }
=> GET /_matrix/media/v1/download/<server-name>/<media-id> HTTP/1.1 => GET /_matrix/media/r0/download/<server-name>/<media-id> HTTP/1.1
<= HTTP/1.1 200 OK <= HTTP/1.1 200 OK
Content-Type: <media-type> Content-Type: <media-type>
@ -725,7 +725,7 @@ class MediaRepositoryResource(Resource):
Clients can get thumbnails by supplying a desired width and height and Clients can get thumbnails by supplying a desired width and height and
thumbnailing method:: thumbnailing method::
=> GET /_matrix/media/v1/thumbnail/<server_name> => GET /_matrix/media/r0/thumbnail/<server_name>
/<media-id>?width=<w>&height=<h>&method=<m> HTTP/1.1 /<media-id>?width=<w>&height=<h>&method=<m> HTTP/1.1
<= HTTP/1.1 200 OK <= HTTP/1.1 200 OK

2
tests/rest/media/v1/test_media_storage.py
View File

@ -232,7 +232,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
self.assertEqual(len(self.fetches), 1) self.assertEqual(len(self.fetches), 1)
self.assertEqual(self.fetches[0][1], "example.com") self.assertEqual(self.fetches[0][1], "example.com")
self.assertEqual( self.assertEqual(
self.fetches[0][2], "/_matrix/media/v1/download/" + self.media_id self.fetches[0][2], "/_matrix/media/r0/download/" + self.media_id
) )
self.assertEqual(self.fetches[0][3], {"allow_remote": "false"}) self.assertEqual(self.fetches[0][3], {"allow_remote": "false"})