diff --git a/src/database/entities/user.rs b/src/database/entities/user.rs index f36f7b67147947bce7d182b56e943df87ebf834b..ef0d57245d746c2551964a56c0c755b48a2ba6d5 100644 --- a/src/database/entities/user.rs +++ b/src/database/entities/user.rs @@ -1,5 +1,4 @@ -use crate::database::get_collection; -use crate::database::guards::reference::Ref; +use crate::database::*; use mongodb::bson::{doc, from_bson, Bson}; use rauth::auth::Session; use rocket::http::Status; diff --git a/src/database/guards/mod.rs b/src/database/guards/mod.rs index 92488ee3db9a7bb45661fde22574bef6b8d21604..be4a89d38f04431166e0fbbaa57b57fd5ab1fca6 100644 --- a/src/database/guards/mod.rs +++ b/src/database/guards/mod.rs @@ -1,2 +1,5 @@ pub mod reference; pub mod user; + +pub use reference::Ref; +// pub use user::*; diff --git a/src/database/guards/reference.rs b/src/database/guards/reference.rs index 65046381b7b54760ef37d8d3a83815e0ffed342b..125f6899a2acce065da4943e9cdbc7e4a3245644 100644 --- a/src/database/guards/reference.rs +++ b/src/database/guards/reference.rs @@ -1,6 +1,6 @@ -use crate::database::entities::*; -use crate::database::get_collection; +use crate::database::*; use crate::util::result::{Error, Result}; + use mongodb::bson::{doc, from_bson, Bson}; use rocket::http::RawStr; use rocket::request::FromParam; diff --git a/src/database/mod.rs b/src/database/mod.rs index 9feb7c843de030cc0282051da2a1bf77f519fd9d..b3368fb5587792a14f99381d7ff4a50f9ea62ad1 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -30,3 +30,7 @@ pub mod entities; pub mod guards; pub mod migrations; pub mod permissions; + +pub use entities::*; +pub use guards::*; +pub use permissions::*; diff --git a/src/database/permissions/mod.rs b/src/database/permissions/mod.rs index 01e83862dd26091fe602937a50b8cdeb288000a3..2de8a8e2b3e8aafa4c5cc28545385ca69426d400 100644 --- a/src/database/permissions/mod.rs +++ b/src/database/permissions/mod.rs @@ -1,4 +1,4 @@ -use crate::database::entities::User; +use crate::database::*; use num_enum::TryFromPrimitive; use std::ops; @@ -31,9 +31,6 @@ pub async fn temp_calc_perm(_user: &User, _target: &User) -> UserPermissions<[u3 UserPermissions([UserPermission::Access + UserPermission::SendMessage + UserPermission::Invite]) } -use crate::database::entities::RelationshipStatus; -use crate::database::guards::reference::Ref; - pub fn get_relationship(a: &User, b: &Ref) -> RelationshipStatus { if a.id == b.id { return RelationshipStatus::Friend; diff --git a/src/notifications/events.rs b/src/notifications/events.rs index 8a68ca6067a73587dcaab848163d3ac771a7706c..6b4ad6615dad1f7da6e845b4c88c735d925c6bd7 100644 --- a/src/notifications/events.rs +++ b/src/notifications/events.rs @@ -2,9 +2,8 @@ use rauth::auth::Session; use serde::{Deserialize, Serialize}; use snafu::Snafu; -use crate::database::entities::{RelationshipStatus, User}; - use super::hive::get_hive; +use crate::database::*; #[derive(Serialize, Deserialize, Debug, Snafu)] #[serde(tag = "error")] diff --git a/src/notifications/hive.rs b/src/notifications/hive.rs index 96d56ba2f0f3cd7c99bd14562d36be2e81c6f62b..e3025e5eb3c3eddf081aae863862ff97c3e00d5d 100644 --- a/src/notifications/hive.rs +++ b/src/notifications/hive.rs @@ -1,5 +1,5 @@ use super::{events::ClientboundNotification, websocket}; -use crate::database::get_collection; +use crate::database::*; use futures::FutureExt; use hive_pubsub::backend::mongo::MongodbPubSub; diff --git a/src/notifications/subscriptions.rs b/src/notifications/subscriptions.rs index 2148208cf41af12e872666ed1c1e0e12fa31312f..b099e48a1cc24503443b94edfaa64f73fd4d5eb9 100644 --- a/src/notifications/subscriptions.rs +++ b/src/notifications/subscriptions.rs @@ -1,4 +1,4 @@ -use crate::database::entities::User; +use crate::database::*; use super::hive::get_hive; use hive_pubsub::PubSub; diff --git a/src/notifications/websocket.rs b/src/notifications/websocket.rs index 8f5f4671f704371b7f202f2bb53c445a1a39c702..b4ecc2fcaed6b4e6ba00fe6bfd0fce28459453fa 100644 --- a/src/notifications/websocket.rs +++ b/src/notifications/websocket.rs @@ -1,5 +1,4 @@ -use crate::database::get_collection; -use crate::database::guards::reference::Ref; +use crate::database::*; use crate::util::variables::WS_HOST; use super::subscriptions; diff --git a/src/routes/onboard/complete.rs b/src/routes/onboard/complete.rs index ffd9e75219fbea454808afa1b422c977e4f048c0..2dfbabdd1900c93e76a878f561adf1ed85153981 100644 --- a/src/routes/onboard/complete.rs +++ b/src/routes/onboard/complete.rs @@ -1,6 +1,6 @@ -use crate::database::entities::User; -use crate::database::get_collection; +use crate::database::*; use crate::util::result::{Error, Result}; + use mongodb::bson::doc; use mongodb::options::{Collation, FindOneOptions}; use rauth::auth::Session; diff --git a/src/routes/onboard/hello.rs b/src/routes/onboard/hello.rs index 39f112ac0c5143e15ed728516b4231f07885667d..2aaabdbae650ef1f3a4ed49be293a130220c6041 100644 --- a/src/routes/onboard/hello.rs +++ b/src/routes/onboard/hello.rs @@ -1,4 +1,5 @@ -use crate::database::entities::User; +use crate::database::*; + use rauth::auth::Session; use rocket_contrib::json::JsonValue; diff --git a/src/routes/users/add_friend.rs b/src/routes/users/add_friend.rs index cddd884375346c0151ad5aa8f6583753c9c6c207..09b4d98bf50c85d1a3b2a35fb838acc60cb040fa 100644 --- a/src/routes/users/add_friend.rs +++ b/src/routes/users/add_friend.rs @@ -1,16 +1,7 @@ -use crate::{ - database::{ - entities::{RelationshipStatus, User}, - get_collection, - guards::reference::Ref, - permissions::get_relationship, - }, - util::result::Error, -}; -use crate::{ - notifications::{events::ClientboundNotification, hive}, - util::result::Result, -}; +use crate::database::*; +use crate::notifications::{events::ClientboundNotification, hive}; +use crate::util::result::{Error, Result}; + use futures::try_join; use mongodb::bson::doc; use mongodb::options::{Collation, FindOneOptions}; diff --git a/src/routes/users/block_user.rs b/src/routes/users/block_user.rs index 99d8e1740805cbdc081d88dc63fbaf2951d17cc4..b12fe048be7d442ef4e37fef1a21b5f5462959ea 100644 --- a/src/routes/users/block_user.rs +++ b/src/routes/users/block_user.rs @@ -1,11 +1,7 @@ -use crate::{ - database::entities::RelationshipStatus, database::entities::User, database::get_collection, - database::guards::reference::Ref, database::permissions::get_relationship, util::result::Error, -}; -use crate::{ - notifications::{events::ClientboundNotification, hive}, - util::result::Result, -}; +use crate::database::*; +use crate::notifications::{events::ClientboundNotification, hive}; +use crate::util::result::{Error, Result}; + use futures::try_join; use mongodb::bson::doc; use rocket_contrib::json::JsonValue; diff --git a/src/routes/users/fetch_dms.rs b/src/routes/users/fetch_dms.rs index bd30d3231250ca34505d731295b161d1ca9d2a4c..1ddc803749ab7228633a61970c253c4dbdca97e3 100644 --- a/src/routes/users/fetch_dms.rs +++ b/src/routes/users/fetch_dms.rs @@ -1,6 +1,6 @@ -use crate::database::entities::User; -use crate::database::get_collection; +use crate::database::*; use crate::util::result::{Error, Result}; + use futures::StreamExt; use mongodb::bson::doc; use rocket_contrib::json::JsonValue; diff --git a/src/routes/users/fetch_relationship.rs b/src/routes/users/fetch_relationship.rs index bd3c0cbf16b000a518ffcd32477ff702175f75ae..b4ebd164d421524553875bc9b73c76238701387c 100644 --- a/src/routes/users/fetch_relationship.rs +++ b/src/routes/users/fetch_relationship.rs @@ -1,5 +1,6 @@ -use crate::database::{entities::User, guards::reference::Ref, permissions::get_relationship}; +use crate::database::*; use crate::util::result::Result; + use rocket_contrib::json::JsonValue; #[get("/<target>/relationship")] diff --git a/src/routes/users/fetch_relationships.rs b/src/routes/users/fetch_relationships.rs index 7df7e7c4416844801419f297daf081163ab71634..bff43f0f9cb987ef6963a2461880ed3120514308 100644 --- a/src/routes/users/fetch_relationships.rs +++ b/src/routes/users/fetch_relationships.rs @@ -1,5 +1,6 @@ -use crate::database::entities::User; +use crate::database::*; use crate::util::result::Result; + use rocket_contrib::json::JsonValue; #[get("/relationships")] diff --git a/src/routes/users/fetch_user.rs b/src/routes/users/fetch_user.rs index 5979ed9580c0deaf75c2ebeafae9a07cb53cf11a..9f26713d29edf072d8b0658d1fd2832b66b61575 100644 --- a/src/routes/users/fetch_user.rs +++ b/src/routes/users/fetch_user.rs @@ -1,6 +1,6 @@ -use crate::database::entities::{RelationshipStatus, User}; -use crate::database::guards::reference::Ref; +use crate::database::*; use crate::util::result::{Error, Result}; + use rocket_contrib::json::JsonValue; #[get("/<target>")] diff --git a/src/routes/users/open_dm.rs b/src/routes/users/open_dm.rs index 1136e4424ad2644ce17d8034882ba94490810863..5a4c441cb610dcf99a78c015690f10964e197940 100644 --- a/src/routes/users/open_dm.rs +++ b/src/routes/users/open_dm.rs @@ -1,7 +1,6 @@ -use crate::database::entities::{Channel, User}; -use crate::database::get_collection; -use crate::database::guards::reference::Ref; +use crate::database::*; use crate::util::result::{Error, Result}; + use mongodb::bson::doc; use rocket_contrib::json::JsonValue; use ulid::Ulid; diff --git a/src/routes/users/remove_friend.rs b/src/routes/users/remove_friend.rs index 2c108f78b1c7f6bd6ed4ab103323d6ad62f7c63c..8c14968a0cd3017ca94bcee30ca526d62519d07d 100644 --- a/src/routes/users/remove_friend.rs +++ b/src/routes/users/remove_friend.rs @@ -1,11 +1,7 @@ -use crate::{ - database::entities::RelationshipStatus, database::entities::User, database::get_collection, - database::guards::reference::Ref, database::permissions::get_relationship, util::result::Error, -}; -use crate::{ - notifications::{events::ClientboundNotification, hive}, - util::result::Result, -}; +use crate::database::*; +use crate::notifications::{events::ClientboundNotification, hive}; +use crate::util::result::{Error, Result}; + use futures::try_join; use hive_pubsub::PubSub; use mongodb::bson::doc; diff --git a/src/routes/users/unblock_user.rs b/src/routes/users/unblock_user.rs index 7fc7ddf17341b8108aa8f301eeb4a8ebc34f5fdf..583ee2c6c340d3d358cb73d8047b2c37558d78a7 100644 --- a/src/routes/users/unblock_user.rs +++ b/src/routes/users/unblock_user.rs @@ -1,11 +1,7 @@ -use crate::{ - database::entities::RelationshipStatus, database::entities::User, database::get_collection, - database::guards::reference::Ref, database::permissions::get_relationship, util::result::Error, -}; -use crate::{ - notifications::{events::ClientboundNotification, hive}, - util::result::Result, -}; +use crate::database::*; +use crate::notifications::{events::ClientboundNotification, hive}; +use crate::util::result::{Error, Result}; + use futures::try_join; use hive_pubsub::PubSub; use mongodb::bson::doc;