Fixed more compile time errors

src/service/users/data.rs

@@ -1,8 +1,8 @@
 use std::collections::BTreeMap;
-
+use crate::Result;
 use ruma::{UserId, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, serde::Raw, encryption::{OneTimeKey, DeviceKeys, CrossSigningKey}, UInt, events::AnyToDeviceEvent, api::client::{device::Device, filter::IncomingFilterDefinition}, MxcUri};
 
-trait Data {
+pub trait Data {
     /// Check if a user has an account on this homeserver.
     fn exists(&self, user_id: &UserId) -> Result<bool>;
 
@@ -16,7 +16,7 @@ trait Data {
     fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>>;
 
     /// Returns an iterator over all users on this homeserver.
-    fn iter(&self) -> impl Iterator<Item = Result<Box<UserId>>> + '_;
+    fn iter(&self) -> Box<dyn Iterator<Item = Result<Box<UserId>>>>;
 
     /// Returns a list of local users as list of usernames.
     ///
@@ -69,7 +69,7 @@ trait Data {
     fn all_device_ids<'a>(
         &'a self,
         user_id: &UserId,
-    ) -> impl Iterator<Item = Result<Box<DeviceId>>> + 'a;
+    ) -> Box<dyn Iterator<Item = Result<Box<DeviceId>>>>;
 
     /// Replaces the access token of one device.
     fn set_token(&self, user_id: &UserId, device_id: &DeviceId, token: &str) -> Result<()>;
@@ -125,7 +125,7 @@ trait Data {
         user_or_room_id: &str,
         from: u64,
         to: Option<u64>,
-    ) -> impl Iterator<Item = Result<Box<UserId>>> + 'a;
+    ) -> Box<dyn Iterator<Item = Result<Box<UserId>>>>;
 
     fn mark_device_key_update(
         &self,
@@ -193,7 +193,7 @@ trait Data {
     fn all_devices_metadata<'a>(
         &'a self,
         user_id: &UserId,
-    ) -> impl Iterator<Item = Result<Device>> + 'a;
+    ) -> Box<dyn Iterator<Item = Result<Device>>>;
 
     /// Creates a new sync filter. Returns the filter id.
     fn create_filter(

src/service/users/mod.rs

@@ -2,15 +2,15 @@ mod data;
 use std::{collections::BTreeMap, mem};
 
 pub use data::Data;
-use ruma::{UserId, MxcUri, DeviceId, DeviceKeyId, serde::Raw, encryption::{OneTimeKey, CrossSigningKey, DeviceKeys}, DeviceKeyAlgorithm, UInt, events::AnyToDeviceEvent, api::client::{device::Device, filter::IncomingFilterDefinition}};
+use ruma::{UserId, MxcUri, DeviceId, DeviceKeyId, serde::Raw, encryption::{OneTimeKey, CrossSigningKey, DeviceKeys}, DeviceKeyAlgorithm, UInt, events::AnyToDeviceEvent, api::client::{device::Device, filter::IncomingFilterDefinition, error::ErrorKind}, RoomAliasId};
 
-use crate::{service::*, Error};
+use crate::{Result, Error, services};
 
 pub struct Service<D: Data> {
     db: D,
 }
 
-impl Service<_> {
+impl<D: Data> Service<D> {
     /// Check if a user has an account on this homeserver.
     pub fn exists(&self, user_id: &UserId) -> Result<bool> {
         self.db.exists(user_id)
@@ -22,19 +22,19 @@ impl Service<_> {
     }
 
     /// Check if a user is an admin
-    fn is_admin(
+    pub fn is_admin(
         &self,
         user_id: &UserId,
     ) -> Result<bool> {
-        let admin_room_alias_id = RoomAliasId::parse(format!("#admins:{}", globals.server_name()))
+        let admin_room_alias_id = RoomAliasId::parse(format!("#admins:{}", services().globals.server_name()))
             .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid alias."))?;
-        let admin_room_id = rooms.id_from_alias(&admin_room_alias_id)?.unwrap();
+        let admin_room_id = services().rooms.alias.resolve_local_alias(&admin_room_alias_id)?.unwrap();
 
-        rooms.is_joined(user_id, &admin_room_id)
+        services().rooms.state_cache.is_joined(user_id, &admin_room_id)
     }
 
     /// Create a new user account on this homeserver.
-    fn create(&self, user_id: &UserId, password: Option<&str>) -> Result<()> {
+    pub fn create(&self, user_id: &UserId, password: Option<&str>) -> Result<()> {
         self.db.set_password(user_id, password)?;
         Ok(())
     }