Final V2 Changes (#212)

* Redo dependencies, add rejection reasons, make notifications more readable

* Fix errors, add dependency route, finish PR

* Fix clippy errors

src/routes/v1/moderation.rs

@@ -1,8 +1,8 @@
-use crate::auth::check_is_moderator_from_headers;
 use crate::database;
 use crate::models::projects::{Project, ProjectStatus};
 use crate::routes::moderation::ResultCount;
 use crate::routes::ApiError;
+use crate::util::auth::check_is_moderator_from_headers;
 use actix_web::web;
 use actix_web::{get, HttpRequest, HttpResponse};
 use sqlx::PgPool;

src/routes/v1/mods.rs

@@ -1,4 +1,3 @@
-use crate::auth::get_user_from_headers;
 use crate::file_hosting::FileHost;
 use crate::models::projects::SearchRequest;
 use crate::routes::project_creation::{project_create_inner, undo_uploads, CreateError};
@@ -6,6 +5,7 @@ use crate::routes::projects::{convert_project, ProjectIds};
 use crate::routes::ApiError;
 use crate::search::indexing::queue::CreationQueue;
 use crate::search::{search_for_project, SearchConfig, SearchError};
+use crate::util::auth::get_user_from_headers;
 use crate::{database, models};
 use actix_multipart::Multipart;
 use actix_web::web;

src/routes/v1/reports.rs

@@ -1,8 +1,8 @@
-use crate::auth::{check_is_moderator_from_headers, get_user_from_headers};
 use crate::models::ids::ReportId;
 use crate::models::projects::{ProjectId, VersionId};
 use crate::models::users::UserId;
 use crate::routes::ApiError;
+use crate::util::auth::{check_is_moderator_from_headers, get_user_from_headers};
 use actix_web::web;
 use actix_web::{get, post, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};

src/routes/v1/tags.rs

@@ -1,6 +1,6 @@
-use crate::auth::check_is_admin_from_headers;
 use crate::database::models::categories::{Category, GameVersion, Loader, ProjectType};
 use crate::routes::ApiError;
+use crate::util::auth::check_is_admin_from_headers;
 use actix_web::{get, put, web};
 use actix_web::{HttpRequest, HttpResponse};
 use sqlx::PgPool;

src/routes/v1/teams.rs

@@ -1,7 +1,7 @@
-use crate::auth::get_user_from_headers;
 use crate::models::teams::{Permissions, TeamId};
 use crate::models::users::UserId;
 use crate::routes::ApiError;
+use crate::util::auth::get_user_from_headers;
 use actix_web::{get, web, HttpRequest, HttpResponse};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;

src/routes/v1/users.rs

@@ -1,8 +1,8 @@
-use crate::auth::get_user_from_headers;
 use crate::database::models::User;
 use crate::models::ids::UserId;
 use crate::models::projects::{ProjectId, ProjectStatus};
 use crate::routes::ApiError;
+use crate::util::auth::get_user_from_headers;
 use actix_web::web;
 use actix_web::{get, HttpRequest, HttpResponse};
 use sqlx::PgPool;

src/routes/v1/versions.rs

@@ -1,10 +1,10 @@
-use crate::auth::get_user_from_headers;
 use crate::file_hosting::FileHost;
 use crate::models::ids::{ProjectId, UserId, VersionId};
 use crate::models::projects::{Dependency, GameVersion, Loader, Version, VersionFile, VersionType};
 use crate::models::teams::Permissions;
 use crate::routes::versions::{convert_version, VersionIds, VersionListFilters};
 use crate::routes::ApiError;
+use crate::util::auth::get_user_from_headers;
 use crate::{database, models, Pepper};
 use actix_web::{delete, get, web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};