dolysis
/
conduwuit
mirror of https://github.com/girlbossceo/conduwuit.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup room.rs; replace unwraps with map_err

This commit is contained in:
Nyaaori 2021-11-09 16:12:44 +00:00
parent d5d25fb064
commit c4bce1d0c7
No known key found for this signature in database
GPG Key ID: 50C66D0980648414
1 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/client_server/room.rs
View File

@ -22,7 +22,7 @@ use ruma::{
},
EventType,
},
serde::{CanonicalJsonObject, JsonObject, Raw},
serde::{CanonicalJsonObject, JsonObject},
RoomAliasId, RoomId, RoomVersionId,
};
use serde_json::{json, value::to_raw_value};
@ -128,42 +128,48 @@ pub async fn create_room_route(
.expect("Invalid creation content");
content.insert(
"creator".into(),
json!(sender_user.clone()).try_into().unwrap(),
json!(&sender_user).try_into().map_err(|_| {
Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
})?,
);
content.insert(
"room_version".into(),
json!(room_version.as_str()).try_into().unwrap(),
json!(room_version.as_str()).try_into().map_err(|_| {
Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
})?,
);
content
}
None => {
let mut content = Raw::<CanonicalJsonObject>::from_json(
to_raw_value(&RoomCreateEventContent::new(sender_user.clone())).unwrap(),
let mut content = serde_json::from_str::<CanonicalJsonObject>(
to_raw_value(&RoomCreateEventContent::new(sender_user.clone()))
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?
.get(),
)
.deserialize_as::<CanonicalJsonObject>()
.unwrap();
content.insert(
"room_version".into(),
json!(room_version.as_str()).try_into().unwrap(),
json!(room_version.as_str()).try_into().map_err(|_| {
Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
})?,
);
content
}
};
// Validate creation content
match Raw::<CanonicalJsonObject>::from_json(
to_raw_value(&content).expect("Invalid creation content"),
)
.deserialize_as::<RoomCreateEventContent>()
{
Ok(_t) => {}
Err(_e) => {
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Invalid creation content",
))
}
};
let de_result = serde_json::from_str::<CanonicalJsonObject>(
to_raw_value(&content)
.expect("Invalid creation content")
.get(),
);
if let Err(_) = de_result {
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Invalid creation content",
));
}
// 1. The room create event
db.rooms.build_and_append_pdu(
@ -575,28 +581,36 @@ pub async fn upgrade_room_route(
// Send a m.room.create event containing a predecessor field and the applicable room_version
create_event_content.insert(
"creator".into(),
json!(sender_user.clone()).try_into().unwrap(),
json!(&sender_user)
.try_into()
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Error forming creation event"))?,
);
create_event_content.insert(
"room_version".into(),
json!(body.new_version.clone()).try_into().unwrap(),
json!(&body.new_version)
.try_into()
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Error forming creation event"))?,
);
create_event_content.insert(
"predecessor".into(),
json!(predecessor)
.try_into()
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Error forming creation event"))?,
);
create_event_content.insert("predecessor".into(), json!(predecessor).try_into().unwrap());
// Validate creation event content
match Raw::<CanonicalJsonObject>::from_json(
to_raw_value(&create_event_content).expect("Error forming creation event"),
)
.deserialize_as::<RoomCreateEventContent>()
{
Ok(_t) => {}
Err(_e) => {
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Error forming creation event",
))
}
};
let de_result = serde_json::from_str::<CanonicalJsonObject>(
to_raw_value(&create_event_content)
.expect("Error forming creation event")
.get(),
);
if let Err(_) = de_result {
return Err(Error::BadRequest(
ErrorKind::BadJson,
"Error forming creation event",
));
}
db.rooms.build_and_append_pdu(
PduBuilder {