diff --git a/src/ruminuwuity/invite_permission_config.rs b/src/ruminuwuity/invite_permission_config.rs index 80743bd8d..6d456f137 100644 --- a/src/ruminuwuity/invite_permission_config.rs +++ b/src/ruminuwuity/invite_permission_config.rs @@ -17,8 +17,8 @@ /// MSC4283: https://github.com/matrix-org/matrix-spec-proposals/pull/4283 #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum FilterLevel { + Default, Allow, - ExplicitAllow, Ignore, Block, } @@ -123,9 +123,9 @@ pub fn user_filter_level(&self, user: &UserId) -> FilterLevel { if self.are_all_blocked() { FilterLevel::Block } else if !self.enabled { - FilterLevel::Allow + FilterLevel::Default } else if Self::matches(&self.allowed_users, user.as_str()) { - FilterLevel::ExplicitAllow + FilterLevel::Allow } else if Self::matches(&self.ignored_users, user.as_str()) { FilterLevel::Ignore } else if Self::matches(&self.blocked_users, user.as_str()) { @@ -141,17 +141,17 @@ pub fn server_filter_level(&self, server: &ServerName) -> FilterLevel { if self.are_all_blocked() { FilterLevel::Block } else if !self.enabled { - FilterLevel::Allow + FilterLevel::Default } else { let server = server.host(); if Self::matches(&self.allowed_servers, server) { - FilterLevel::ExplicitAllow + FilterLevel::Allow } else if Self::matches(&self.ignored_servers, server) { FilterLevel::Ignore } else if Self::matches(&self.blocked_servers, server) { FilterLevel::Block } else { - FilterLevel::Allow + FilterLevel::Default } } } @@ -199,13 +199,13 @@ fn default_values() { event .content .user_filter_level(user_id("@alice:example.com")), - FilterLevel::Allow + FilterLevel::Default ); assert_eq!( event .content .server_filter_level(server_name("example.com")), - FilterLevel::Allow + FilterLevel::Default ); } @@ -246,8 +246,8 @@ fn exclude_badguys() { ..Default::default() }; - assert_eq!(event.user_filter_level(user_id("@alice:goodguys.org")), FilterLevel::Allow); - assert_eq!(event.user_filter_level(user_id("@bob:bar.com")), FilterLevel::Allow); + assert_eq!(event.user_filter_level(user_id("@alice:goodguys.org")), FilterLevel::Default); + assert_eq!(event.user_filter_level(user_id("@bob:bar.com")), FilterLevel::Default); assert_eq!( event.user_filter_level(user_id("@kevin:badguys.org:8080")), FilterLevel::Block @@ -279,9 +279,9 @@ fn no_badguys_except_for_alice() { ..Default::default() }; - assert_eq!(event.user_filter_level(user_id("@alice:goodguys.org")), FilterLevel::Allow); + assert_eq!(event.user_filter_level(user_id("@alice:goodguys.org")), FilterLevel::Default); assert_eq!(event.user_filter_level(user_id("@alice:badguys.org")), FilterLevel::Allow); - assert_eq!(event.user_filter_level(user_id("@bob:bar.com")), FilterLevel::Allow); + assert_eq!(event.user_filter_level(user_id("@bob:bar.com")), FilterLevel::Default); assert_eq!(event.user_filter_level(user_id("@kevin:badguys.org")), FilterLevel::Block); } diff --git a/src/service/users/account.rs b/src/service/users/account.rs index dd73f5255..39cadab32 100644 --- a/src/service/users/account.rs +++ b/src/service/users/account.rs @@ -105,11 +105,11 @@ pub async fn invite_filter_level( ) // TODO: MSC4155 probably needs upstreaming to ruma at some point ); if stable.is_err() && unstable.is_err() { - return FilterLevel::Allow; + return FilterLevel::Default; } let content = stable.unwrap_or_else(|_| unstable.unwrap()).content; let verdict = content.user_filter_level(sender_user); - if verdict != FilterLevel::Allow { + if verdict != FilterLevel::Default { return verdict; } // Apply other layers of invite blocking first, so that user/server @@ -122,7 +122,7 @@ pub async fn invite_filter_level( return FilterLevel::Block; } - FilterLevel::Allow + FilterLevel::Default } }