magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only remove event_id field in room v1 and v2

Browse source 
no this doesnt make those rooms work,
just a why not thing

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-24 21:07:04 -04:00 • committed by June
parent 0863bec098
commit 4be37fbe8d
5 changed files with 70 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/api/client_server/membership.rs
View file

@ -526,9 +526,14 @@ pub(crate) async fn join_room_by_id_helper(
.expect("event is valid, we just created it"),
);
// We don't leave the event id in the pdu because that's only allowed in v1 or
// We keep the "event_id" in the pdu only in v1 or
// v2 rooms
join_event_stub.remove("event_id");
match room_version_id {
RoomVersionId::V1 | RoomVersionId::V2 => {},
_ => {
join_event_stub.remove("event_id");
},
};
// In order to create a compatible ref hash (EventID) the `hashes` field needs
// to be present
@ -929,9 +934,14 @@ pub(crate) async fn join_room_by_id_helper(
.expect("event is valid, we just created it"),
);
// We don't leave the event id in the pdu because that's only allowed in v1 or
// We keep the "event_id" in the pdu only in v1 or
// v2 rooms
join_event_stub.remove("event_id");
match room_version_id {
RoomVersionId::V1 | RoomVersionId::V2 => {},
_ => {
join_event_stub.remove("event_id");
},
};
// In order to create a compatible ref hash (EventID) the `hashes` field needs
// to be present
@ -1419,9 +1429,14 @@ async fn remote_leave_room(user_id: &UserId, room_id: &RoomId) -> Result<()> {
utils::millis_since_unix_epoch().try_into().expect("Timestamp is valid js_int value"),
),
);
// We don't leave the event id in the pdu because that's only allowed in v1 or
// v2 rooms
leave_event_stub.remove("event_id");
// room v3 and above removed the "event_id" field from remote PDU format
match room_version_id {
RoomVersionId::V1 | RoomVersionId::V2 => {},
_ => {
leave_event_stub.remove("event_id");
},
};
// In order to create a compatible ref hash (EventID) the `hashes` field needs
// to be present

5
src/api/client_server/room.rs
View file

@ -202,7 +202,7 @@ pub async fn create_room_route(body: Ruma<create_room::v3::Request>) -> Result<c
},
RoomVersionId::V11 => {}, // V11 removed the "creator" key
_ => {
warn!("Unexpected or unsupported room version {}", room_version);
warn!("Unexpected or unsupported room version {room_version}");
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Unexpected or unsupported room version found",
@ -219,7 +219,6 @@ pub async fn create_room_route(body: Ruma<create_room::v3::Request>) -> Result<c
content
},
None => {
// TODO: Add correct value for v11
let content = match room_version {
RoomVersionId::V1
| RoomVersionId::V2
@ -233,7 +232,7 @@ pub async fn create_room_route(body: Ruma<create_room::v3::Request>) -> Result<c
| RoomVersionId::V10 => RoomCreateEventContent::new_v1(sender_user.clone()),
RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
_ => {
warn!("Unexpected or unsupported room version {}", room_version);
warn!("Unexpected or unsupported room version {room_version}");
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Unexpected or unsupported room version found",