Message / Forward: Faster forwarding to "Saved Messages" (#2058)

src/components/main/ForwardRecipientPicker.tsx

@@ -2,7 +2,7 @@ import type { FC } from '../../lib/teact/teact';
 import React, {
   memo, useCallback, useEffect,
 } from '../../lib/teact/teact';
-import { getActions } from '../../global';
+import { getActions, withGlobal } from '../../global';
 
 import useLang from '../../hooks/useLang';
 import useFlag from '../../hooks/useFlag';
@@ -13,12 +13,21 @@ export type OwnProps = {
   isOpen: boolean;
 };
 
-const ForwardRecipientPicker: FC<OwnProps> = ({
+interface StateProps {
+  currentUserId?: string;
+  isManyMessages?: boolean;
+}
+
+const ForwardRecipientPicker: FC<OwnProps & StateProps> = ({
   isOpen,
+  currentUserId,
+  isManyMessages,
 }) => {
   const {
     setForwardChatId,
     exitForwardMode,
+    forwardToSavedMessages,
+    showNotification,
   } = getActions();
 
   const lang = useLang();
@@ -31,8 +40,17 @@ const ForwardRecipientPicker: FC<OwnProps> = ({
   }, [isOpen, markIsShown]);
 
   const handleSelectRecipient = useCallback((recipientId: string) => {
-    setForwardChatId({ id: recipientId });
+    if (recipientId === currentUserId) {
-  }, [setForwardChatId]);
+      forwardToSavedMessages();
+      showNotification({
+        message: lang(isManyMessages
+          ? 'Conversation.ForwardTooltip.SavedMessages.Many'
+          : 'Conversation.ForwardTooltip.SavedMessages.One'),
+      });
+    } else {
+      setForwardChatId({ id: recipientId });
+    }
+  }, [currentUserId, forwardToSavedMessages, isManyMessages, lang, setForwardChatId, showNotification]);
 
   const handleClose = useCallback(() => {
     exitForwardMode();
@@ -53,4 +71,9 @@ const ForwardRecipientPicker: FC<OwnProps> = ({
   );
 };
 
-export default memo(ForwardRecipientPicker);
+export default memo(withGlobal<OwnProps>((global): StateProps => {
+  return {
+    currentUserId: global.currentUserId,
+    isManyMessages: (global.forwardMessages.messageIds?.length || 0) > 1,
+  };
+})(ForwardRecipientPicker));

src/global/actions/api/messages.ts

@@ -1310,6 +1310,19 @@ addActionHandler('setForwardChatId', async (global, actions, payload) => {
   actions.exitMessageSelectMode();
 });
 
+addActionHandler('forwardToSavedMessages', (global, actions) => {
+  setGlobal({
+    ...global,
+    forwardMessages: {
+      ...global.forwardMessages,
+      toChatId: global.currentUserId,
+    },
+  });
+
+  actions.exitMessageSelectMode();
+  actions.forwardMessages({ isSilent: true });
+});
+
 function countSortedIds(ids: number[], from: number, to: number) {
   let count = 0;
 

src/global/types.ts

@@ -877,6 +877,7 @@ export interface ActionPayloads {
   setForwardNoCaptions: boolean;
   exitForwardMode: never;
   changeForwardRecipient: never;
+  forwardToSavedMessages: never;
 
   // GIFs
   loadSavedGifs: never;