From a7ae1b1dfd51b6067df7a6a8743bac7325fc083a Mon Sep 17 00:00:00 2001 From: dal Date: Mon, 6 Jan 2025 15:21:37 -0700 Subject: [PATCH] Refactor permission handling in get_message_with_permission function - Updated the logic to determine final_permission by checking if permission is Some, simplifying the condition. - Improved error handling for non-public threads when no permissions are provided. --- api/src/routes/ws/threads_and_messages/messages_utils.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/routes/ws/threads_and_messages/messages_utils.rs b/api/src/routes/ws/threads_and_messages/messages_utils.rs index f33ea2e97..1b6d4463b 100644 --- a/api/src/routes/ws/threads_and_messages/messages_utils.rs +++ b/api/src/routes/ws/threads_and_messages/messages_utils.rs @@ -84,7 +84,9 @@ pub async fn get_message_with_permission( } }; - let final_permission = if permission.is_none() && !is_public_thread { + let final_permission = if permission.is_some() { + permission.unwrap() + } else if !is_public_thread { return Err(anyhow!("No message found with permissions")); } else { AssetPermissionRole::Viewer