From 040d58a7ad983822eaea93d3b0a283a12734fd34 Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Wed, 6 May 2020 22:19:12 -0700
Subject: [PATCH] Cleaned up some verbosity

---
 server/src/auth.rs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/server/src/auth.rs b/server/src/auth.rs
index ce13dba..6967fe6 100644
--- a/server/src/auth.rs
+++ b/server/src/auth.rs
@@ -64,19 +64,16 @@ pub fn join(conn: DBConn, hashcode: u64, name: String) -> AuthResult<Json<User>,
      */
     use schema::invites::{self, dsl::*};
 
-    const expired: &'static str = "Invite expired";
-    const negate: &'static str = "Malformed request";
-
-    let diesel_result: Result<Invite, diesel::result::Error> = invites
+    let diesel_result = invites
         .filter(invites::dsl::id.eq(hashcode))
-        .first(&conn.0);
+        .first::<Invite>(&conn.0);
 
     if let Ok(data) = diesel_result {
         match data.uses {
             1 ..= std::i32::MAX => {
-                let new_user = crate::users::create_new_user(conn, name);
+                let new_user = crate::users::create_new_user(name);
                 // update the uses counter
-                let _ignored = diesel::update(invites.filter(invites::dsl::id.eq(hashcode)))
+                let _ignore = diesel::update(invites.filter(invites::dsl::id.eq(hashcode)))
                     .set(uses.eq(data.uses - 1))
                     .execute(&conn.0);
 
@@ -88,12 +85,12 @@ pub fn join(conn: DBConn, hashcode: u64, name: String) -> AuthResult<Json<User>,
                     .execute(&conn.0)
                     .expect("Could not delete invite");
 
-                Err(AuthErr{msg: expired, status: 404})
+                Err(AuthErr{msg: "Invite expired", status: 404})
             }
         }
     }
     else {
-        Err(AuthErr{msg:negate, status: 500})
+        Err(AuthErr{msg: "Malformed request", status: 500})
     }
 }
 
@@ -104,9 +101,9 @@ pub fn leave(conn: DBConn, api_key: Form<AuthKey>) -> Status {
     */
     use crate::schema::users::dsl::*;
     use crate::diesel::ExpressionMethods;
-    let db_result = diesel::delete(users
+    let _db_result = diesel::delete(users
         .filter(id.eq(api_key.id))
-        .filter(secret.eq(api_key.secret)))
+        .filter(secret.eq(api_key.secret.clone())))
         .execute(&conn.0).unwrap();