From 075b2df7385531a62f98cf7b9a70d9ad72c189d7 Mon Sep 17 00:00:00 2001
From: Geometrically <jai.a@tuta.io>
Date: Thu, 14 Jan 2021 12:23:39 -0700
Subject: [PATCH] Fix lint failures

---
 src/routes/users.rs            |  4 ++--
 src/routes/version_creation.rs | 38 ++++++++++++++--------------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/routes/users.rs b/src/routes/users.rs
index e477859c6..e70f14eb7 100644
--- a/src/routes/users.rs
+++ b/src/routes/users.rs
@@ -440,14 +440,14 @@ pub async fn user_delete(
     let user = get_user_from_headers(req.headers(), &**pool).await?;
     let id = info.into_inner().0;
 
-    if !user.role.is_mod() && user.id == user.id {
+    if !user.role.is_mod() && user.id != id {
         return Err(ApiError::CustomAuthenticationError(
             "You do not have permission to delete this user!".to_string(),
         ));
     }
 
     let result;
-    if removal_type.removal_type == "full".to_string() {
+    if &*removal_type.removal_type == "full" {
         result = crate::database::models::User::remove_full(id.into(), &**pool)
             .await
             .map_err(|e| ApiError::DatabaseError(e.into()))?;
diff --git a/src/routes/version_creation.rs b/src/routes/version_creation.rs
index 3f83bf126..ca53321f9 100644
--- a/src/routes/version_creation.rs
+++ b/src/routes/version_creation.rs
@@ -181,17 +181,14 @@ async fn version_create_inner(
 
             // Check that the user creating this version is a team member
             // of the mod the version is being added to.
-            let team_member = models::TeamMember::get_from_user_id_mod(
-                mod_id.into(),
-                user.id.into(),
-                &mut *transaction,
-            )
-            .await?
-            .ok_or_else(|| {
-                CreateError::CustomAuthenticationError(
-                    "You don't have permission to upload this version!".to_string(),
-                )
-            })?;
+            let team_member =
+                models::TeamMember::get_from_user_id_mod(mod_id, user.id.into(), &mut *transaction)
+                    .await?
+                    .ok_or_else(|| {
+                        CreateError::CustomAuthenticationError(
+                            "You don't have permission to upload this version!".to_string(),
+                        )
+                    })?;
 
             if !team_member
                 .permissions
@@ -399,17 +396,14 @@ async fn upload_file_to_version_inner(
         }
     };
 
-    let team_member = models::TeamMember::get_from_user_id_version(
-        version_id.into(),
-        user.id.into(),
-        &mut *transaction,
-    )
-    .await?
-    .ok_or_else(|| {
-        CreateError::CustomAuthenticationError(
-            "You don't have permission to upload files to this version!".to_string(),
-        )
-    })?;
+    let team_member =
+        models::TeamMember::get_from_user_id_version(version_id, user.id.into(), &mut *transaction)
+            .await?
+            .ok_or_else(|| {
+                CreateError::CustomAuthenticationError(
+                    "You don't have permission to upload files to this version!".to_string(),
+                )
+            })?;
 
     if team_member
         .permissions