From 1cda34d16bccc6d0d1f7606ded545200d88ae1ba Mon Sep 17 00:00:00 2001
From: Radical <radical@radical.fun>
Date: Mon, 26 May 2025 22:26:47 +0200
Subject: [PATCH] fix: remove more unwraps

found more unwraps that needed to be changed to ?
---
 src/api/v1/auth/refresh.rs                      |  9 ++-------
 src/api/v1/servers/mod.rs                       |  2 +-
 src/api/v1/servers/uuid/channels/mod.rs         | 14 +++++++++++---
 src/api/v1/servers/uuid/channels/uuid/mod.rs    |  2 +-
 src/api/v1/servers/uuid/channels/uuid/socket.rs |  2 +-
 src/api/v1/servers/uuid/roles/mod.rs            |  2 +-
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/api/v1/auth/refresh.rs b/src/api/v1/auth/refresh.rs
index 303748a..fceabf5 100644
--- a/src/api/v1/auth/refresh.rs
+++ b/src/api/v1/auth/refresh.rs
@@ -59,14 +59,9 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
         let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
 
         if lifetime > 1987200 {
-            let new_refresh_token = generate_refresh_token();
+            let new_refresh_token = generate_refresh_token()?;
 
-            if new_refresh_token.is_err() {
-                error!("{}", new_refresh_token.unwrap_err());
-                return Ok(HttpResponse::InternalServerError().finish());
-            }
-
-            let new_refresh_token = new_refresh_token.unwrap();
+            let new_refresh_token = new_refresh_token;
 
             match update(refresh_tokens::table)
                 .filter(rdsl::token.eq(&refresh_token))
diff --git a/src/api/v1/servers/mod.rs b/src/api/v1/servers/mod.rs
index 76a4c16..91980e3 100644
--- a/src/api/v1/servers/mod.rs
+++ b/src/api/v1/servers/mod.rs
@@ -63,7 +63,7 @@ pub async fn get(
 
     let amount = request_query.amount.unwrap_or(10);
 
-    check_access_token(auth_header, &mut data.pool.get().await.unwrap()).await?;
+    check_access_token(auth_header, &mut data.pool.get().await?).await?;
 
     let guilds = Guild::fetch_amount(&data.pool, start, amount).await?;
 
diff --git a/src/api/v1/servers/uuid/channels/mod.rs b/src/api/v1/servers/uuid/channels/mod.rs
index 3021ded..c3640fe 100644
--- a/src/api/v1/servers/uuid/channels/mod.rs
+++ b/src/api/v1/servers/uuid/channels/mod.rs
@@ -1,5 +1,9 @@
 use crate::{
-    api::v1::auth::check_access_token, error::Error, structs::{Channel, Member}, utils::{get_auth_header, order_channels}, Data
+    Data,
+    api::v1::auth::check_access_token,
+    error::Error,
+    structs::{Channel, Member},
+    utils::{get_auth_header, order_channels},
 };
 use ::uuid::Uuid;
 use actix_web::{HttpRequest, HttpResponse, get, post, web};
@@ -41,8 +45,12 @@ pub async fn get(
 
     let channels_ordered = order_channels(channels).await?;
 
-    data.set_cache_key(format!("{}_channels", guild_uuid), channels_ordered.clone(), 1800)
-        .await?;
+    data.set_cache_key(
+        format!("{}_channels", guild_uuid),
+        channels_ordered.clone(),
+        1800,
+    )
+    .await?;
 
     Ok(HttpResponse::Ok().json(channels_ordered))
 }
diff --git a/src/api/v1/servers/uuid/channels/uuid/mod.rs b/src/api/v1/servers/uuid/channels/uuid/mod.rs
index 54f90a7..b1c749f 100644
--- a/src/api/v1/servers/uuid/channels/uuid/mod.rs
+++ b/src/api/v1/servers/uuid/channels/uuid/mod.rs
@@ -64,7 +64,7 @@ pub async fn delete(
     let channel: Channel;
 
     if let Ok(cache_hit) = data.get_cache_key(format!("{}", channel_uuid)).await {
-        channel = serde_json::from_str(&cache_hit).unwrap();
+        channel = serde_json::from_str(&cache_hit)?;
 
         data.del_cache_key(format!("{}", channel_uuid)).await?;
     } else {
diff --git a/src/api/v1/servers/uuid/channels/uuid/socket.rs b/src/api/v1/servers/uuid/channels/uuid/socket.rs
index 744f017..a90cb86 100644
--- a/src/api/v1/servers/uuid/channels/uuid/socket.rs
+++ b/src/api/v1/servers/uuid/channels/uuid/socket.rs
@@ -42,7 +42,7 @@ pub async fn echo(
 
     // Return channel cache or result from psql as `channel` variable
     if let Ok(cache_hit) = data.get_cache_key(format!("{}", channel_uuid)).await {
-        channel = serde_json::from_str(&cache_hit).unwrap()
+        channel = serde_json::from_str(&cache_hit)?
     } else {
         channel = Channel::fetch_one(&mut conn, channel_uuid).await?;
 
diff --git a/src/api/v1/servers/uuid/roles/mod.rs b/src/api/v1/servers/uuid/roles/mod.rs
index fe25d39..db6c7cf 100644
--- a/src/api/v1/servers/uuid/roles/mod.rs
+++ b/src/api/v1/servers/uuid/roles/mod.rs
@@ -62,7 +62,7 @@ pub async fn create(
 
     let guild_uuid = path.into_inner().0;
 
-    let mut conn = data.pool.get().await.unwrap();
+    let mut conn = data.pool.get().await?;
 
     let uuid = check_access_token(auth_header, &mut conn).await?;