From 39e78619176fd7a2ebd466b4f058159c01603967 Mon Sep 17 00:00:00 2001 From: Awiteb Date: Thu, 18 Jul 2024 11:22:56 +0300 Subject: [PATCH] change: Rename `OutChatRequestsExt::have_chat_request_to` function to `get_chat_request_to` Signed-off-by: Awiteb --- crates/oxidetalis/src/database/out_chat_requests.rs | 6 +++--- crates/oxidetalis/src/websocket/handlers/chat_request.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/oxidetalis/src/database/out_chat_requests.rs b/crates/oxidetalis/src/database/out_chat_requests.rs index f0cb280..c3a3ea1 100644 --- a/crates/oxidetalis/src/database/out_chat_requests.rs +++ b/crates/oxidetalis/src/database/out_chat_requests.rs @@ -27,7 +27,7 @@ use crate::{errors::ServerResult, websocket::errors::WsError}; pub trait OutChatRequestsExt { /// Returns the outgoing chat request if the `user` have a sent chat request /// to the `recipient` - async fn have_chat_request_to( + async fn get_chat_request_to( &self, requester: &UserModel, recipient: &PublicKey, @@ -50,7 +50,7 @@ pub trait OutChatRequestsExt { impl OutChatRequestsExt for DatabaseConnection { #[logcall::logcall] - async fn have_chat_request_to( + async fn get_chat_request_to( &self, requester: &UserModel, recipient: &PublicKey, @@ -94,7 +94,7 @@ impl OutChatRequestsExt for DatabaseConnection { requester: &UserModel, recipient: &PublicKey, ) -> ServerResult<()> { - if let Some(out_model) = self.have_chat_request_to(requester, recipient).await? { + if let Some(out_model) = self.get_chat_request_to(requester, recipient).await? { out_model.delete(self).await?; } Ok(()) diff --git a/crates/oxidetalis/src/websocket/handlers/chat_request.rs b/crates/oxidetalis/src/websocket/handlers/chat_request.rs index 13fca2b..6d0aa2a 100644 --- a/crates/oxidetalis/src/websocket/handlers/chat_request.rs +++ b/crates/oxidetalis/src/websocket/handlers/chat_request.rs @@ -49,7 +49,7 @@ pub async fn handle_chat_request( // FIXME: When change the entity public key to a PublicKey type, change this let from_public_key = PublicKey::from_str(&from_user.public_key).expect("Is valid public key"); - if try_ws!(Some db.have_chat_request_to(from_user, to_public_key).await).is_some() { + if try_ws!(Some db.get_chat_request_to(from_user, to_public_key).await).is_some() { return Some(WsError::AlreadySendChatRequest.into()); } @@ -99,7 +99,7 @@ pub async fn handle_chat_response( PublicKey::from_str(&recipient_user.public_key).expect("Is valid public key"); if try_ws!(Some - db.have_chat_request_to(&sender_user, &recipient_public_key) + db.get_chat_request_to(&sender_user, &recipient_public_key) .await ) .is_none()