From 297c71680731695c18055b1a2285ec5e844646f1 Mon Sep 17 00:00:00 2001 From: "Andriy Kushnir (Orhideous)" Date: Mon, 28 Nov 2022 01:44:05 +0200 Subject: [PATCH] refactor: Replace imperative style with short-circuit .any() --- src/service/rooms/state_accessor/mod.rs | 26 +++++++------------------ 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/service/rooms/state_accessor/mod.rs b/src/service/rooms/state_accessor/mod.rs index fd464d89..5a46d7e1 100644 --- a/src/service/rooms/state_accessor/mod.rs +++ b/src/service/rooms/state_accessor/mod.rs @@ -119,28 +119,16 @@ impl Service { true } Some(HistoryVisibility::Invited) => { - let mut visible = false; - // Allow if any member on requesting server was invited or joined, else deny - for member in current_server_members { - if self.user_was_invited(shortstatehash, &member)? - || self.user_was_joined(shortstatehash, &member)? - { - visible = true; - break; - } - } - visible + // Allow if any member on requesting server was AT LEAST invited, else deny + current_server_members + .into_iter() + .any(|member| self.user_was_invited(shortstatehash, &member)) } _ => { // Allow if any member on requested server was joined, else deny - let mut visible = false; - for member in current_server_members { - if self.user_was_joined(shortstatehash, &member)? { - visible = true; - break; - } - } - visible + current_server_members + .into_iter() + .any(|member| self.user_was_joined(shortstatehash, &member)) } };