Automatic moderation (#875)

* Automatic moderation

* finish

* modpack fixes

* fix unknown license msg

* fix moderation issues

src/auth/checks.rs

@@ -6,7 +6,6 @@ use crate::database::redis::RedisPool;
 use crate::database::{models, Project, Version};
 use crate::models::users::User;
 use crate::routes::ApiError;
-use actix_web::web;
 use itertools::Itertools;
 use sqlx::PgPool;
 
@@ -32,7 +31,7 @@ where
 pub async fn is_visible_project(
     project_data: &Project,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     hide_unlisted: bool,
 ) -> Result<bool, ApiError> {
     filter_visible_project_ids(vec![project_data], user_option, pool, hide_unlisted)
@@ -43,7 +42,7 @@ pub async fn is_visible_project(
 pub async fn is_team_member_project(
     project_data: &Project,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
 ) -> Result<bool, ApiError> {
     filter_enlisted_projects_ids(vec![project_data], user_option, pool)
         .await
@@ -53,7 +52,7 @@ pub async fn is_team_member_project(
 pub async fn filter_visible_projects(
     mut projects: Vec<QueryProject>,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     hide_unlisted: bool,
 ) -> Result<Vec<crate::models::projects::Project>, ApiError> {
     let filtered_project_ids = filter_visible_project_ids(
@@ -76,7 +75,7 @@ pub async fn filter_visible_projects(
 pub async fn filter_visible_project_ids(
     projects: Vec<&Project>,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     hide_unlisted: bool,
 ) -> Result<Vec<crate::database::models::ProjectId>, ApiError> {
     let mut return_projects = Vec::new();
@@ -114,7 +113,7 @@ pub async fn filter_visible_project_ids(
 pub async fn filter_enlisted_projects_ids(
     projects: Vec<&Project>,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
 ) -> Result<Vec<crate::database::models::ProjectId>, ApiError> {
     let mut return_projects = vec![];
 
@@ -142,7 +141,7 @@ pub async fn filter_enlisted_projects_ids(
                 .collect::<Vec<_>>(),
             user_id as database::models::ids::UserId,
         )
-        .fetch_many(&***pool)
+        .fetch_many(pool)
         .try_for_each(|e| {
             if let Some(row) = e.right() {
                 for x in projects.iter() {
@@ -163,7 +162,7 @@ pub async fn filter_enlisted_projects_ids(
 pub async fn is_visible_version(
     version_data: &Version,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     redis: &RedisPool,
 ) -> Result<bool, ApiError> {
     filter_visible_version_ids(vec![version_data], user_option, pool, redis)
@@ -174,7 +173,7 @@ pub async fn is_visible_version(
 pub async fn is_team_member_version(
     version_data: &Version,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     redis: &RedisPool,
 ) -> Result<bool, ApiError> {
     filter_enlisted_version_ids(vec![version_data], user_option, pool, redis)
@@ -185,7 +184,7 @@ pub async fn is_team_member_version(
 pub async fn filter_visible_versions(
     mut versions: Vec<QueryVersion>,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     redis: &RedisPool,
 ) -> Result<Vec<crate::models::projects::Version>, ApiError> {
     let filtered_version_ids = filter_visible_version_ids(
@@ -220,7 +219,7 @@ impl ValidateAuthorized for models::OAuthClient {
 pub async fn filter_visible_version_ids(
     versions: Vec<&Version>,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     redis: &RedisPool,
 ) -> Result<Vec<crate::database::models::VersionId>, ApiError> {
     let mut return_versions = Vec::new();
@@ -233,7 +232,7 @@ pub async fn filter_visible_version_ids(
 
     // Get visible projects- ones we are allowed to see public versions for.
     let visible_project_ids = filter_visible_project_ids(
-        Project::get_many_ids(&project_ids, &***pool, redis)
+        Project::get_many_ids(&project_ids, pool, redis)
             .await?
             .iter()
             .map(|x| &x.inner)
@@ -273,7 +272,7 @@ pub async fn filter_visible_version_ids(
 pub async fn filter_enlisted_version_ids(
     versions: Vec<&Version>,
     user_option: &Option<User>,
-    pool: &web::Data<PgPool>,
+    pool: &PgPool,
     redis: &RedisPool,
 ) -> Result<Vec<crate::database::models::VersionId>, ApiError> {
     let mut return_versions = Vec::new();
@@ -283,7 +282,7 @@ pub async fn filter_enlisted_version_ids(
 
     // Get enlisted projects- ones we are allowed to see hidden versions for.
     let authorized_project_ids = filter_enlisted_projects_ids(
-        Project::get_many_ids(&project_ids, &***pool, redis)
+        Project::get_many_ids(&project_ids, pool, redis)
             .await?
             .iter()
             .map(|x| &x.inner)

src/auth/mod.rs

@@ -72,7 +72,7 @@ impl actix_web::ResponseError for AuthenticationError {
     fn error_response(&self) -> HttpResponse {
         HttpResponse::build(self.status_code()).json(ApiError {
             error: self.error_name(),
-            description: &self.to_string(),
+            description: self.to_string(),
         })
     }
 }

src/auth/oauth/errors.rs

@@ -100,7 +100,7 @@ impl actix_web::ResponseError for OAuthError {
         } else {
             HttpResponse::build(self.status_code()).json(ApiError {
                 error: &self.error_type.error_name(),
-                description: &self.error_type.to_string(),
+                description: self.error_type.to_string(),
             })
         }
     }