Skip to content

Commit 9451439

Browse files
authored
s/parent/prev_event/ for consistency with SS API
1 parent 5e6b7b9 commit 9451439

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

proposals/2716-importing-history-into-existing-rooms.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ This is currently not supported because:
2929

3030
## Proposal
3131

32-
1. We let the AS API override the parent(s) of an event when injecting it into
32+
1. We let the AS API override the prev_event(s) of an event when injecting it into
3333
the room, thus letting bridges consciously specify the topological ordering of
34-
the room DAG. We do this by adding a `parent` querystring parameter on the
34+
the room DAG. We do this by adding a `prev_event` querystring parameter on the
3535
`PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}` and
3636
`PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}` endpoints.
37-
The `parent` parameter can be repeated multiple times to specify multiple parent
38-
event IDs of the event being submitted. An event must not have more than 20 parents.
39-
If a `parent` parameter is not presented, the server assumes the event is being
40-
appended to the current timeline and calculates the parents as normal. If an
41-
unrecognised event ID is specified as a `parent`, the request fails with a 404.
37+
The `prev_event` parameter can be repeated multiple times to specify multiple parent
38+
event IDs of the event being submitted. An event must not have more than 20 prev_events.
39+
If a `prev_event` parameter is not presented, the server assumes the event is being
40+
appended to the current timeline and calculates the prev_events as normal. If an
41+
unrecognised event ID is specified as a `prev_event`, the request fails with a 404.
4242

4343
2. We also let the AS API override ('massage') the `origin_server_ts` timestamp applied
4444
to sent events. We do this by adding a `ts` querystring parameter on the
@@ -132,4 +132,4 @@ today by SS API traffic, so is orthogonal to this proposal.
132132

133133
## Unstable prefix
134134

135-
Feels unnecessary.
135+
Feels unnecessary.

0 commit comments

Comments
 (0)