Compare commits

...

2 commits

Author SHA1 Message Date
8fdbf8cc48 feat: add channel deletion 2025-05-12 00:09:17 +02:00
a5ec2704e6 style: get object from cache more cleanly 2025-05-12 00:08:21 +02:00
4 changed files with 81 additions and 12 deletions

View file

@ -38,22 +38,20 @@ pub async fn res(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, message_reques
let cache_result = data.get_cache_key(format!("{}", channel_uuid)).await;
let mut channel_raw: Option<Channel> = None;
let channel: Channel;
if let Ok(cache_hit) = cache_result {
channel_raw = Some(serde_json::from_str(&cache_hit).unwrap())
}
if channel_raw.is_none() {
channel = serde_json::from_str(&cache_hit).unwrap()
} else {
let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await;
if let Err(error) = channel_result {
return Ok(error)
}
channel_raw = Some(channel_result.unwrap());
channel = channel_result.unwrap();
let cache_result = data.set_cache_key(format!("{}", channel_uuid), channel_raw.clone().unwrap(), 60).await;
let cache_result = data.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60).await;
if let Err(error) = cache_result {
error!("{}", error);
@ -61,8 +59,6 @@ pub async fn res(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, message_reques
}
}
let channel = channel_raw.unwrap();
let messages = channel.fetch_messages(&data.pool, message_request.amount, message_request.offset).await;
if let Err(error) = messages {

View file

@ -1,12 +1,12 @@
pub mod messages;
use actix_web::{get, web, Error, HttpRequest, HttpResponse};
use actix_web::{delete, get, web, Error, HttpRequest, HttpResponse};
use crate::{api::v1::auth::check_access_token, structs::{Channel, Member}, utils::get_auth_header, Data};
use ::uuid::Uuid;
use log::error;
#[get("{uuid}/channels/{channel_uuid}")]
pub async fn res(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
@ -54,3 +54,61 @@ pub async fn res(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Dat
Ok(HttpResponse::Ok().json(channel))
}
#[delete("{uuid}/channels/{channel_uuid}")]
pub async fn delete(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
}
let (guild_uuid, channel_uuid) = path.into_inner();
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
}
let uuid = authorized.unwrap();
let member = Member::fetch_one(&data.pool, uuid, guild_uuid).await;
if let Err(error) = member {
return Ok(error);
}
let cache_result = data.get_cache_key(format!("{}", channel_uuid)).await;
let channel: Channel;
if let Ok(cache_hit) = cache_result {
channel = serde_json::from_str(&cache_hit).unwrap();
let result = data.del_cache_key(format!("{}", channel_uuid)).await;
if let Err(error) = result {
error!("{}", error)
}
} else {
let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await;
if let Err(error) = channel_result {
return Ok(error)
}
channel = channel_result.unwrap();
}
let delete_result = channel.delete(&data.pool).await;
if let Err(error) = delete_result {
return Ok(error)
}
Ok(HttpResponse::Ok().finish())
}

View file

@ -14,7 +14,8 @@ pub fn web() -> Scope {
// Channels
.service(channels::response)
.service(channels::response_post)
.service(channels::uuid::res)
.service(channels::uuid::get)
.service(channels::uuid::delete)
.service(channels::uuid::messages::res)
// Roles
.service(roles::response)

View file

@ -156,6 +156,20 @@ impl Channel {
Ok(channel)
}
pub async fn delete(self, pool: &Pool<Postgres>) -> Result<(), HttpResponse> {
let result = sqlx::query(&format!("DELETE FROM channels WHERE channel_uuid = '{}'", self.uuid))
.execute(pool)
.await;
if let Err(error) = result {
error!("{}", error);
return Err(HttpResponse::InternalServerError().finish())
}
Ok(())
}
pub async fn fetch_messages(&self, pool: &Pool<Postgres>, amount: i64, offset: i64) -> Result<Vec<Message>, HttpResponse> {
let row = sqlx::query_as(&format!("SELECT uuid, user_uuid, message FROM channels WHERE channel_uuid = '{}' ORDER BY uuid LIMIT $1 OFFSET $2", self.uuid))
.bind(amount)