OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Kill off some references to "context" 

Once upon a time, "rooms" were known as "contexts". I think this kills of the
last references to "contexts".
pull/8776/head
Richard van der Hoff 2020-11-18 16:37:11 +00:00
parent 83bdf0f007
commit 4da6fd7620
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/federation/federation_server.py
View File

@ -392,7 +392,7 @@ class FederationServer(FederationBase):
TRANSACTION_CONCURRENCY_LIMIT, TRANSACTION_CONCURRENCY_LIMIT,
) )
async def on_context_state_request( async def on_room_state_request(
self, origin: str, room_id: str, event_id: str self, origin: str, room_id: str, event_id: str
) -> Tuple[int, Dict[str, Any]]: ) -> Tuple[int, Dict[str, Any]]:
origin_host, _ = parse_server_name(origin) origin_host, _ = parse_server_name(origin)

48
synapse/federation/transport/server.py
View File

@ -440,13 +440,13 @@ class FederationEventServlet(BaseFederationServlet):
class FederationStateV1Servlet(BaseFederationServlet): class FederationStateV1Servlet(BaseFederationServlet):
PATH = "/state/(?P<context>[^/]*)/?" PATH = "/state/(?P<room_id>[^/]*)/?"
# This is when someone asks for all data for a given context. # This is when someone asks for all data for a given room.
async def on_GET(self, origin, content, query, context): async def on_GET(self, origin, content, query, room_id):
return await self.handler.on_context_state_request( return await self.handler.on_room_state_request(
origin, origin,
context, room_id,
parse_string_from_args(query, "event_id", None, required=False), parse_string_from_args(query, "event_id", None, required=False),
) )
@ -463,16 +463,16 @@ class FederationStateIdsServlet(BaseFederationServlet):
class FederationBackfillServlet(BaseFederationServlet): class FederationBackfillServlet(BaseFederationServlet):
PATH = "/backfill/(?P<context>[^/]*)/?" PATH = "/backfill/(?P<room_id>[^/]*)/?"
async def on_GET(self, origin, content, query, context): async def on_GET(self, origin, content, query, room_id):
versions = [x.decode("ascii") for x in query[b"v"]] versions = [x.decode("ascii") for x in query[b"v"]]
limit = parse_integer_from_args(query, "limit", None) limit = parse_integer_from_args(query, "limit", None)
if not limit: if not limit:
return 400, {"error": "Did not include limit param"} return 400, {"error": "Did not include limit param"}
return await self.handler.on_backfill_request(origin, context, versions, limit) return await self.handler.on_backfill_request(origin, room_id, versions, limit)
class FederationQueryServlet(BaseFederationServlet): class FederationQueryServlet(BaseFederationServlet):
@ -487,9 +487,9 @@ class FederationQueryServlet(BaseFederationServlet):
class FederationMakeJoinServlet(BaseFederationServlet): class FederationMakeJoinServlet(BaseFederationServlet):
PATH = "/make_join/(?P<context>[^/]*)/(?P<user_id>[^/]*)" PATH = "/make_join/(?P<room_id>[^/]*)/(?P<user_id>[^/]*)"
async def on_GET(self, origin, _content, query, context, user_id): async def on_GET(self, origin, _content, query, room_id, user_id):
""" """
Args: Args:
origin (unicode): The authenticated server_name of the calling server origin (unicode): The authenticated server_name of the calling server
@ -511,16 +511,16 @@ class FederationMakeJoinServlet(BaseFederationServlet):
supported_versions = ["1"] supported_versions = ["1"]
content = await self.handler.on_make_join_request( content = await self.handler.on_make_join_request(
origin, context, user_id, supported_versions=supported_versions origin, room_id, user_id, supported_versions=supported_versions
) )
return 200, content return 200, content
class FederationMakeLeaveServlet(BaseFederationServlet): class FederationMakeLeaveServlet(BaseFederationServlet):
PATH = "/make_leave/(?P<context>[^/]*)/(?P<user_id>[^/]*)" PATH = "/make_leave/(?P<room_id>[^/]*)/(?P<user_id>[^/]*)"
async def on_GET(self, origin, content, query, context, user_id): async def on_GET(self, origin, content, query, room_id, user_id):
content = await self.handler.on_make_leave_request(origin, context, user_id) content = await self.handler.on_make_leave_request(origin, room_id, user_id)
return 200, content return 200, content
@ -543,17 +543,17 @@ class FederationV2SendLeaveServlet(BaseFederationServlet):
class FederationEventAuthServlet(BaseFederationServlet): class FederationEventAuthServlet(BaseFederationServlet):
PATH = "/event_auth/(?P<context>[^/]*)/(?P<event_id>[^/]*)" PATH = "/event_auth/(?P<room_id>[^/]*)/(?P<event_id>[^/]*)"
async def on_GET(self, origin, content, query, context, event_id): async def on_GET(self, origin, content, query, room_id, event_id):
return await self.handler.on_event_auth(origin, context, event_id) return await self.handler.on_event_auth(origin, room_id, event_id)
class FederationV1SendJoinServlet(BaseFederationServlet): class FederationV1SendJoinServlet(BaseFederationServlet):
PATH = "/send_join/(?P<room_id>[^/]*)/(?P<event_id>[^/]*)" PATH = "/send_join/(?P<room_id>[^/]*)/(?P<event_id>[^/]*)"
async def on_PUT(self, origin, content, query, room_id, event_id): async def on_PUT(self, origin, content, query, room_id, event_id):
# TODO(paul): assert that context/event_id parsed from path actually # TODO(paul): assert that room_id/event_id parsed from path actually
# match those given in content # match those given in content
content = await self.handler.on_send_join_request(origin, content) content = await self.handler.on_send_join_request(origin, content)
return 200, (200, content) return 200, (200, content)
@ -565,16 +565,16 @@ class FederationV2SendJoinServlet(BaseFederationServlet):
PREFIX = FEDERATION_V2_PREFIX PREFIX = FEDERATION_V2_PREFIX
async def on_PUT(self, origin, content, query, room_id, event_id): async def on_PUT(self, origin, content, query, room_id, event_id):
# TODO(paul): assert that context/event_id parsed from path actually # TODO(paul): assert that room_id/event_id parsed from path actually
# match those given in content # match those given in content
content = await self.handler.on_send_join_request(origin, content) content = await self.handler.on_send_join_request(origin, content)
return 200, content return 200, content
class FederationV1InviteServlet(BaseFederationServlet): class FederationV1InviteServlet(BaseFederationServlet):
PATH = "/invite/(?P<context>[^/]*)/(?P<event_id>[^/]*)" PATH = "/invite/(?P<room_id>[^/]*)/(?P<event_id>[^/]*)"
async def on_PUT(self, origin, content, query, context, event_id): async def on_PUT(self, origin, content, query, room_id, event_id):
# We don't get a room version, so we have to assume its EITHER v1 or # We don't get a room version, so we have to assume its EITHER v1 or
# v2. This is "fine" as the only difference between V1 and V2 is the # v2. This is "fine" as the only difference between V1 and V2 is the
# state resolution algorithm, and we don't use that for processing # state resolution algorithm, and we don't use that for processing
@ -589,12 +589,12 @@ class FederationV1InviteServlet(BaseFederationServlet):
class FederationV2InviteServlet(BaseFederationServlet): class FederationV2InviteServlet(BaseFederationServlet):
PATH = "/invite/(?P<context>[^/]*)/(?P<event_id>[^/]*)" PATH = "/invite/(?P<room_id>[^/]*)/(?P<event_id>[^/]*)"
PREFIX = FEDERATION_V2_PREFIX PREFIX = FEDERATION_V2_PREFIX
async def on_PUT(self, origin, content, query, context, event_id): async def on_PUT(self, origin, content, query, room_id, event_id):
# TODO(paul): assert that context/event_id parsed from path actually # TODO(paul): assert that room_id/event_id parsed from path actually
# match those given in content # match those given in content
room_version = content["room_version"] room_version = content["room_version"]