Add query parameter ts to allow appservices set the origin_server_ts for state events

changelog.d/11866.feature

@@ -0,0 +1 @@
+Allow appservices to set the `origin_server_ts` of a state event by providing the query parameter `ts` in `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}`.

synapse/handlers/room_member.py

@@ -261,6 +261,7 @@ async def _local_membership_update(
         target: UserID,
         room_id: str,
         membership: str,
+        origin_server_ts: Optional[int],
         prev_event_ids: List[str],
         auth_event_ids: Optional[List[str]] = None,
         txn_id: Optional[str] = None,
@@ -279,6 +280,7 @@ async def _local_membership_update(
             target:
             room_id:
             membership:
+            origin_server_ts:
             prev_event_ids: The event IDs to use as the prev events
 
             auth_event_ids:
@@ -335,6 +337,7 @@ async def _local_membership_update(
                 "state_key": user_id,
                 # For backwards compatibility:
                 "membership": membership,
+                "origin_server_ts": origin_server_ts,
             },
             txn_id=txn_id,
             prev_event_ids=prev_event_ids,
@@ -441,6 +444,7 @@ async def update_membership(
         historical: bool = False,
         prev_event_ids: Optional[List[str]] = None,
         auth_event_ids: Optional[List[str]] = None,
+        origin_server_ts: Optional[int] = None,
     ) -> Tuple[str, int]:
         """Update a user's membership in a room.
 
@@ -468,6 +472,8 @@ async def update_membership(
                 The event ids to use as the auth_events for the new event.
                 Should normally be left as None, which will cause them to be calculated
                 based on the room state at the prev_events.
+            origin_server_ts: The origin_server_ts to use if a new event is created. Uses
+                the current timestamp if set to None.
 
         Returns:
             A tuple of the new event ID and stream ID.
@@ -499,6 +505,7 @@ async def update_membership(
                 historical=historical,
                 prev_event_ids=prev_event_ids,
                 auth_event_ids=auth_event_ids,
+                origin_server_ts=origin_server_ts,
             )
 
         return result
@@ -520,6 +527,7 @@ async def update_membership_locked(
         historical: bool = False,
         prev_event_ids: Optional[List[str]] = None,
         auth_event_ids: Optional[List[str]] = None,
+        origin_server_ts: Optional[int] = None,
     ) -> Tuple[str, int]:
         """Helper for update_membership.
 
@@ -549,6 +557,7 @@ async def update_membership_locked(
                 The event ids to use as the auth_events for the new event.
                 Should normally be left as None, which will cause them to be calculated
                 based on the room state at the prev_events.
+            origin_server_ts:
 
         Returns:
             A tuple of the new event ID and stream ID.
@@ -679,6 +688,7 @@ async def update_membership_locked(
                 require_consent=require_consent,
                 outlier=outlier,
                 historical=historical,
+                origin_server_ts=origin_server_ts,
             )
 
         latest_event_ids = await self.store.get_prev_events_for_room(room_id)
@@ -902,6 +912,7 @@ async def update_membership_locked(
             content=content,
             require_consent=require_consent,
             outlier=outlier,
+            origin_server_ts=origin_server_ts,
         )
 
     async def _should_perform_remote_join(

synapse/rest/client/room.py

@@ -204,6 +204,11 @@ async def on_PUT(
         if state_key is not None:
             event_dict["state_key"] = state_key
 
+        # Twisted will have processed the args by now.
+        assert request.args is not None
+        if b"ts" in request.args and requester.app_service:
+            event_dict["origin_server_ts"] = parse_integer(request, "ts", 0)
+
         try:
             if event_type == EventTypes.Member:
                 membership = content.get("membership", None)
@@ -213,6 +218,7 @@ async def on_PUT(
                     room_id=room_id,
                     action=membership,
                     content=content,
+                    origin_server_ts=event_dict.get("origin_server_ts", None),
                 )
             else:
                 (