-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add GET media/v1/config #3184
Add GET media/v1/config #3184
Changes from 14 commits
53385e8
3976352
f8b06fc
fee0450
c06b1cb
b1d8777
1d53129
0aa14e4
a7f4ebb
87fe4f2
48251dc
3f520b2
8cc46ed
bf13c18
bf30fd8
46afacc
0f6e583
b3e005d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add /_media/r0/config | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2018 Will Hunt <[email protected]> | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
from twisted.web.resource import Resource | ||
from twisted.web.server import NOT_DONE_YET | ||
from synapse.http.server import respond_with_json, wrap_json_request_handler | ||
|
||
|
||
class MediaConfigResource(Resource): | ||
isLeaf = True | ||
|
||
def __init__(self, hs): | ||
Resource.__init__(self) | ||
config = hs.get_config() | ||
self.clock = hs.get_clock() | ||
self.limits_dict = { | ||
"m.upload.size": config.max_upload_size, | ||
} | ||
|
||
def render_GET(self, request): | ||
self._async_render_GET(request) | ||
return NOT_DONE_YET | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Presumably we shouldn't be returning @hawkowl how is this meant to work in twisted? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm pretty sure this is correct. Your options for returning from a
the implication is that if you have rendered the body and called Note that this is exactly what happens with a whole bunch of our handlers that look like they are asynchronous, but actually complete synchronously. HOWEVER. There is a problem here, in that |
||
|
||
@wrap_json_request_handler | ||
def _async_render_GET(self, request): | ||
return respond_with_json(request, 200, self.limits_dict) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. needs auth? |
||
|
||
def render_OPTIONS(self, request): | ||
respond_with_json(request, 200, {}, send_cors=True) | ||
return NOT_DONE_YET |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess this won't mean much to the average reader of the synapse changelog. You probably need to say it's a new endpoint for clients. A link to the proposal might help.