Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
c151b32b
Commit
c151b32b
authored
6 years ago
by
Will Hunt
Committed by
Richard van der Hoff
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add GET media/v1/config (#3184)
parent
762a758f
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changelog.d/3184.feature
+1
-0
1 addition, 0 deletions
changelog.d/3184.feature
synapse/rest/media/v1/config_resource.py
+48
-0
48 additions, 0 deletions
synapse/rest/media/v1/config_resource.py
synapse/rest/media/v1/media_repository.py
+2
-1
2 additions, 1 deletion
synapse/rest/media/v1/media_repository.py
with
51 additions
and
1 deletion
changelog.d/3184.feature
0 → 100644
+
1
−
0
View file @
c151b32b
Add
/_media/r0/config
This diff is collapsed.
Click to expand it.
synapse/rest/media/v1/config_resource.py
0 → 100644
+
48
−
0
View file @
c151b32b
# -*- 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.internet
import
defer
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
.
auth
=
hs
.
get_auth
()
self
.
limits_dict
=
{
"
m.upload.size
"
:
config
.
max_upload_size
,
}
def
render_GET
(
self
,
request
):
self
.
_async_render_GET
(
request
)
return
NOT_DONE_YET
@wrap_json_request_handler
@defer.inlineCallbacks
def
_async_render_GET
(
self
,
request
):
yield
self
.
auth
.
get_user_by_req
(
request
)
respond_with_json
(
request
,
200
,
self
.
limits_dict
)
def
render_OPTIONS
(
self
,
request
):
respond_with_json
(
request
,
200
,
{},
send_cors
=
True
)
return
NOT_DONE_YET
This diff is collapsed.
Click to expand it.
synapse/rest/media/v1/media_repository.py
+
2
−
1
View file @
c151b32b
...
@@ -42,6 +42,7 @@ from synapse.util.retryutils import NotRetryingDestination
...
@@ -42,6 +42,7 @@ from synapse.util.retryutils import NotRetryingDestination
from
synapse.util.stringutils
import
is_ascii
,
random_string
from
synapse.util.stringutils
import
is_ascii
,
random_string
from
._base
import
FileInfo
,
respond_404
,
respond_with_responder
from
._base
import
FileInfo
,
respond_404
,
respond_with_responder
from
.config_resource
import
MediaConfigResource
from
.download_resource
import
DownloadResource
from
.download_resource
import
DownloadResource
from
.filepath
import
MediaFilePaths
from
.filepath
import
MediaFilePaths
from
.identicon_resource
import
IdenticonResource
from
.identicon_resource
import
IdenticonResource
...
@@ -754,7 +755,6 @@ class MediaRepositoryResource(Resource):
...
@@ -754,7 +755,6 @@ class MediaRepositoryResource(Resource):
Resource
.
__init__
(
self
)
Resource
.
__init__
(
self
)
media_repo
=
hs
.
get_media_repository
()
media_repo
=
hs
.
get_media_repository
()
self
.
putChild
(
"
upload
"
,
UploadResource
(
hs
,
media_repo
))
self
.
putChild
(
"
upload
"
,
UploadResource
(
hs
,
media_repo
))
self
.
putChild
(
"
download
"
,
DownloadResource
(
hs
,
media_repo
))
self
.
putChild
(
"
download
"
,
DownloadResource
(
hs
,
media_repo
))
self
.
putChild
(
"
thumbnail
"
,
ThumbnailResource
(
self
.
putChild
(
"
thumbnail
"
,
ThumbnailResource
(
...
@@ -765,3 +765,4 @@ class MediaRepositoryResource(Resource):
...
@@ -765,3 +765,4 @@ class MediaRepositoryResource(Resource):
self
.
putChild
(
"
preview_url
"
,
PreviewUrlResource
(
self
.
putChild
(
"
preview_url
"
,
PreviewUrlResource
(
hs
,
media_repo
,
media_repo
.
media_storage
,
hs
,
media_repo
,
media_repo
.
media_storage
,
))
))
self
.
putChild
(
"
config
"
,
MediaConfigResource
(
hs
))
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment