refactor: Replace imperative style with short-circuit .any()
This commit is contained in:
parent
5c0b0cdc64
commit
297c716807
1 changed files with 7 additions and 19 deletions
|
@ -119,28 +119,16 @@ impl Service {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
Some(HistoryVisibility::Invited) => {
|
Some(HistoryVisibility::Invited) => {
|
||||||
let mut visible = false;
|
// Allow if any member on requesting server was AT LEAST invited, else deny
|
||||||
// Allow if any member on requesting server was invited or joined, else deny
|
current_server_members
|
||||||
for member in current_server_members {
|
.into_iter()
|
||||||
if self.user_was_invited(shortstatehash, &member)?
|
.any(|member| self.user_was_invited(shortstatehash, &member))
|
||||||
|| self.user_was_joined(shortstatehash, &member)?
|
|
||||||
{
|
|
||||||
visible = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
visible
|
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
// Allow if any member on requested server was joined, else deny
|
// Allow if any member on requested server was joined, else deny
|
||||||
let mut visible = false;
|
current_server_members
|
||||||
for member in current_server_members {
|
.into_iter()
|
||||||
if self.user_was_joined(shortstatehash, &member)? {
|
.any(|member| self.user_was_joined(shortstatehash, &member))
|
||||||
visible = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
visible
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue