shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up some verbosity

Browse Source
This commit is contained in:
shockrah 2020-05-06 22:19:12 -07:00
parent 22a1fd1730
commit 040d58a7ad
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/auth.rs
View File

@ -64,19 +64,16 @@ pub fn join(conn: DBConn, hashcode: u64, name: String) -> AuthResult<Json<User>,
*/ */
use schema::invites::{self, dsl::*}; use schema::invites::{self, dsl::*};
const expired: &'static str = "Invite expired"; let diesel_result = invites
const negate: &'static str = "Malformed request";
let diesel_result: Result<Invite, diesel::result::Error> = invites
.filter(invites::dsl::id.eq(hashcode)) .filter(invites::dsl::id.eq(hashcode))
.first(&conn.0); .first::<Invite>(&conn.0);
if let Ok(data) = diesel_result { if let Ok(data) = diesel_result {
match data.uses { match data.uses {
1 ..= std::i32::MAX => { 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 // 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)) .set(uses.eq(data.uses - 1))
.execute(&conn.0); .execute(&conn.0);
@ -88,12 +85,12 @@ pub fn join(conn: DBConn, hashcode: u64, name: String) -> AuthResult<Json<User>,
.execute(&conn.0) .execute(&conn.0)
.expect("Could not delete invite"); .expect("Could not delete invite");
Err(AuthErr{msg: expired, status: 404}) Err(AuthErr{msg: "Invite expired", status: 404})
} }
} }
} }
else { 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::schema::users::dsl::*;
use crate::diesel::ExpressionMethods; use crate::diesel::ExpressionMethods;
let db_result = diesel::delete(users let _db_result = diesel::delete(users
.filter(id.eq(api_key.id)) .filter(id.eq(api_key.id))
.filter(secret.eq(api_key.secret))) .filter(secret.eq(api_key.secret.clone())))
.execute(&conn.0).unwrap(); .execute(&conn.0).unwrap();