Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-17 12:00:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace also_allow_user with a global config option

Browse source 
Basically reverts 088977f676.

This way is more suitable for self-hosting where there's no gateway to
manage the query parameter.
This commit is contained in:
Tulir Asokan 2021-10-30 14:06:15 +03:00
parent cf45cfd314
commit dbafb7c906
7 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/rest/client/room_batch.py
View file

@ -80,7 +80,6 @@ class RoomBatchSendEventRestServlet(RestServlet):
self.auth = hs.get_auth()
self.room_batch_handler = hs.get_room_batch_handler()
self.txns = HttpTransactionCache(hs)
self.enable_also_allow_user = hs.config.experimental.msc2716_also_allow_user
async def on_POST(
self, request: SynapseRequest, room_id: str
@ -101,8 +100,6 @@ class RoomBatchSendEventRestServlet(RestServlet):
request.args, "prev_event_id"
)
batch_id_from_query = parse_string(request, "batch_id")
also_allow_from_query = (parse_string(request, "com.beeper.also_allow_user")
if self.enable_also_allow_user else None)
if prev_event_ids_from_query is None:
raise SynapseError(
@ -143,7 +140,6 @@ class RoomBatchSendEventRestServlet(RestServlet):
room_id=room_id,
initial_auth_event_ids=auth_event_ids,
app_service_requester=requester,
also_allow_user=also_allow_from_query,
)
)
# Update our ongoing auth event ID list with all of the new state we
@ -214,7 +210,6 @@ class RoomBatchSendEventRestServlet(RestServlet):
inherited_depth=inherited_depth,
auth_event_ids=auth_event_ids,
app_service_requester=requester,
also_allow_user=also_allow_from_query,
)
insertion_event_id = event_ids[0]