From e06d126d4eeb7bae18d66ddcf3849d5de68f7dae Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Tue, 8 Oct 2024 16:36:26 -0700 Subject: [PATCH] add constructor for users service --- src/service.rs | 10 ++-------- src/service/users.rs | 7 +++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/service.rs b/src/service.rs index 42638b2d..5a3af3de 100644 --- a/src/service.rs +++ b/src/service.rs @@ -1,7 +1,4 @@ -use std::{ - collections::BTreeMap, - sync::{Arc, Mutex as StdMutex, OnceLock}, -}; +use std::sync::{Arc, OnceLock}; use crate::{observability::FilterReloadHandles, Config, Result}; @@ -173,10 +170,7 @@ impl Services { }, transaction_ids: db, uiaa: uiaa::Service::new(db), - users: users::Service { - db, - connections: StdMutex::new(BTreeMap::new()), - }, + users: users::Service::new(db), account_data: db, admin: admin::Service::build(), key_backups: db, diff --git a/src/service/users.rs b/src/service/users.rs index 3007f176..088fbb12 100644 --- a/src/service/users.rs +++ b/src/service/users.rs @@ -46,6 +46,13 @@ pub(crate) struct Service { } impl Service { + pub(crate) fn new(db: &'static dyn Data) -> Self { + Self { + db, + connections: Mutex::new(BTreeMap::new()), + } + } + /// Check if a user has an account on this homeserver. pub(crate) fn exists(&self, user_id: &UserId) -> Result { self.db.exists(user_id)