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

events: Fix serialization of custom restricted join allow rules

Browse Source
This commit is contained in:
Jonas Platte 2022-12-15 11:19:16 +01:00
parent cdabe8e52d
commit a22033413d
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ruma-common/src/events/room/join_rules.rs
View File

@ -174,10 +174,9 @@ impl Restricted {
/// An allow rule which defines a condition that allows joining a room. /// An allow rule which defines a condition that allows joining a room.
#[derive(Clone, Debug, PartialEq, Eq, Serialize)] #[derive(Clone, Debug, PartialEq, Eq, Serialize)]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[serde(tag = "type")] #[serde(untagged)]
pub enum AllowRule { pub enum AllowRule {
/// Joining is allowed if a user is already a member of the room with the id `room_id`. /// Joining is allowed if a user is already a member of the room with the id `room_id`.
#[serde(rename = "m.room_membership")]
RoomMembership(RoomMembership), RoomMembership(RoomMembership),
#[doc(hidden)] #[doc(hidden)]
@ -194,6 +193,7 @@ impl AllowRule {
/// Allow rule which grants permission to join based on the membership of another room. /// Allow rule which grants permission to join based on the membership of another room.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[serde(tag = "type", rename = "m.room_membership")]
pub struct RoomMembership { pub struct RoomMembership {
/// The id of the room which being a member of grants permission to join another room. /// The id of the room which being a member of grants permission to join another room.
pub room_id: OwnedRoomId, pub room_id: OwnedRoomId,
@ -292,7 +292,7 @@ mod tests {
"sender": "@admin:community.rs", "sender": "@admin:community.rs",
"content": { "content": {
"join_rule": "restricted", "join_rule": "restricted",
"allow":[ "allow": [
{ "type": "m.room_membership","room_id": "!KqeUnzmXPIhHRaWMTs:mccarty.io" } { "type": "m.room_membership","room_id": "!KqeUnzmXPIhHRaWMTs:mccarty.io" }
] ]
}, },
@ -306,4 +306,12 @@ mod tests {
assert_matches!(serde_json::from_str::<OriginalSyncRoomJoinRulesEvent>(json), Ok(_)); assert_matches!(serde_json::from_str::<OriginalSyncRoomJoinRulesEvent>(json), Ok(_));
} }
#[test]
fn roundtrip_custom_allow_rule() {
let json = r#"{"type":"org.msc9000.something","foo":"bar"}"#;
let allow_rule: AllowRule = serde_json::from_str(json).unwrap();
assert_matches!(&allow_rule, AllowRule::_Custom(_));
assert_eq!(serde_json::to_string(&allow_rule).unwrap(), json);
}
} }