From 80e3baaa1541f297440f8d76daee6140584a1e6f Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Sat, 9 Jan 2021 13:57:37 +0000
Subject: [PATCH] Clean up imports for database.
---
src/database/entities/user.rs | 3 +--
src/database/guards/mod.rs | 3 +++
src/database/guards/reference.rs | 4 ++--
src/database/mod.rs | 4 ++++
src/database/permissions/mod.rs | 5 +----
src/notifications/events.rs | 3 +--
src/notifications/hive.rs | 2 +-
src/notifications/subscriptions.rs | 2 +-
src/notifications/websocket.rs | 3 +--
src/routes/onboard/complete.rs | 4 ++--
src/routes/onboard/hello.rs | 3 ++-
src/routes/users/add_friend.rs | 17 ++++-------------
src/routes/users/block_user.rs | 12 ++++--------
src/routes/users/fetch_dms.rs | 4 ++--
src/routes/users/fetch_relationship.rs | 3 ++-
src/routes/users/fetch_relationships.rs | 3 ++-
src/routes/users/fetch_user.rs | 4 ++--
src/routes/users/open_dm.rs | 5 ++---
src/routes/users/remove_friend.rs | 12 ++++--------
src/routes/users/unblock_user.rs | 12 ++++--------
20 files changed, 45 insertions(+), 63 deletions(-)
diff --git a/src/database/entities/user.rs b/src/database/entities/user.rs
index f36f7b6..ef0d572 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 92488ee..be4a89d 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 6504638..125f689 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 9feb7c8..b3368fb 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 01e8386..2de8a8e 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 8a68ca6..6b4ad66 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 96d56ba..e3025e5 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 2148208..b099e48 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 8f5f467..b4ecc2f 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 ffd9e75..2dfbabd 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 39f112a..2aaabdb 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 cddd884..09b4d98 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 99d8e17..b12fe04 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 bd30d32..1ddc803 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 bd3c0cb..b4ebd16 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 7df7e7c..bff43f0 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 5979ed9..9f26713 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 1136e44..5a4c441 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 2c108f7..8c14968 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 7fc7ddf..583ee2c 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;
--
GitLab