fix: some compile time errors

Only 174 errors left!

src/service/users/data.rs

@@ -1,34 +1,27 @@
-pub trait Data {
+use std::collections::BTreeMap;
+
+use ruma::{UserId, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, serde::Raw, encryption::{OneTimeKey, DeviceKeys, CrossSigningKey}, UInt, events::AnyToDeviceEvent, api::client::{device::Device, filter::IncomingFilterDefinition}, MxcUri};
+
+trait Data {
     /// Check if a user has an account on this homeserver.
-    pub fn exists(&self, user_id: &UserId) -> Result<bool>;
+    fn exists(&self, user_id: &UserId) -> Result<bool>;
 
     /// Check if account is deactivated
-    pub fn is_deactivated(&self, user_id: &UserId) -> Result<bool>;
-
-    /// Check if a user is an admin
-    pub fn is_admin(
-        &self,
-        user_id: &UserId,
-        rooms: &super::rooms::Rooms,
-        globals: &super::globals::Globals,
-    ) -> Result<bool>;
-
-    /// Create a new user account on this homeserver.
-    pub fn create(&self, user_id: &UserId, password: Option<&str>) -> Result<()>;
+    fn is_deactivated(&self, user_id: &UserId) -> Result<bool>;
 
     /// Returns the number of users registered on this server.
-    pub fn count(&self) -> Result<usize>;
+    fn count(&self) -> Result<usize>;
 
     /// Find out which user an access token belongs to.
-    pub fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>>;
+    fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>>;
 
     /// Returns an iterator over all users on this homeserver.
-    pub fn iter(&self) -> impl Iterator<Item = Result<Box<UserId>>> + '_;
+    fn iter(&self) -> impl Iterator<Item = Result<Box<UserId>>> + '_;
 
     /// Returns a list of local users as list of usernames.
     ///
     /// A user account is considered `local` if the length of it's password is greater then zero.
-    pub fn list_local_users(&self) -> Result<Vec<String>>;
+    fn list_local_users(&self) -> Result<Vec<String>>;
 
     /// Will only return with Some(username) if the password was not empty and the
     /// username could be successfully parsed.
@@ -37,31 +30,31 @@ pub trait Data {
     fn get_username_with_valid_password(&self, username: &[u8], password: &[u8]) -> Option<String>;
 
     /// Returns the password hash for the given user.
-    pub fn password_hash(&self, user_id: &UserId) -> Result<Option<String>>;
+    fn password_hash(&self, user_id: &UserId) -> Result<Option<String>>;
 
     /// Hash and set the user's password to the Argon2 hash
-    pub fn set_password(&self, user_id: &UserId, password: Option<&str>) -> Result<()>;
+    fn set_password(&self, user_id: &UserId, password: Option<&str>) -> Result<()>;
 
     /// Returns the displayname of a user on this homeserver.
-    pub fn displayname(&self, user_id: &UserId) -> Result<Option<String>>;
+    fn displayname(&self, user_id: &UserId) -> Result<Option<String>>;
 
     /// Sets a new displayname or removes it if displayname is None. You still need to nofify all rooms of this change.
-    pub fn set_displayname(&self, user_id: &UserId, displayname: Option<String>) -> Result<()>;
+    fn set_displayname(&self, user_id: &UserId, displayname: Option<String>) -> Result<()>;
 
     /// Get the avatar_url of a user.
-    pub fn avatar_url(&self, user_id: &UserId) -> Result<Option<Box<MxcUri>>>;
+    fn avatar_url(&self, user_id: &UserId) -> Result<Option<Box<MxcUri>>>;
 
     /// Sets a new avatar_url or removes it if avatar_url is None.
-    pub fn set_avatar_url(&self, user_id: &UserId, avatar_url: Option<Box<MxcUri>>) -> Result<()>;
+    fn set_avatar_url(&self, user_id: &UserId, avatar_url: Option<Box<MxcUri>>) -> Result<()>;
 
     /// Get the blurhash of a user.
-    pub fn blurhash(&self, user_id: &UserId) -> Result<Option<String>>;
+    fn blurhash(&self, user_id: &UserId) -> Result<Option<String>>;
 
     /// Sets a new avatar_url or removes it if avatar_url is None.
-    pub fn set_blurhash(&self, user_id: &UserId, blurhash: Option<String>) -> Result<()>;
+    fn set_blurhash(&self, user_id: &UserId, blurhash: Option<String>) -> Result<()>;
 
     /// Adds a new device to a user.
-    pub fn create_device(
+    fn create_device(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
@@ -70,129 +63,118 @@ pub trait Data {
     ) -> Result<()>;
 
     /// Removes a device from a user.
-    pub fn remove_device(&self, user_id: &UserId, device_id: &DeviceId) -> Result<()>;
+    fn remove_device(&self, user_id: &UserId, device_id: &DeviceId) -> Result<()>;
 
     /// Returns an iterator over all device ids of this user.
-    pub fn all_device_ids<'a>(
+    fn all_device_ids<'a>(
         &'a self,
         user_id: &UserId,
     ) -> impl Iterator<Item = Result<Box<DeviceId>>> + 'a;
 
     /// Replaces the access token of one device.
-    pub fn set_token(&self, user_id: &UserId, device_id: &DeviceId, token: &str) -> Result<()>;
+    fn set_token(&self, user_id: &UserId, device_id: &DeviceId, token: &str) -> Result<()>;
 
-    pub fn add_one_time_key(
+    fn add_one_time_key(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
         one_time_key_key: &DeviceKeyId,
         one_time_key_value: &Raw<OneTimeKey>,
-        globals: &super::globals::Globals,
     ) -> Result<()>;
 
-    pub fn last_one_time_keys_update(&self, user_id: &UserId) -> Result<u64>;
+    fn last_one_time_keys_update(&self, user_id: &UserId) -> Result<u64>;
 
-    pub fn take_one_time_key(
+    fn take_one_time_key(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
         key_algorithm: &DeviceKeyAlgorithm,
-        globals: &super::globals::Globals,
     ) -> Result<Option<(Box<DeviceKeyId>, Raw<OneTimeKey>)>>;
 
-    pub fn count_one_time_keys(
+    fn count_one_time_keys(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
     ) -> Result<BTreeMap<DeviceKeyAlgorithm, UInt>>;
 
-    pub fn add_device_keys(
+    fn add_device_keys(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
         device_keys: &Raw<DeviceKeys>,
-        rooms: &super::rooms::Rooms,
-        globals: &super::globals::Globals,
     ) -> Result<()>;
 
-    pub fn add_cross_signing_keys(
+    fn add_cross_signing_keys(
         &self,
         user_id: &UserId,
         master_key: &Raw<CrossSigningKey>,
         self_signing_key: &Option<Raw<CrossSigningKey>>,
         user_signing_key: &Option<Raw<CrossSigningKey>>,
-        rooms: &super::rooms::Rooms,
-        globals: &super::globals::Globals,
     ) -> Result<()>;
 
-    pub fn sign_key(
+    fn sign_key(
         &self,
         target_id: &UserId,
         key_id: &str,
         signature: (String, String),
         sender_id: &UserId,
-        rooms: &super::rooms::Rooms,
-        globals: &super::globals::Globals,
     ) -> Result<()>;
 
-    pub fn keys_changed<'a>(
+    fn keys_changed<'a>(
         &'a self,
         user_or_room_id: &str,
         from: u64,
         to: Option<u64>,
     ) -> impl Iterator<Item = Result<Box<UserId>>> + 'a;
 
-    pub fn mark_device_key_update(
+    fn mark_device_key_update(
         &self,
         user_id: &UserId,
-        rooms: &super::rooms::Rooms,
-        globals: &super::globals::Globals,
     ) -> Result<()>;
 
-    pub fn get_device_keys(
+    fn get_device_keys(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
     ) -> Result<Option<Raw<DeviceKeys>>>;
 
-    pub fn get_master_key<F: Fn(&UserId) -> bool>(
+    fn get_master_key<F: Fn(&UserId) -> bool>(
         &self,
         user_id: &UserId,
         allowed_signatures: F,
     ) -> Result<Option<Raw<CrossSigningKey>>>;
 
-    pub fn get_self_signing_key<F: Fn(&UserId) -> bool>(
+    fn get_self_signing_key<F: Fn(&UserId) -> bool>(
         &self,
         user_id: &UserId,
         allowed_signatures: F,
     ) -> Result<Option<Raw<CrossSigningKey>>>;
 
-    pub fn get_user_signing_key(&self, user_id: &UserId) -> Result<Option<Raw<CrossSigningKey>>>;
+    fn get_user_signing_key(&self, user_id: &UserId) -> Result<Option<Raw<CrossSigningKey>>>;
 
-    pub fn add_to_device_event(
+    fn add_to_device_event(
         &self,
         sender: &UserId,
         target_user_id: &UserId,
         target_device_id: &DeviceId,
         event_type: &str,
         content: serde_json::Value,
-        globals: &super::globals::Globals,
     ) -> Result<()>;
 
-    pub fn get_to_device_events(
+    fn get_to_device_events(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
     ) -> Result<Vec<Raw<AnyToDeviceEvent>>>;
 
-    pub fn remove_to_device_events(
+    fn remove_to_device_events(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
         until: u64,
     ) -> Result<()>;
 
-    pub fn update_device_metadata(
+    fn update_device_metadata(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
@@ -200,27 +182,27 @@ pub trait Data {
     ) -> Result<()>;
 
     /// Get device metadata.
-    pub fn get_device_metadata(
+    fn get_device_metadata(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
     ) -> Result<Option<Device>>;
 
-    pub fn get_devicelist_version(&self, user_id: &UserId) -> Result<Option<u64>>;
+    fn get_devicelist_version(&self, user_id: &UserId) -> Result<Option<u64>>;
 
-    pub fn all_devices_metadata<'a>(
+    fn all_devices_metadata<'a>(
         &'a self,
         user_id: &UserId,
     ) -> impl Iterator<Item = Result<Device>> + 'a;
 
     /// Creates a new sync filter. Returns the filter id.
-    pub fn create_filter(
+    fn create_filter(
         &self,
         user_id: &UserId,
         filter: &IncomingFilterDefinition,
     ) -> Result<String>;
 
-    pub fn get_filter(
+    fn get_filter(
         &self,
         user_id: &UserId,
         filter_id: &str,

src/service/users/mod.rs

@@ -1,7 +1,10 @@
 mod data;
-pub use data::Data;
+use std::{collections::BTreeMap, mem};
 
-use crate::service::*;
+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 crate::{service::*, Error};
 
 pub struct Service<D: Data> {
     db: D,
@@ -19,18 +22,24 @@ impl Service<_> {
     }
 
     /// Check if a user is an admin
-    pub fn is_admin(
+    fn is_admin(
         &self,
         user_id: &UserId,
     ) -> Result<bool> {
-        self.db.is_admin(user_id)
+        let admin_room_alias_id = RoomAliasId::parse(format!("#admins:{}", globals.server_name()))
+            .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid alias."))?;
+        let admin_room_id = rooms.id_from_alias(&admin_room_alias_id)?.unwrap();
+
+        rooms.is_joined(user_id, &admin_room_id)
     }
 
     /// Create a new user account on this homeserver.
-    pub fn create(&self, user_id: &UserId, password: Option<&str>) -> Result<()> {
-        self.db.set_password(user_id, password)
+    fn create(&self, user_id: &UserId, password: Option<&str>) -> Result<()> {
+        self.db.set_password(user_id, password)?;
+        Ok(())
     }
 
+
     /// Returns the number of users registered on this server.
     pub fn count(&self) -> Result<usize> {
         self.db.count()
@@ -136,7 +145,6 @@ impl Service<_> {
         device_id: &DeviceId,
         one_time_key_key: &DeviceKeyId,
         one_time_key_value: &Raw<OneTimeKey>,
-        globals: &super::globals::Globals,
     ) -> Result<()> {
         self.db.add_one_time_key(user_id, device_id, one_time_key_key, one_time_key_value)
     }
@@ -220,7 +228,7 @@ impl Service<_> {
         user_id: &UserId,
         allowed_signatures: F,
     ) -> Result<Option<Raw<CrossSigningKey>>> {
-        self.db.get_master_key(user_id, allow_signatures)
+        self.db.get_master_key(user_id, allowed_signatures)
     }
 
     pub fn get_self_signing_key<F: Fn(&UserId) -> bool>(
@@ -327,7 +335,7 @@ impl Service<_> {
 }
 
 /// Ensure that a user only sees signatures from themselves and the target user
-fn clean_signatures<F: Fn(&UserId) -> bool>(
+pub fn clean_signatures<F: Fn(&UserId) -> bool>(
     cross_signing_key: &mut serde_json::Value,
     user_id: &UserId,
     allowed_signatures: F,