From 1249d9c8bf2b0de2c3ab0e04a9a43a981c5f5ef4 Mon Sep 17 00:00:00 2001
From: Awiteb
Date: Mon, 29 Jul 2024 14:01:27 +0300
Subject: [PATCH] chore: Remove `remove_in_chat_request` trait function
Signed-off-by: Awiteb
---
.../oxidetalis/src/database/incoming_chat.rs | 27 -------------------
.../src/websocket/handlers/chat_request.rs | 3 ---
2 files changed, 30 deletions(-)
diff --git a/crates/oxidetalis/src/database/incoming_chat.rs b/crates/oxidetalis/src/database/incoming_chat.rs
index 60a3308..72ebaa0 100644
--- a/crates/oxidetalis/src/database/incoming_chat.rs
+++ b/crates/oxidetalis/src/database/incoming_chat.rs
@@ -32,12 +32,6 @@ pub trait IncomingChatExt {
chat_request_sender: &PublicKey,
) -> ServerResult<()>;
- /// Remove incoming chat request
- async fn remove_in_chat_request(
- &self,
- chat_request_recipient: &UserModel,
- chat_request_sender: &PublicKey,
- ) -> ServerResult<()>;
}
impl IncomingChatExt for DatabaseConnection {
@@ -67,24 +61,3 @@ impl IncomingChatExt for DatabaseConnection {
Ok(())
}
- async fn remove_in_chat_request(
- &self,
- chat_request_recipient: &UserModel,
- chat_request_sender: &PublicKey,
- ) -> ServerResult<()> {
- if let Some(user) = chat_request_recipient
- .find_related(IncomingChatEntity)
- .filter(
- IncomingChatColumn::Sender
- .eq(chat_request_sender)
- .and(IncomingChatColumn::AcceptedResponse.eq(Option::::None)),
- )
- .one(self)
- .await?
- .map(IntoActiveModel::into_active_model)
- {
- user.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 448f481..8a9914b 100644
--- a/crates/oxidetalis/src/websocket/handlers/chat_request.rs
+++ b/crates/oxidetalis/src/websocket/handlers/chat_request.rs
@@ -132,9 +132,6 @@ pub async fn handle_chat_response(
db.remove_out_chat_request(&response_recipient, &response_sender.public_key)
.await
);
- try_ws!(Some
- db.remove_in_chat_request(response_sender, &response_recipient.public_key).await
- );
if let Some(conn_id) = ONLINE_USERS.is_online(&response_recipient.public_key).await {
ONLINE_USERS