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

remove unnecessary "unsupported room version" error on PDU processing to allow custom room versions properly

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-08-17 02:28:16 -04:00 • committed by Jason Volk
parent c40ed0c98e
commit 826b1d1d62
5 changed files with 9 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/api/client/room.rs
View file

@ -139,13 +139,8 @@ pub(crate) async fn create_room_route(
})?,
);
},
V11 => {}, // V11 removed the "creator" key
_ => {
warn!("Unexpected or unsupported room version {room_version}");
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Unexpected or unsupported room version found",
));
// V11+ removed the "creator" key
},
}
content.insert(
@ -161,14 +156,7 @@ pub(crate) async fn create_room_route(
let content = match room_version {
V1 | V2 | V3 | V4 | V5 | V6 | V7 | V8 | V9 | V10 => RoomCreateEventContent::new_v1(sender_user.clone()),
V11 => RoomCreateEventContent::new_v11(),
_ => {
warn!("Unexpected or unsupported room version {room_version}");
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Unexpected or unsupported room version found",
));
},
_ => RoomCreateEventContent::new_v11(),
};
let mut content = serde_json::from_str::<CanonicalJsonObject>(
to_raw_value(&content)
@ -634,16 +622,9 @@ pub(crate) async fn upgrade_room_route(
})?,
);
},
V11 => {
// "creator" key no longer exists in V11 rooms
create_event_content.remove("creator");
},
_ => {
warn!("Unexpected or unsupported room version {}", body.new_version);
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Unexpected or unsupported room version found",
));
// "creator" key no longer exists in V11+ rooms
create_event_content.remove("creator");
},
}
}