Return success from deleted_message even if message not deleted (#5145

)
open-chat-labs · Jan 8, 2024 · 9747f46 · 9747f46
1 parent 6daa661
commit 9747f46
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 11 deletions.
diff --git a/backend/canisters/community/CHANGELOG.md b/backend/canisters/community/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add `subtype` to channel search results ([#5084](https://github.com/open-chat-labs/open-chat/pull/5084))
 - Don't mark messages as edited if only link removed ([#5119](https://github.com/open-chat-labs/open-chat/pull/5119))
 - Increase max message length to 10k characters ([#5140](https://github.com/open-chat-labs/open-chat/pull/5140))
+- Return success from `deleted_message` even if message not deleted ([#5145](https://github.com/open-chat-labs/open-chat/pull/5145))
 
 ### Fixed
 

diff --git a/backend/canisters/community/api/can.did b/backend/canisters/community/api/can.did
@@ -15,7 +15,6 @@ type DeletedMessageResponse = variant {
     UserNotInChannel;
     NotAuthorized;
     MessageNotFound;
-    MessageNotDeleted;
     MessageHardDeleted;
 };
 

diff --git a/backend/canisters/community/api/src/queries/deleted_message.rs b/backend/canisters/community/api/src/queries/deleted_message.rs
@@ -18,7 +18,6 @@ pub enum Response {
     UserNotInChannel,
     NotAuthorized,
     MessageNotFound,
-    MessageNotDeleted,
     MessageHardDeleted,
 }
 

diff --git a/backend/canisters/community/impl/src/queries/deleted_message.rs b/backend/canisters/community/impl/src/queries/deleted_message.rs
@@ -22,7 +22,6 @@ fn deleted_message_impl(args: Args, state: &RuntimeState) -> Response {
                 DeletedMessageResult::UserNotInGroup => UserNotInChannel,
                 DeletedMessageResult::NotAuthorized => NotAuthorized,
                 DeletedMessageResult::MessageNotFound => MessageNotFound,
-                DeletedMessageResult::MessageNotDeleted => MessageNotDeleted,
                 DeletedMessageResult::MessageHardDeleted => MessageHardDeleted,
             }
         } else {

diff --git a/backend/canisters/group/CHANGELOG.md b/backend/canisters/group/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Don't mark messages as edited if only link removed ([#5119](https://github.com/open-chat-labs/open-chat/pull/5119))
 - Increase max message length to 10k characters ([#5140](https://github.com/open-chat-labs/open-chat/pull/5140))
+- Return success from `deleted_message` even if message not deleted ([#5145](https://github.com/open-chat-labs/open-chat/pull/5145))
 
 ### Fixed
 

diff --git a/backend/canisters/group/api/can.did b/backend/canisters/group/api/can.did
@@ -490,7 +490,6 @@ type DeletedMessageResponse = variant {
     CallerNotInGroup;
     NotAuthorized;
     MessageNotFound;
-    MessageNotDeleted;
     MessageHardDeleted;
 };
 

diff --git a/backend/canisters/group/api/src/queries/deleted_message.rs b/backend/canisters/group/api/src/queries/deleted_message.rs
@@ -15,7 +15,6 @@ pub enum Response {
     CallerNotInGroup,
     NotAuthorized,
     MessageNotFound,
-    MessageNotDeleted,
     MessageHardDeleted,
 }
 

diff --git a/backend/canisters/group/impl/src/queries/deleted_message.rs b/backend/canisters/group/impl/src/queries/deleted_message.rs
@@ -21,7 +21,6 @@ fn deleted_message_impl(args: Args, state: &RuntimeState) -> Response {
             DeletedMessageResult::UserNotInGroup => CallerNotInGroup,
             DeletedMessageResult::NotAuthorized => NotAuthorized,
             DeletedMessageResult::MessageNotFound => MessageNotFound,
-            DeletedMessageResult::MessageNotDeleted => MessageNotDeleted,
             DeletedMessageResult::MessageHardDeleted => MessageHardDeleted,
         }
     } else {

diff --git a/backend/canisters/user/CHANGELOG.md b/backend/canisters/user/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add `local_user_index_canister_id` to `initial_state` response ([#5083](https://github.com/open-chat-labs/open-chat/pull/5083))
 - Don't mark messages as edited if only link removed ([#5119](https://github.com/open-chat-labs/open-chat/pull/5119))
 - Increase max message length to 10k characters ([#5140](https://github.com/open-chat-labs/open-chat/pull/5140))
+- Return success from `deleted_message` even if message not deleted ([#5145](https://github.com/open-chat-labs/open-chat/pull/5145))
 
 ### Removed
 

diff --git a/backend/canisters/user/api/can.did b/backend/canisters/user/api/can.did
@@ -987,7 +987,6 @@ type DeletedMessageResponse = variant {
     ChatNotFound;
     NotAuthorized;
     MessageNotFound;
-    MessageNotDeleted;
     MessageHardDeleted;
 };
 

diff --git a/backend/canisters/user/api/src/queries/deleted_message.rs b/backend/canisters/user/api/src/queries/deleted_message.rs
@@ -15,7 +15,6 @@ pub enum Response {
     ChatNotFound,
     NotAuthorized,
     MessageNotFound,
-    MessageNotDeleted,
     MessageHardDeleted,
 }
 

diff --git a/backend/canisters/user/impl/src/queries/deleted_message.rs b/backend/canisters/user/impl/src/queries/deleted_message.rs
@@ -19,7 +19,6 @@ fn deleted_message_impl(args: Args, state: &RuntimeState) -> Response {
             let deleted_by = message.deleted_by.as_ref().map(|d| d.deleted_by);
 
             match deleted_by {
-                None => MessageNotDeleted,
                 Some(u) if u != my_user_id => NotAuthorized,
                 _ => {
                     if matches!(message.content, MessageContentInternal::Deleted(_)) {

diff --git a/backend/libraries/group_chat_core/src/lib.rs b/backend/libraries/group_chat_core/src/lib.rs
@@ -446,7 +446,7 @@ impl GroupChatCore {
                             NotAuthorized
                         }
                     } else {
-                        MessageNotDeleted
+                        Success(Box::new(message.content.hydrate(Some(user_id))))
                     };
                 }
             }
@@ -1893,7 +1893,6 @@ pub enum DeletedMessageResult {
     UserNotInGroup,
     NotAuthorized,
     MessageNotFound,
-    MessageNotDeleted,
     MessageHardDeleted,
 }