mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-23 18:56:10 +00:00
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
This commit is contained in:
commit
bfb6c58624
1
changelog.d/3184.feature
Normal file
1
changelog.d/3184.feature
Normal file
@ -0,0 +1 @@
|
|||||||
|
Add /_media/r0/config
|
1
changelog.d/3589.feature
Normal file
1
changelog.d/3589.feature
Normal file
@ -0,0 +1 @@
|
|||||||
|
Add lazy-loading support to /messages as per MSC1227
|
@ -18,7 +18,7 @@ import logging
|
|||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
from twisted.python.failure import Failure
|
from twisted.python.failure import Failure
|
||||||
|
|
||||||
from synapse.api.constants import Membership
|
from synapse.api.constants import EventTypes, Membership
|
||||||
from synapse.api.errors import SynapseError
|
from synapse.api.errors import SynapseError
|
||||||
from synapse.events.utils import serialize_event
|
from synapse.events.utils import serialize_event
|
||||||
from synapse.types import RoomStreamToken
|
from synapse.types import RoomStreamToken
|
||||||
@ -251,6 +251,33 @@ class PaginationHandler(object):
|
|||||||
is_peeking=(member_event_id is None),
|
is_peeking=(member_event_id is None),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
state = None
|
||||||
|
if event_filter and event_filter.lazy_load_members():
|
||||||
|
# TODO: remove redundant members
|
||||||
|
|
||||||
|
types = [
|
||||||
|
(EventTypes.Member, state_key)
|
||||||
|
for state_key in set(
|
||||||
|
event.sender # FIXME: we also care about invite targets etc.
|
||||||
|
for event in events
|
||||||
|
)
|
||||||
|
]
|
||||||
|
|
||||||
|
state_ids = yield self.store.get_state_ids_for_event(
|
||||||
|
events[0].event_id, types=types,
|
||||||
|
)
|
||||||
|
|
||||||
|
if state_ids:
|
||||||
|
state = yield self.store.get_events(list(state_ids.values()))
|
||||||
|
|
||||||
|
if state:
|
||||||
|
state = yield filter_events_for_client(
|
||||||
|
self.store,
|
||||||
|
user_id,
|
||||||
|
state.values(),
|
||||||
|
is_peeking=(member_event_id is None),
|
||||||
|
)
|
||||||
|
|
||||||
time_now = self.clock.time_msec()
|
time_now = self.clock.time_msec()
|
||||||
|
|
||||||
chunk = {
|
chunk = {
|
||||||
@ -262,4 +289,10 @@ class PaginationHandler(object):
|
|||||||
"end": next_token.to_string(),
|
"end": next_token.to_string(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if state:
|
||||||
|
chunk["state"] = [
|
||||||
|
serialize_event(e, time_now, as_client_event)
|
||||||
|
for e in state
|
||||||
|
]
|
||||||
|
|
||||||
defer.returnValue(chunk)
|
defer.returnValue(chunk)
|
||||||
|
@ -27,11 +27,22 @@ class VersionsRestServlet(RestServlet):
|
|||||||
def on_GET(self, request):
|
def on_GET(self, request):
|
||||||
return (200, {
|
return (200, {
|
||||||
"versions": [
|
"versions": [
|
||||||
|
# XXX: at some point we need to decide whether we need to include
|
||||||
|
# the previous version numbers, given we've defined r0.3.0 to be
|
||||||
|
# backwards compatible with r0.2.0. But need to check how
|
||||||
|
# conscientious we've been in compatibility, and decide whether the
|
||||||
|
# middle number is the major revision when at 0.X.Y (as opposed to
|
||||||
|
# X.Y.Z). And we need to decide whether it's fair to make clients
|
||||||
|
# parse the version string to figure out what's going on.
|
||||||
"r0.0.1",
|
"r0.0.1",
|
||||||
"r0.1.0",
|
"r0.1.0",
|
||||||
"r0.2.0",
|
"r0.2.0",
|
||||||
"r0.3.0",
|
"r0.3.0",
|
||||||
]
|
],
|
||||||
|
# as per MSC1497:
|
||||||
|
"unstable_features": {
|
||||||
|
"m.lazy_load_members": True,
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
48
synapse/rest/media/v1/config_resource.py
Normal file
48
synapse/rest/media/v1/config_resource.py
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
# -*- 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
|
@ -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):
|
|||||||
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):
|
|||||||
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))
|
||||||
|
Loading…
Reference in New Issue
Block a user