summary refs log tree commit diff
path: root/synapse/rest/media/v1/config_resource.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-03-16 12:42:54 +0000
committerRichard van der Hoff <richard@matrix.org>2021-03-16 12:42:54 +0000
commitd8953b34f2b593043b518304fa70099432955f81 (patch)
treefdc122f5c1e368ea4716c6c9fe66b3d76c55c2cd /synapse/rest/media/v1/config_resource.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentPass SSO IdP information to spam checker's registration function (#9626) (diff)
downloadsynapse-d8953b34f2b593043b518304fa70099432955f81.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/media/v1/config_resource.py')
-rw-r--r--synapse/rest/media/v1/config_resource.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py

index 9039662f7e..1eff98ef14 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py
@@ -20,6 +20,7 @@ from typing import TYPE_CHECKING from twisted.web.server import Request from synapse.http.server import DirectServeJsonResource, respond_with_json +from synapse.http.site import SynapseRequest if TYPE_CHECKING: from synapse.app.homeserver import HomeServer @@ -35,7 +36,7 @@ class MediaConfigResource(DirectServeJsonResource): self.auth = hs.get_auth() self.limits_dict = {"m.upload.size": config.max_upload_size} - async def _async_render_GET(self, request: Request) -> None: + async def _async_render_GET(self, request: SynapseRequest) -> None: await self.auth.get_user_by_req(request) respond_with_json(request, 200, self.limits_dict, send_cors=True)