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

state-res: Move knocking logic out of unstable-pre-spec

Browse Source
This commit is contained in:
Jonas Platte 2022-02-01 21:08:19 +01:00
parent 1a4e464422
commit 3ed7c8a643
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/ruma-state-res/src/event_auth.rs
View File

@ -631,7 +631,6 @@ fn valid_membership_change(
allow allow
} }
} }
#[cfg(feature = "unstable-pre-spec")]
MembershipState::Knock if room_version.allow_knocking => { MembershipState::Knock if room_version.allow_knocking => {
// 1. If the `join_rule` is anything other than `knock`, reject. // 1. If the `join_rule` is anything other than `knock`, reject.
if join_rules != JoinRule::Knock { if join_rules != JoinRule::Knock {
@ -949,20 +948,20 @@ mod tests {
use crate::{ use crate::{
event_auth::valid_membership_change, event_auth::valid_membership_change,
test_utils::{ test_utils::{
alice, charlie, member_content_ban, to_pdu_event, StateEvent, INITIAL_EVENTS, alice, charlie, ella, event_id, member_content_ban, to_pdu_event, StateEvent,
INITIAL_EVENTS,
}, },
Event, RoomVersion, StateMap, Event, RoomVersion, StateMap,
}; };
use ruma_events::room::{
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent},
};
use serde_json::value::to_raw_value as to_raw_json_value;
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
use { use {
crate::test_utils::{bob, ella, event_id, room_id}, crate::test_utils::{bob, room_id},
ruma_events::room::{ ruma_events::room::join_rules::{AllowRule, Restricted, RoomMembership},
join_rules::{
AllowRule, JoinRule, Restricted, RoomJoinRulesEventContent, RoomMembership,
},
member::{MembershipState, RoomMemberEventContent},
},
serde_json::value::to_raw_value as to_raw_json_value,
}; };
use ruma_events::EventType; use ruma_events::EventType;
@ -1012,7 +1011,7 @@ mod tests {
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
None, None,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
None None,
) )
.unwrap()); .unwrap());
} }
@ -1062,7 +1061,7 @@ mod tests {
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
None, None,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
None None,
) )
.unwrap()); .unwrap());
} }
@ -1160,7 +1159,6 @@ mod tests {
.unwrap()); .unwrap());
} }
#[cfg(feature = "unstable-pre-spec")]
#[test] #[test]
fn test_knock() { fn test_knock() {
let _ = let _ =
@ -1211,7 +1209,9 @@ mod tests {
None::<StateEvent>, None::<StateEvent>,
fetch_state(EventType::RoomPowerLevels, "".to_owned()), fetch_state(EventType::RoomPowerLevels, "".to_owned()),
fetch_state(EventType::RoomJoinRules, "".to_owned()), fetch_state(EventType::RoomJoinRules, "".to_owned()),
#[cfg(feature = "unstable-pre-spec")]
None, None,
#[cfg(feature = "unstable-pre-spec")]
None, None,
) )
.unwrap()); .unwrap());