chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events: Fix space state events optional booleans ser/de

Browse Source
This commit is contained in:
Kévin Commaille 2022-12-21 17:17:02 +01:00 committed by Kévin Commaille
parent 2a37e4d109
commit a0cc916742
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/ruma-common/src/events/space/child.rs
View File

@ -40,8 +40,8 @@ pub struct SpaceChildEventContent {
/// example by showing them eagerly in the room list. A child which is missing the `suggested` /// example by showing them eagerly in the room list. A child which is missing the `suggested`
/// property is treated identically to a child with `"suggested": false`. A suggested child may /// property is treated identically to a child with `"suggested": false`. A suggested child may
/// be a room or a subspace. /// be a room or a subspace.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "ruma_common::serde::is_default")]
pub suggested: Option<bool>, pub suggested: bool,
} }
impl SpaceChildEventContent { impl SpaceChildEventContent {
@ -82,13 +82,12 @@ mod tests {
let content = SpaceChildEventContent { let content = SpaceChildEventContent {
via: Some(vec![server_name!("example.com").to_owned()]), via: Some(vec![server_name!("example.com").to_owned()]),
order: Some("uwu".to_owned()), order: Some("uwu".to_owned()),
suggested: Some(false), suggested: false,
}; };
let json = json!({ let json = json!({
"via": ["example.com"], "via": ["example.com"],
"order": "uwu", "order": "uwu",
"suggested": false,
}); });
assert_eq!(to_json_value(&content).unwrap(), json); assert_eq!(to_json_value(&content).unwrap(), json);
@ -96,29 +95,13 @@ mod tests {
#[test] #[test]
fn space_child_empty_serialization() { fn space_child_empty_serialization() {
let content = SpaceChildEventContent { via: None, order: None, suggested: None }; let content = SpaceChildEventContent { via: None, order: None, suggested: false };
let json = json!({}); let json = json!({});
assert_eq!(to_json_value(&content).unwrap(), json); assert_eq!(to_json_value(&content).unwrap(), json);
} }
#[test]
fn hierarchy_space_child_serialization() {
let content = SpaceChildEventContent {
via: Some(vec![server_name!("example.com").to_owned()]),
order: Some("uwu".to_owned()),
suggested: None,
};
let json = json!({
"via": ["example.com"],
"order": "uwu",
});
assert_eq!(to_json_value(&content).unwrap(), json);
}
#[test] #[test]
fn hierarchy_space_child_deserialization() { fn hierarchy_space_child_deserialization() {
let json = json!({ let json = json!({
@ -141,6 +124,6 @@ mod tests {
assert_eq!(via.len(), 1); assert_eq!(via.len(), 1);
assert_eq!(via[0], "example.org"); assert_eq!(via[0], "example.org");
assert_eq!(ev.content.order, None); assert_eq!(ev.content.order, None);
assert_eq!(ev.content.suggested, None); assert!(!ev.content.suggested);
} }
} }

7
crates/ruma-common/src/events/space/parent.rs
View File

@ -29,6 +29,7 @@ pub struct SpaceParentEventContent {
/// together. In practice, well behaved rooms should only have one `canonical` parent, but /// together. In practice, well behaved rooms should only have one `canonical` parent, but
/// given this is not enforced: if multiple are present the client should select the one with /// given this is not enforced: if multiple are present the client should select the one with
/// the lowest room ID, as determined via a lexicographic ordering of the Unicode code-points. /// the lowest room ID, as determined via a lexicographic ordering of the Unicode code-points.
#[serde(default, skip_serializing_if = "ruma_common::serde::is_default")]
pub canonical: bool, pub canonical: bool,
} }
@ -63,11 +64,9 @@ mod tests {
#[test] #[test]
fn space_parent_empty_serialization() { fn space_parent_empty_serialization() {
let content = SpaceParentEventContent { via: None, canonical: true }; let content = SpaceParentEventContent { via: None, canonical: false };
let json = json!({ let json = json!({});
"canonical": true,
});
assert_eq!(to_json_value(&content).unwrap(), json); assert_eq!(to_json_value(&content).unwrap(), json);
} }