Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Switch to chunk events so we can auth via power_levels (MSC2716) #10432

Merged
merged 3 commits into from
Jul 21, 2021
Merged

Switch to chunk events so we can auth via power_levels (MSC2716) #10432

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07fb601
Switch to chunk events so we can auth via power_levels
MadLittleMods Jul 20, 2021
ccc02f0
Add changelog
MadLittleMods Jul 20, 2021
58098cf
Merge remote-tracking branch 'origin/develop' into madlittlemods/msc2…
erikjohnston Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/10432.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Connect historical chunks together with chunk events instead of a content field (MSC2716).
6 changes: 4 additions & 2 deletions synapse/api/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ class EventTypes:
SpaceParent = "m.space.parent"

MSC2716_INSERTION = "org.matrix.msc2716.insertion"
MSC2716_CHUNK = "org.matrix.msc2716.chunk"
Copy link
Contributor Author

@MadLittleMods MadLittleMods Jul 20, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to suggest better names!

Maybe we want to rename insertion to chunk_end so we have chunk_start and chunk_end events 🤷‍♀️ (which one is the start vs end 😜, depends on frame of reference)

MSC2716_MARKER = "org.matrix.msc2716.marker"


Expand Down Expand Up @@ -190,9 +191,10 @@ class EventContentFields:

# Used on normal messages to indicate they were historically imported after the fact
MSC2716_HISTORICAL = "org.matrix.msc2716.historical"
# For "insertion" events
# For "insertion" events to indicate what the next chunk ID should be in
# order to connect to it
MSC2716_NEXT_CHUNK_ID = "org.matrix.msc2716.next_chunk_id"
# Used on normal message events to indicate where the chunk connects to
# Used on "chunk" events to indicate which insertion event it connects to
MSC2716_CHUNK_ID = "org.matrix.msc2716.chunk_id"
# For "marker" events
MSC2716_MARKER_INSERTION = "org.matrix.msc2716.marker.insertion"
Expand Down
17 changes: 13 additions & 4 deletions synapse/rest/client/v1/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,9 +553,18 @@ async def on_POST(self, request, room_id):
]

# Connect this current chunk to the insertion event from the previous chunk
last_event_in_chunk["content"][
EventContentFields.MSC2716_CHUNK_ID
] = chunk_id_to_connect_to
chunk_event = {
"type": EventTypes.MSC2716_CHUNK,
"sender": requester.user.to_string(),
"room_id": room_id,
"content": {EventContentFields.MSC2716_CHUNK_ID: chunk_id_to_connect_to},
# Since the chunk event is put at the end of the chunk,
# where the newest-in-time event is, copy the origin_server_ts from
# the last event we're inserting
"origin_server_ts": last_event_in_chunk["origin_server_ts"],
}
# Add the chunk event to the end of the chunk (newest-in-time)
events_to_create.append(chunk_event)

# Add an "insertion" event to the start of each chunk (next to the oldest-in-time
# event in the chunk) so the next chunk can be connected to this one.
Expand All @@ -567,7 +576,7 @@ async def on_POST(self, request, room_id):
# the first event we're inserting
origin_server_ts=events_to_create[0]["origin_server_ts"],
)
# Prepend the insertion event to the start of the chunk
# Prepend the insertion event to the start of the chunk (oldest-in-time)
events_to_create = [insertion_event] + events_to_create

event_ids = []
Expand Down