fix: remove more unwraps
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful

found more unwraps that needed to be changed to ?
This commit is contained in:
Radical 2025-05-26 22:26:47 +02:00
parent d8541b2eea
commit 1cda34d16b
6 changed files with 17 additions and 14 deletions

View file

@ -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))
}

View file

@ -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 {

View file

@ -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?;

View file

@ -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?;