Clean up imports for database.

src/database/entities/user.rs

@@ -1,5 +1,4 @@
-use crate::database::get_collection;
+use crate::database::*;
-use crate::database::guards::reference::Ref;
 use mongodb::bson::{doc, from_bson, Bson};
 use rauth::auth::Session;
 use rocket::http::Status;

src/database/guards/mod.rs

@@ -1,2 +1,5 @@
 pub mod reference;
 pub mod user;
+
+pub use reference::Ref;
+// pub use user::*;

src/database/guards/reference.rs

@@ -1,6 +1,6 @@
-use crate::database::entities::*;
+use crate::database::*;
-use crate::database::get_collection;
 use crate::util::result::{Error, Result};
+
 use mongodb::bson::{doc, from_bson, Bson};
 use rocket::http::RawStr;
 use rocket::request::FromParam;

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::*;

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;

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")]

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;

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;

src/notifications/websocket.rs

@@ -1,5 +1,4 @@
-use crate::database::get_collection;
+use crate::database::*;
-use crate::database::guards::reference::Ref;
 use crate::util::variables::WS_HOST;
 
 use super::subscriptions;

src/routes/onboard/complete.rs

@@ -1,6 +1,6 @@
-use crate::database::entities::User;
+use crate::database::*;
-use crate::database::get_collection;
 use crate::util::result::{Error, Result};
+
 use mongodb::bson::doc;
 use mongodb::options::{Collation, FindOneOptions};
 use rauth::auth::Session;

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;
 

src/routes/users/add_friend.rs

@@ -1,16 +1,7 @@
-use crate::{
+use crate::database::*;
-    database::{
+use crate::notifications::{events::ClientboundNotification, hive};
-        entities::{RelationshipStatus, User},
+use crate::util::result::{Error, Result};
-        get_collection,
+
-        guards::reference::Ref,
-        permissions::get_relationship,
-    },
-    util::result::Error,
-};
-use crate::{
-    notifications::{events::ClientboundNotification, hive},
-    util::result::Result,
-};
 use futures::try_join;
 use mongodb::bson::doc;
 use mongodb::options::{Collation, FindOneOptions};

src/routes/users/block_user.rs

@@ -1,11 +1,7 @@
-use crate::{
+use crate::database::*;
-    database::entities::RelationshipStatus, database::entities::User, database::get_collection,
+use crate::notifications::{events::ClientboundNotification, hive};
-    database::guards::reference::Ref, database::permissions::get_relationship, util::result::Error,
+use crate::util::result::{Error, Result};
-};
+
-use crate::{
-    notifications::{events::ClientboundNotification, hive},
-    util::result::Result,
-};
 use futures::try_join;
 use mongodb::bson::doc;
 use rocket_contrib::json::JsonValue;

src/routes/users/fetch_dms.rs

@@ -1,6 +1,6 @@
-use crate::database::entities::User;
+use crate::database::*;
-use crate::database::get_collection;
 use crate::util::result::{Error, Result};
+
 use futures::StreamExt;
 use mongodb::bson::doc;
 use rocket_contrib::json::JsonValue;

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")]

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")]

src/routes/users/fetch_user.rs

@@ -1,6 +1,6 @@
-use crate::database::entities::{RelationshipStatus, User};
+use crate::database::*;
-use crate::database::guards::reference::Ref;
 use crate::util::result::{Error, Result};
+
 use rocket_contrib::json::JsonValue;
 
 #[get("/<target>")]

src/routes/users/open_dm.rs

@@ -1,7 +1,6 @@
-use crate::database::entities::{Channel, User};
+use crate::database::*;
-use crate::database::get_collection;
-use crate::database::guards::reference::Ref;
 use crate::util::result::{Error, Result};
+
 use mongodb::bson::doc;
 use rocket_contrib::json::JsonValue;
 use ulid::Ulid;

src/routes/users/remove_friend.rs

@@ -1,11 +1,7 @@
-use crate::{
+use crate::database::*;
-    database::entities::RelationshipStatus, database::entities::User, database::get_collection,
+use crate::notifications::{events::ClientboundNotification, hive};
-    database::guards::reference::Ref, database::permissions::get_relationship, util::result::Error,
+use crate::util::result::{Error, Result};
-};
+
-use crate::{
-    notifications::{events::ClientboundNotification, hive},
-    util::result::Result,
-};
 use futures::try_join;
 use hive_pubsub::PubSub;
 use mongodb::bson::doc;

src/routes/users/unblock_user.rs

@@ -1,11 +1,7 @@
-use crate::{
+use crate::database::*;
-    database::entities::RelationshipStatus, database::entities::User, database::get_collection,
+use crate::notifications::{events::ClientboundNotification, hive};
-    database::guards::reference::Ref, database::permissions::get_relationship, util::result::Error,
+use crate::util::result::{Error, Result};
-};
+
-use crate::{
-    notifications::{events::ClientboundNotification, hive},
-    util::result::Result,
-};
 use futures::try_join;
 use hive_pubsub::PubSub;
 use mongodb::bson::doc;