abstract supported room versions apis
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -116,11 +116,7 @@ pub(crate) async fn create_room_route(
|
||||
|
||||
let room_version = match body.room_version.clone() {
|
||||
Some(room_version) => {
|
||||
if services
|
||||
.globals
|
||||
.supported_room_versions()
|
||||
.contains(&room_version)
|
||||
{
|
||||
if services.server.supported_room_version(&room_version) {
|
||||
room_version
|
||||
} else {
|
||||
return Err(Error::BadRequest(
|
||||
@@ -129,7 +125,7 @@ pub(crate) async fn create_room_route(
|
||||
));
|
||||
}
|
||||
},
|
||||
None => services.globals.default_room_version(),
|
||||
None => services.server.config.default_room_version.clone(),
|
||||
};
|
||||
|
||||
let create_content = match &body.creation_content {
|
||||
|
||||
@@ -47,11 +47,7 @@ pub(crate) async fn upgrade_room_route(
|
||||
) -> Result<upgrade_room::v3::Response> {
|
||||
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
||||
|
||||
if !services
|
||||
.globals
|
||||
.supported_room_versions()
|
||||
.contains(&body.new_version)
|
||||
{
|
||||
if !services.server.supported_room_version(&body.new_version) {
|
||||
return Err(Error::BadRequest(
|
||||
ErrorKind::UnsupportedRoomVersion,
|
||||
"This server does not support that room version.",
|
||||
|
||||
Reference in New Issue
Block a user