|
@@ -422,7 +422,7 @@ class FederationV2SendJoinServlet(BaseFederationServerServlet):
|
|
|
server_name: str,
|
|
|
):
|
|
|
super().__init__(hs, authenticator, ratelimiter, server_name)
|
|
|
- self._msc3706_enabled = hs.config.experimental.msc3706_enabled
|
|
|
+ self._read_msc3706_query_param = hs.config.experimental.msc3706_enabled
|
|
|
|
|
|
async def on_PUT(
|
|
|
self,
|
|
@@ -436,16 +436,15 @@ class FederationV2SendJoinServlet(BaseFederationServerServlet):
|
|
|
# match those given in content
|
|
|
|
|
|
partial_state = False
|
|
|
- if self._msc3706_enabled:
|
|
|
- # The stable query parameter wins, if it disagrees with the unstable
|
|
|
- # parameter for some reason.
|
|
|
- stable_param = parse_boolean_from_args(query, "omit_members", default=None)
|
|
|
- if stable_param is not None:
|
|
|
- partial_state = stable_param
|
|
|
- else:
|
|
|
- partial_state = parse_boolean_from_args(
|
|
|
- query, "org.matrix.msc3706.partial_state", default=False
|
|
|
- )
|
|
|
+ # The stable query parameter wins, if it disagrees with the unstable
|
|
|
+ # parameter for some reason.
|
|
|
+ stable_param = parse_boolean_from_args(query, "omit_members", default=None)
|
|
|
+ if stable_param is not None:
|
|
|
+ partial_state = stable_param
|
|
|
+ elif self._read_msc3706_query_param:
|
|
|
+ partial_state = parse_boolean_from_args(
|
|
|
+ query, "org.matrix.msc3706.partial_state", default=False
|
|
|
+ )
|
|
|
|
|
|
result = await self.handler.on_send_join_request(
|
|
|
origin, content, room_id, caller_supports_partial_state=partial_state
|