Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Support MSC3916 by adding a federation /download endpoint" #17325

Merged
merged 2 commits into from
Jun 18, 2024

Conversation

anoadragon453
Copy link
Member

Reverts #17172

This ended up causing an Exception when interacting with https://github.com/matrix-org/synapse-s3-storage-provider/

Click to view the traceback
  File "synapse/http/server.py", line 332, in _async_render_wrapper
    callback_return = await self._async_render(request)
  File "synapse/http/server.py", line 544, in _async_render
    callback_return = await raw_callback_return
  File "synapse/rest/media/thumbnail_resource.py", line 94, in on_GET
    await self.thumbnail_provider.respond_local_thumbnail(
  File "synapse/media/thumbnailer.py", line 282, in respond_local_thumbnail
    await self._select_and_respond_with_thumbnail(
  File "synapse/media/thumbnailer.py", line 512, in _select_and_respond_with_thumbnail
    responder = await self.media_storage.fetch_media(file_info)
  File "synapse/media/media_storage.py", line 232, in fetch_media
    res: Any = await provider.fetch(path, file_info, media_info, federation)
  File "synapse/logging/opentracing.py", line 921, in _wrapper
    return await func(*args, **kwargs)
  File "synapse/media/storage_provider.py", line 152, in fetch
    self.backend.fetch(path, file_info, media_info, federation)
TypeError: S3StorageProviderBackend.fetch() takes 3 positional arguments but 5 were given

Reverting for now to fix develop, with a fix coming later.

@anoadragon453 anoadragon453 marked this pull request as ready for review June 18, 2024 15:17
@anoadragon453 anoadragon453 requested a review from a team as a code owner June 18, 2024 15:17
@anoadragon453
Copy link
Member Author

Merging and then cherry-picking to matrix-org-hotfixes.

@anoadragon453 anoadragon453 merged commit 1992230 into develop Jun 18, 2024
37 checks passed
@anoadragon453 anoadragon453 deleted the revert-17172-shay/3916_pt_1 branch June 18, 2024 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant