backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor server_name check

Browse source
This commit is contained in:
Charles Hall 2024-09-27 17:31:18 -07:00
parent 12f2f89f81
commit 43018e5793
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/service/globals.rs
View file

@ -317,21 +317,20 @@ impl Service {
) -> Result<(), crate::error::ServerNameChanged> { ) -> Result<(), crate::error::ServerNameChanged> {
use crate::error::ServerNameChanged as Error; use crate::error::ServerNameChanged as Error;
if services() let non_zero_users = services()
.users .users
.count() .count()
.map(|x| x > 0) .map(|x| x > 0)
.map_err(Error::NonZeroUsers)? .map_err(Error::NonZeroUsers)?;
{
let admin_bot = self.admin_bot_user_id.as_ref(); let admin_bot_exists = services()
if !services()
.users .users
.exists(admin_bot) .exists(&self.admin_bot_user_id)
.map_err(Error::AdminBotExists)? .map_err(Error::AdminBotExists)?;
{
if non_zero_users && !admin_bot_exists {
return Err(Error::Renamed); return Err(Error::Renamed);
} }
}
Ok(()) Ok(())
} }