From 4cbbfdd7a272465ec1cbfe8ea6c3632f1ba52057 Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Tue, 30 Mar 2021 22:43:07 -0700
Subject: [PATCH] mysql_async updates * More shorthand usage for clearer code
 in invite create

---
 json-api/db/src/invites.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/json-api/db/src/invites.rs b/json-api/db/src/invites.rs
index 692f9e5..b3ededa 100644
--- a/json-api/db/src/invites.rs
+++ b/json-api/db/src/invites.rs
@@ -2,7 +2,7 @@ use std::time::{SystemTime, Duration, UNIX_EPOCH};
 
 use mysql_async::{params, Pool};
 use mysql_async::prelude::Queryable;
-use mysql_async::error::Error as SqlError;
+use mysql_async::Error as SqlError;
 
 
 use crate::{BigInt, Invite, Response};
@@ -16,16 +16,16 @@ impl Invite {
             return Ok(Response::RestrictedInput(format!("<{}> not found", id)))
         }
 
-        let conn = p.get_conn().await?;
+        let mut conn = p.get_conn().await?;
         let q = "SELECT uses, expires FROM invites WHERE id = :id ";
-        let (_, data_row): (_, Option<(Option<BigInt>, bool)>) = 
-            conn.first_exec(q, params!{"id" => id}).await?;
+        let row: Option<(Option<BigInt>, bool)> =
+            conn.exec_first(q, params!{"id" => id}).await?;
 
-        return if let Some(row) = data_row {
+        return if let Some((uses, expires)) = row {
             Ok(Response::Row(Invite{
                 id,
-                uses: row.0,
-                expires: row.1,
+                uses,
+                expires,
             }))
         } else {
             Ok(Response::Empty)
@@ -46,9 +46,9 @@ impl Invite {
     }
 
     pub async fn add(&self, p: &Pool) -> Result<(), SqlError> {
-        let conn = p.get_conn().await?;
+        let mut conn = p.get_conn().await?;
 
-        conn.prep_exec(
+        conn.exec_drop(
             "INSERT INTO invites (id, uses, expires)
             VALUES (:id, :uses, :expires)", params!{
                 "id"    => self.id,