Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Request & follow redirects for /media/v3/download #16701

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Request & follow redirects for /media/v3/download #16701

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2c5942
Move logic to download media to TransportLayerClient.
clokep Nov 28, 2023
fa4f637
Attempt both the v3 and r0 endpoints.
clokep Nov 28, 2023
8837c38
Follow redirects when fetching from /download.
clokep Nov 28, 2023
12c6193
Fix typo.
clokep Nov 29, 2023
b209ee7
Update logging.
clokep Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update logging.
  • Loading branch information
@clokep
clokep committed Nov 29, 2023
commit b209ee70adba8cf3112fbc4c32263810ecdee9b0
4 changes: 3 additions & 1 deletion synapse/federation/federation_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,7 +1887,9 @@ async def download_media(
raise

logger.debug(
"Couldn't download media with the v3 API, falling back to the r0 API"
"Couldn't download media %s/%s with the v3 API, falling back to the r0 API",
destination,
media_id,
)

return await self.transport_layer.download_media_r0(
Expand Down