tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Use MSC2197 on stable prefix as it has almost finished FCP

Browse source 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
This commit is contained in:
Olivier Wilkinson (reivilibre) 2019-08-20 08:49:31 +01:00
parent a3df04a899
commit bb29bc2937
2 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/federation/transport/client.py
View file

@ -328,8 +328,8 @@ class TransportLayerClient(object):
third_party_instance_id=None,
):
if search_filter:
# TODO(MSC2197): Move to V1 prefix
path = _create_path(FEDERATION_UNSTABLE_PREFIX, "/publicRooms")
# this uses MSC2197 (Search Filtering over Federation)
path = _create_v1_path("/publicRooms")
data = {"include_all_networks": "true" if include_all_networks else "false"}
if third_party_instance_id:

26
synapse/federation/transport/server.py
View file

@ -750,30 +750,8 @@ class PublicRoomList(BaseFederationServlet):
)
return 200, data
class UnstablePublicRoomList(BaseFederationServlet):
"""
Fetch the public room list for this server.
This API returns information in the same format as /publicRooms on the
client API, but will only ever include local public rooms and hence is
intended for consumption by other home servers.
This is the unstable-prefixed version which adds support for MSC2197, which
is still undergoing review.
"""
PATH = "/publicRooms"
PREFIX = FEDERATION_UNSTABLE_PREFIX
def __init__(self, handler, authenticator, ratelimiter, server_name, allow_access):
super(UnstablePublicRoomList, self).__init__(
handler, authenticator, ratelimiter, server_name
)
self.allow_access = allow_access
# TODO(MSC2197): Move away from Unstable prefix and back to normal prefix
async def on_POST(self, origin, content, query):
# This implements MSC2197 (Search Filtering over Federation)
if not self.allow_access:
raise FederationDeniedError(origin)
@ -1373,7 +1351,7 @@ FEDERATION_SERVLET_CLASSES = (
OPENID_SERVLET_CLASSES = (OpenIdUserInfo,)
ROOM_LIST_CLASSES = (PublicRoomList, UnstablePublicRoomList)
ROOM_LIST_CLASSES = (PublicRoomList,)
GROUP_SERVER_SERVLET_CLASSES = (
FederationGroupsProfileServlet,