gorb/backend
4
0
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

style: get object from cache more cleanly

Browse source
This commit is contained in:
Radical 2025-05-12 00:08:21 +02:00
parent 8935c2d496
commit a5ec2704e6
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/api/v1/servers/uuid/channels/uuid/messages.rs
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 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 { if let Ok(cache_hit) = cache_result {
channel_raw = Some(serde_json::from_str(&cache_hit).unwrap()) channel = serde_json::from_str(&cache_hit).unwrap()
} } else {
if channel_raw.is_none() {
let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await; let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await;
if let Err(error) = channel_result { if let Err(error) = channel_result {
return Ok(error) 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 { if let Err(error) = cache_result {
error!("{}", error); 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; let messages = channel.fetch_messages(&data.pool, message_request.amount, message_request.offset).await;
if let Err(error) = messages { if let Err(error) = messages {