feat: standardise message deletion

ts/components/basic/SessionRadioGroup.tsx

@@ -10,6 +10,7 @@ export type SessionRadioItems = Array<{
   label: string;
   inputDataTestId: SessionDataTestId;
   labelDataTestId: SessionDataTestId;
+  disabled?: boolean;
 }>;
 
 interface Props {
@@ -50,6 +51,7 @@ export const SessionRadioGroup = (props: Props) => {
             label={item.label}
             active={itemIsActive}
             value={item.value}
+            disabled={item.disabled}
             inputDataTestId={item.inputDataTestId}
             labelDataTestId={item.labelDataTestId}
             inputName={group}

ts/components/conversation/header/ConversationHeaderSelectionOverlay.tsx

@@ -1,13 +1,9 @@
 import { useDispatch, useSelector } from 'react-redux';
 import useKey from 'react-use/lib/useKey';
 
-import { deleteMessagesForX } from '../../../interactions/conversations/unsendingInteractions';
 import { resetSelectedMessageIds } from '../../../state/ducks/conversations';
 import { getSelectedMessageIds } from '../../../state/selectors/conversations';
-import {
-  useSelectedConversationKey,
-  useSelectedIsPublic,
-} from '../../../state/selectors/selectedConversation';
+import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 import {
   SessionButton,
   SessionButtonColor,
@@ -18,13 +14,15 @@ import { SessionFocusTrap } from '../../SessionFocusTrap';
 import { tr } from '../../../localization/localeTools';
 import { SessionLucideIconButton } from '../../icon/SessionIconButton';
 import { LUCIDE_ICONS_UNICODE } from '../../icon/lucide';
+import { useDeleteMessagesCb } from '../../menuAndSettingsHooks/useDeleteMessagesCb';
 
 export const SelectionOverlay = () => {
   const selectedMessageIds = useSelector(getSelectedMessageIds);
   const selectedConversationKey = useSelectedConversationKey();
-  const isPublic = useSelectedIsPublic();
   const dispatch = useDispatch();
 
+  const deleteMessagesCb = useDeleteMessagesCb(selectedConversationKey);
+
   function onCloseOverlay() {
     dispatch(resetSelectedMessageIds());
   }
@@ -51,8 +49,8 @@ export const SelectionOverlay = () => {
           return true;
         case 'Backspace':
         case 'Delete':
-          if (selectionMode && selectedConversationKey) {
-            void deleteMessagesForX(selectedMessageIds, selectedConversationKey, isPublic);
+          if (selectionMode) {
+            void deleteMessagesCb?.(selectedMessageIds);
           }
           return true;
         default:
@@ -61,12 +59,6 @@ export const SelectionOverlay = () => {
     }
   );
 
-  // `enforceDeleteServerSide` should check for message statuses too, but when we have multiple selected,
-  // some might be sent and some in an error state. We default to trying to delete all of them server side first,
-  // which might fail. If that fails, the user will need to do a delete for all the ones sent already, and a manual delete
-  // for each ones which is in an error state.
-  const enforceDeleteServerSide = isPublic;
-
   const classNameAndId = 'message-selection-overlay';
 
   return (
@@ -88,14 +80,8 @@ export const SelectionOverlay = () => {
             buttonShape={SessionButtonShape.Square}
             buttonType={SessionButtonType.Solid}
             text={tr('delete')}
-            onClick={async () => {
-              if (selectedConversationKey) {
-                await deleteMessagesForX(
-                  selectedMessageIds,
-                  selectedConversationKey,
-                  enforceDeleteServerSide
-                );
-              }
+            onClick={() => {
+              void deleteMessagesCb?.(selectedMessageIds);
             }}
           />
         </div>

ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx

@@ -17,7 +17,6 @@ import {
   replyToMessage,
   resendMessage,
 } from '../../../../../interactions/conversationInteractions';
-import { deleteMessagesById } from '../../../../../interactions/conversations/unsendingInteractions';
 import {
   useMessageAttachments,
   useMessageAuthor,
@@ -54,6 +53,7 @@ import { useShowCopyAccountIdCb } from '../../../../menuAndSettingsHooks/useCopy
 import { sectionActions } from '../../../../../state/ducks/section';
 import { useIsIncomingRequest } from '../../../../../hooks/useParamSelector';
 import { tr } from '../../../../../localization/localeTools';
+import { useDeleteMessagesCb } from '../../../../menuAndSettingsHooks/useDeleteMessagesCb';
 
 // NOTE we override the default max-widths when in the detail isDetailView
 const StyledMessageBody = styled.div`
@@ -289,6 +289,8 @@ export const OverlayMessageInfo = () => {
     }
   }, [sender, closePanel]);
 
+  const deleteMessagesCb = useDeleteMessagesCb(convoId);
+
   if (!rightOverlayMode || !messageInfo || !convoId || !messageId || !sender) {
     return null;
   }
@@ -404,14 +406,14 @@ export const OverlayMessageInfo = () => {
               />
             )}
             {/* Deleting messages sends a "delete message" message so it must be disabled for message requests. */}
-            {isDeletable && !isLegacyGroup && !isIncomingMessageRequest && (
+            {isDeletable && !isLegacyGroup && !isIncomingMessageRequest && deleteMessagesCb && (
               <PanelIconButton
                 text={tr('delete')}
                 iconElement={<PanelIconLucideIcon unicode={LUCIDE_ICONS_UNICODE.TRASH2} />}
                 color={'var(--danger-color)'}
                 dataTestId="delete-from-details"
                 onClick={() => {
-                  void deleteMessagesById([messageId], convoId);
+                  void deleteMessagesCb?.(messageId);
                 }}
               />
             )}

ts/components/menu/items/DeleteMessage/DeleteMessageMenuItem.tsx

@@ -1,36 +1,24 @@
-import { useCallback } from 'react';
-import { deleteMessagesForX } from '../../../../interactions/conversations/unsendingInteractions';
-import {
-  useMessageIsDeletable,
-  useMessageIsDeletableForEveryone,
-  useMessageStatus,
-} from '../../../../state/selectors';
-import {
-  useSelectedConversationKey,
-  useSelectedIsPublic,
-} from '../../../../state/selectors/selectedConversation';
+import { useSelectedConversationKey } from '../../../../state/selectors/selectedConversation';
 import { ItemWithDataTestId } from '../MenuItemWithDataTestId';
 import { tr } from '../../../../localization/localeTools';
+import { useDeleteMessagesCb } from '../../../menuAndSettingsHooks/useDeleteMessagesCb';
 
 export const DeleteItem = ({ messageId }: { messageId: string }) => {
   const convoId = useSelectedConversationKey();
-  const isPublic = useSelectedIsPublic();
 
-  const isDeletable = useMessageIsDeletable(messageId);
-  const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId);
-  const messageStatus = useMessageStatus(messageId);
+  const deleteMessagesCb = useDeleteMessagesCb(convoId);
 
-  const enforceDeleteServerSide = isPublic && messageStatus !== 'error';
-
-  const onDelete = useCallback(() => {
-    if (convoId) {
-      void deleteMessagesForX([messageId], convoId, enforceDeleteServerSide);
-    }
-  }, [convoId, enforceDeleteServerSide, messageId]);
-
-  if (!convoId || (isPublic && !isDeletableForEveryone) || (!isPublic && !isDeletable)) {
+  if (!deleteMessagesCb) {
     return null;
   }
 
-  return <ItemWithDataTestId onClick={onDelete}>{tr('delete')}</ItemWithDataTestId>;
+  return (
+    <ItemWithDataTestId
+      onClick={() => {
+        void deleteMessagesCb?.(messageId);
+      }}
+    >
+      {tr('delete')}
+    </ItemWithDataTestId>
+  );
 };