This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add GET media/v1/config #3184
Merged
Merged
Add GET media/v1/config #3184
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
53385e8
Add GET media/v1/limits
Half-Shot 3976352
size > upload_size as per spec feedback
Half-Shot f8b06fc
Make MediaLimitsResource Leafy
Half-Shot fee0450
Restructure __init__
Half-Shot c06b1cb
Update and rename limits_resource.py to config_resource.py
Half-Shot b1d8777
media limits => config
Half-Shot 1d53129
upload_size => m.upload.size
Half-Shot 0aa14e4
/limits => /config
Half-Shot a7f4ebb
Merge branch 'develop' into hs/upload-limits
Half-Shot 87fe4f2
Add import for MediaConfigResource
Half-Shot 48251dc
Create 3184.feature
Half-Shot 3f520b2
wrapped
Half-Shot 8cc46ed
wrap_json_request_handlering
Half-Shot bf13c18
linting
Half-Shot bf30fd8
Auth media/r0/config
Half-Shot 46afacc
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Half-Shot 0f6e583
isorted this mess
Half-Shot b3e005d
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Half-Shot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2018 Will Hunt <will@half-shot.uk> | ||
# | ||
# 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.server import NOT_DONE_YET | ||
from twisted.web.resource import Resource | ||
from synapse.http.server import respond_with_json, respond_with_json_bytes | ||
|
||
|
||
class MediaLimitsResource(Resource): | ||
# isLeaf = True | ||
|
||
def __init__(self, hs): | ||
Resource.__init__(self) | ||
self.limits_dict = {} | ||
config = hs.get_config() | ||
self.limits_dict["upload_size"] = config.max_upload_size | ||
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'd write this as: def __init__(self, hs):
Resource.__init__(self)
config = hs.get_config()
self.limits_dict = {
"upload_size": config.max_upload_size,
} |
||
|
||
def render_GET(self, request): | ||
respond_with_json(request, 200, self.limits_dict, send_cors=True) | ||
return NOT_DONE_YET | ||
|
||
def render_OPTIONS(self, request): | ||
respond_with_json_bytes(request, 200, {}, send_cors=True) | ||
return NOT_DONE_YET |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,6 +25,7 @@ | |
from .thumbnail_resource import ThumbnailResource | ||
from .identicon_resource import IdenticonResource | ||
from .preview_url_resource import PreviewUrlResource | ||
from .limits_resource import MediaLimitsResource | ||
from .filepath import MediaFilePaths | ||
from .thumbnailer import Thumbnailer | ||
from .storage_provider import StorageProviderWrapper | ||
|
@@ -745,7 +746,6 @@ def __init__(self, hs): | |
Resource.__init__(self) | ||
|
||
media_repo = hs.get_media_repository() | ||
|
||
self.putChild("upload", UploadResource(hs, media_repo)) | ||
self.putChild("download", DownloadResource(hs, media_repo)) | ||
self.putChild("thumbnail", ThumbnailResource( | ||
|
@@ -756,3 +756,4 @@ def __init__(self, hs): | |
self.putChild("preview_url", PreviewUrlResource( | ||
hs, media_repo, media_repo.media_storage, | ||
)) | ||
self.putChild("limits", MediaLimitsResource(hs)) | ||
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. this is |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Why is this commented out?
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.
Oh. I had no idea what it was for and forgot to ask. So errm, what is it for?
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.
https://stackoverflow.com/a/42799031
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.
Gotcha