Clean up imports for database.

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;

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

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;