sceyt-chat-react-uikit 1.8.9-beta.10 → 1.8.9-beta.12

package/index.js

@@ -11456,13 +11456,41 @@ var requestToPromise = function requestToPromise(request) {
     };
   });
 };
+var _toStructuredCloneSafeValue = function toStructuredCloneSafeValue(value, seen) {
+  if (seen === void 0) {
+    seen = new WeakSet();
+  }
+  if (value === null || typeof value !== 'object') {
+    return typeof value === 'function' || typeof value === 'symbol' ? undefined : value;
+  }
+  if (value instanceof Date) {
+    return new Date(value.getTime());
+  }
+  if (seen.has(value)) {
+    return undefined;
+  }
+  seen.add(value);
+  if (Array.isArray(value)) {
+    return value.map(function (item) {
+      return _toStructuredCloneSafeValue(item, seen);
+    });
+  }
+  return Object.keys(value).reduce(function (snapshot, key) {
+    var safeValue = _toStructuredCloneSafeValue(value[key], seen);
+    if (safeValue !== undefined) {
+      snapshot[key] = safeValue;
+    }
+    return snapshot;
+  }, {});
+};
 var sanitizeMessageForPersist = function sanitizeMessageForPersist(message) {
-  var _message$attachments;
-  if (!(message !== null && message !== void 0 && (_message$attachments = message.attachments) !== null && _message$attachments !== void 0 && _message$attachments.length)) {
-    return message;
+  var _sanitizedMessage$att;
+  var sanitizedMessage = _toStructuredCloneSafeValue(message);
+  if (!(sanitizedMessage !== null && sanitizedMessage !== void 0 && (_sanitizedMessage$att = sanitizedMessage.attachments) !== null && _sanitizedMessage$att !== void 0 && _sanitizedMessage$att.length)) {
+    return sanitizedMessage;
   }
-  return _extends({}, message, {
-    attachments: message.attachments.map(function (attachment) {
+  return _extends({}, sanitizedMessage, {
+    attachments: sanitizedMessage.attachments.map(function (attachment) {
       var rest = _extends({}, attachment || {});
       delete rest.data;
       if (rest.attachmentUrl && String(rest.attachmentUrl).startsWith('blob:')) {
@@ -12301,9 +12329,12 @@ function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
           updatedMessageData = _extends({}, updatedMessage.params);
           nextMessage = _extends({}, mes, updatedMessageData);
         } else {
-          var _updatedMessage$param6;
+          var _updatedMessage$param6, _updatedMessage$param7;
           var statusUpdatedMessage = (_updatedMessage$param6 = updatedMessage.params) !== null && _updatedMessage$param6 !== void 0 && _updatedMessage$param6.deliveryStatus ? updateMessageDeliveryStatusAndMarkers(mes, updatedMessage.params) : {};
-          updatedMessageData = _extends({}, mes, updatedMessage.params, statusUpdatedMessage);
+          var forwardingDetails = mes.forwardingDetails && (_updatedMessage$param7 = updatedMessage.params) !== null && _updatedMessage$param7 !== void 0 && _updatedMessage$param7.forwardingDetails ? _extends({}, mes.forwardingDetails, updatedMessage.params.forwardingDetails) : undefined;
+          updatedMessageData = _extends({}, mes, updatedMessage.params, forwardingDetails ? {
+            forwardingDetails: forwardingDetails
+          } : {}, statusUpdatedMessage);
           var voteDetailsData = mes === null || mes === void 0 ? void 0 : mes.pollDetails;
           if (voteDetails) {
             voteDetailsData = handleVoteDetails(voteDetails, updatedMessageData);
@@ -13016,7 +13047,10 @@ var messageSlice = createSlice({
             if (params !== null && params !== void 0 && params.deliveryStatus) {
               statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, params);
             }
-            var messageOldData = _extends({}, message, params, {
+            var forwardingDetails = message.forwardingDetails && params.forwardingDetails ? _extends({}, message.forwardingDetails, params.forwardingDetails) : undefined;
+            var messageOldData = _extends({}, message, params, forwardingDetails ? {
+              forwardingDetails: forwardingDetails
+            } : {}, {
               userMarkers: [].concat(message.userMarkers || [], params.userMarkers || [])
             }, statusUpdatedMessage);
             var messageData = _extends({}, messageOldData);
@@ -16767,12 +16801,15 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
     return Promise.reject(e);
   }
 };
-var addPendingMessage = function addPendingMessage(message, messageCopy, channelId) {
+var addPendingMessage = function addPendingMessage(message, messageCopy, channelId, preserveParentMessage) {
   var _getStoredChannel;
+  if (preserveParentMessage === void 0) {
+    preserveParentMessage = true;
+  }
   var messageToAdd = _extends({}, messageCopy, {
     createdAt: new Date(Date.now()),
     mentionedUsers: message.mentionedUsers,
-    parentMessage: message.parentMessage
+    parentMessage: preserveParentMessage ? message.parentMessage : null
   });
   addMessageToMap(channelId, messageToAdd);
   var currentLastMessage = ((_getStoredChannel = getStoredChannel(channelId)) === null || _getStoredChannel === void 0 ? void 0 : _getStoredChannel.lastMessage) || null;
@@ -17083,10 +17120,13 @@ function executeEditMessageMutation(channel, message) {
     }
   }, _marked0);
 }
-var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message, _isNotShowOwnMessageForward) {
+var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message, _isNotShowOwnMessageForward, preserveParentMessage) {
   if (scrollToNewMessage === void 0) {
     scrollToNewMessage = true;
   }
+  if (preserveParentMessage === void 0) {
+    preserveParentMessage = true;
+  }
   return /*#__PURE__*/_regenerator().m(function _callee() {
     return _regenerator().w(function (_context1) {
       while (1) switch (_context1.n) {
@@ -17095,7 +17135,7 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
             _context1.n = 2;
             break;
           }
-          addPendingMessage(message, pending, channelId);
+          addPendingMessage(message, pending, channelId, preserveParentMessage);
           if (!(getActiveChannelId() === channelId)) {
             _context1.n = 2;
             break;
@@ -17903,7 +17943,7 @@ function sendTextMessage(action) {
 }
 function forwardMessage(action) {
   var _message$user;
-  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, parsedChannel, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, _getStoredChannel8, messageResponse, messageUpdateData, messageToUpdate, resolvedLastMessage, channelUpdateParam, _channel5, isErrorResendable, _t4;
+  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, parsedChannel, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, _pendingMessage, _getStoredChannel8, messageResponse, messageUpdateData, messageToUpdate, resolvedLastMessage, channelUpdateParam, _channel5, isErrorResendable, _t4;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -18000,7 +18040,7 @@ function forwardMessage(action) {
         messageTid = messageToSend.tid;
         pendingMessage = _extends({}, messageToSend, {
           createdAt: new Date(Date.now()),
-          user: message.user
+          user: SceytChatClient.user
         });
         if (isForward && pendingMessage && action.type !== RESEND_MESSAGE) {
           if (message.forwardingDetails) {
@@ -18024,7 +18064,7 @@ function forwardMessage(action) {
         return effects.call(loadOGMetadataForLinkMessages, [pendingMessage], true);
       case 9:
         _context15.n = 10;
-        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, channelId === activeChannelId, message, isNotShowOwnMessageForward);
+        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, channelId === activeChannelId, message, isNotShowOwnMessageForward, false);
       case 10:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context15.n = 16;
@@ -18037,7 +18077,9 @@ function forwardMessage(action) {
       case 11:
         messageResponse = _context15.v;
         messageUpdateData = _extends({}, messageResponse, {
-          channelId: channel.id
+          channelId: channel.id,
+          forwardingDetails: isForward && (_pendingMessage = pendingMessage) !== null && _pendingMessage !== void 0 && _pendingMessage.forwardingDetails ? _extends({}, pendingMessage.forwardingDetails, messageResponse.forwardingDetails) : messageResponse.forwardingDetails,
+          parentMessage: isForward ? null : messageResponse.parentMessage
         });
         if (!(channelId === activeChannelId)) {
           _context15.n = 12;
@@ -18047,7 +18089,7 @@ function forwardMessage(action) {
         return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
       case 12:
         addConfirmedMessageToCache(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
-        messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
+        messageToUpdate = JSON.parse(JSON.stringify(messageUpdateData));
         if (!channel.unread) {
           _context15.n = 13;
           break;
@@ -50979,6 +51021,23 @@ var Emoji$1 = styled__default.li(_templateObject8$l || (_templateObject8$l = _ta
   return props.hoverBackgroundColor;
 });
 
+var waitForImageAttachmentPreparation = function waitForImageAttachmentPreparation(attachments, preparations) {
+  try {
+    return Promise.resolve(Promise.all(attachments.filter(function (attachment) {
+      return attachment.type === attachmentTypes.image;
+    }).map(function (attachment) {
+      return attachment.tid ? preparations.get(attachment.tid) : undefined;
+    }))).then(function () {});
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var mergePreparedAttachmentPatches = function mergePreparedAttachmentPatches(attachments, patches) {
+  return attachments.map(function (attachment) {
+    return _extends({}, attachment, attachment.tid ? patches.get(attachment.tid) : undefined);
+  });
+};
+
 var getReplyLinkPreviewImage = function getReplyLinkPreviewImage(attachments) {
   var _attachments$;
   var attachment = attachments !== null && attachments !== void 0 && attachments.length && ((_attachments$ = attachments[0]) === null || _attachments$ === void 0 ? void 0 : _attachments$.type) === attachmentTypes.link ? attachments[0] : null;
@@ -52712,6 +52771,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   var emojiBtnRef = React.useRef(null);
   var addAttachmentsBtnRef = React.useRef(null);
   var metadataDebounceRef = React.useRef(null);
+  var attachmentPreparationPromisesRef = React.useRef(new Map());
+  var preparedAttachmentPatchesRef = React.useRef(new Map());
   var sendMessageWrapperRef = React.useRef(null);
   var restoringDraftRef = React.useRef(false);
   var restoredDraftChannelIdRef = React.useRef(null);
@@ -52933,168 +52994,196 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
   };
   var handleSendEditMessage = function handleSendEditMessage(event, pollDetails) {
-    var shiftKey = event.shiftKey,
-      type = event.type,
-      code = event.code;
-    var isEnter = (code === 'Enter' || code === 'NumpadEnter') && shiftKey === false;
-    var isPoll = pollDetails && pollDetails.options.length > 0 && pollDetails.name.trim();
-    var messageTextForSend = isPoll ? pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.name.trim() : messageText.trim();
-    var shouldSend = (isEnter || type === 'click') && (messageToEdit || messageTextForSend || attachments.length && attachments.length > 0);
-    if (isEnter) {
-      event.preventDefault();
-      if (!(messageTextForSend !== null && messageTextForSend !== void 0 && messageTextForSend.trim()) && !attachments.length && !messageToEdit) {
-        setShouldClearEditor({
-          clear: true
-        });
-      }
-    }
-    if (shouldSend && !mentionsIsOpen) {
-      event.preventDefault();
-      event.stopPropagation();
-      if (messageToEdit) {
-        handleEditMessage();
-      } else if (messageTextForSend !== null && messageTextForSend !== void 0 && messageTextForSend.trim() || attachments.length && attachments.length > 0) {
-        var _trimMessageBodyWithA = trimMessageBodyWithAttributes(messageText, messageBodyAttributes),
-          messageTexToSend = _trimMessageBodyWithA.body,
-          adjustedBodyAttributes = _trimMessageBodyWithA.bodyAttributes;
-        var messageToSend = {
-          body: messageTexToSend,
-          bodyAttributes: adjustedBodyAttributes,
-          mentionedUsers: [],
-          attachments: [],
-          type: 'text'
-        };
-        var mentionUsersToSend = [];
-        if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
-          adjustedBodyAttributes.forEach(function (att) {
-            if (att.type === 'mention') {
-              var mentionsToFind = [].concat(mentionedUsers);
-              var draftMessage = getDraftMessageFromMap(activeChannel.id);
-              if (draftMessage) {
-                mentionsToFind = [].concat(draftMessage.mentionedUsers, mentionedUsers);
-              }
-              var mentionToAdd = mentionsToFind.find(function (mention) {
-                return mention.id === att.metadata;
-              });
-              mentionUsersToSend.push(mentionToAdd || {
-                id: att.metadata
-              });
-            }
+    try {
+      var shiftKey = event.shiftKey,
+        type = event.type,
+        code = event.code;
+      var isEnter = (code === 'Enter' || code === 'NumpadEnter') && shiftKey === false;
+      var isPoll = pollDetails && pollDetails.options.length > 0 && pollDetails.name.trim();
+      var messageTextForSend = isPoll ? pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.name.trim() : messageText.trim();
+      var shouldSend = (isEnter || type === 'click') && (messageToEdit || messageTextForSend || attachments.length && attachments.length > 0);
+      if (isEnter) {
+        event.preventDefault();
+        if (!(messageTextForSend !== null && messageTextForSend !== void 0 && messageTextForSend.trim()) && !attachments.length && !messageToEdit) {
+          setShouldClearEditor({
+            clear: true
           });
         }
-        messageToSend.mentionedUsers = mentionUsersToSend;
-        if (messageForReply) {
-          messageToSend.parentMessage = messageForReply;
-        }
-        var linkAttachment;
-        if (messageTexToSend) {
-          var _LinkifyIt$match;
-          var protocolMatch = /https?:\/\/\S+/.exec(messageTexToSend);
-          var linkifyMatchResult = !protocolMatch ? (_LinkifyIt$match = new LinkifyIt().match(messageTexToSend)) === null || _LinkifyIt$match === void 0 ? void 0 : _LinkifyIt$match[0] : null;
-          var url = protocolMatch ? protocolMatch[0] : linkifyMatchResult ? linkifyMatchResult.schema === '' ? linkifyMatchResult.url.replace(/^http:\/\//, 'https://') : linkifyMatchResult.url : null;
-          if (url) {
-            var urlMetadata = oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[url];
-            var metadata = {};
-            if (urlMetadata) {
-              var _urlMetadata$og, _urlMetadata$og$favic, _urlMetadata$og2, _urlMetadata$og$descr, _urlMetadata$og3, _urlMetadata$og3$imag, _urlMetadata$og3$imag2, _urlMetadata$og4, _urlMetadata$og$title;
-              if (urlMetadata.imageWidth) metadata.szw = urlMetadata.imageWidth;
-              if (urlMetadata.imageHeight) metadata.szh = urlMetadata.imageHeight;
-              if ((_urlMetadata$og = urlMetadata.og) !== null && _urlMetadata$og !== void 0 && (_urlMetadata$og$favic = _urlMetadata$og.favicon) !== null && _urlMetadata$og$favic !== void 0 && _urlMetadata$og$favic.url) metadata.tur = urlMetadata.og.favicon.url;
-              if ((_urlMetadata$og2 = urlMetadata.og) !== null && _urlMetadata$og2 !== void 0 && _urlMetadata$og2.description) metadata.dsc = (_urlMetadata$og$descr = urlMetadata.og.description) === null || _urlMetadata$og$descr === void 0 ? void 0 : _urlMetadata$og$descr.slice(0, 200);
-              if ((_urlMetadata$og3 = urlMetadata.og) !== null && _urlMetadata$og3 !== void 0 && (_urlMetadata$og3$imag = _urlMetadata$og3.image) !== null && _urlMetadata$og3$imag !== void 0 && (_urlMetadata$og3$imag2 = _urlMetadata$og3$imag[0]) !== null && _urlMetadata$og3$imag2 !== void 0 && _urlMetadata$og3$imag2.url) metadata.iur = urlMetadata.og.image[0].url;
-              if ((_urlMetadata$og4 = urlMetadata.og) !== null && _urlMetadata$og4 !== void 0 && _urlMetadata$og4.title) metadata.ttl = (_urlMetadata$og$title = urlMetadata.og.title) === null || _urlMetadata$og$title === void 0 ? void 0 : _urlMetadata$og$title.slice(0, 100);
+      }
+      var _temp6 = function () {
+        if (shouldSend && !mentionsIsOpen) {
+          var _temp5 = function _temp5() {
+            setAttachments([]);
+            attachmentsUpdate = [];
+            removeDraftMessageFromMap(activeChannel.id);
+            dispatch(setChannelDraftMessageIsRemovedAC(activeChannel.id));
+            setViewOnce(false);
+            handleCloseReply();
+            setShouldClearEditor({
+              clear: true
+            });
+            setMentionedUsers([]);
+            setMessageBodyAttributes([]);
+            closePreviewWithAnimation(function () {
+              setDetectedUrl(null);
+              setDismissedUrls(new Set());
+            });
+            dispatch(setCloseSearchChannelsAC(true));
+          };
+          event.preventDefault();
+          event.stopPropagation();
+          var _temp4 = function () {
+            if (messageToEdit) {
+              handleEditMessage();
+            } else {
+              var _temp7 = function () {
+                if (messageTextForSend !== null && messageTextForSend !== void 0 && messageTextForSend.trim() || attachments.length && attachments.length > 0) {
+                  var _temp2 = function _temp2() {
+                    setMessageText('');
+                    fileUploader.current.value = '';
+                    if (inTypingState) {
+                      handleSendTypingState(false);
+                    }
+                    clearTimeout(typingTimout);
+                    setTypingTimout(undefined);
+                  };
+                  var _trimMessageBodyWithA = trimMessageBodyWithAttributes(messageText, messageBodyAttributes),
+                    messageTexToSend = _trimMessageBodyWithA.body,
+                    adjustedBodyAttributes = _trimMessageBodyWithA.bodyAttributes;
+                  var messageToSend = {
+                    body: messageTexToSend,
+                    bodyAttributes: adjustedBodyAttributes,
+                    mentionedUsers: [],
+                    attachments: [],
+                    type: 'text'
+                  };
+                  var mentionUsersToSend = [];
+                  if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
+                    adjustedBodyAttributes.forEach(function (att) {
+                      if (att.type === 'mention') {
+                        var mentionsToFind = [].concat(mentionedUsers);
+                        var draftMessage = getDraftMessageFromMap(activeChannel.id);
+                        if (draftMessage) {
+                          mentionsToFind = [].concat(draftMessage.mentionedUsers, mentionedUsers);
+                        }
+                        var mentionToAdd = mentionsToFind.find(function (mention) {
+                          return mention.id === att.metadata;
+                        });
+                        mentionUsersToSend.push(mentionToAdd || {
+                          id: att.metadata
+                        });
+                      }
+                    });
+                  }
+                  messageToSend.mentionedUsers = mentionUsersToSend;
+                  if (messageForReply) {
+                    messageToSend.parentMessage = messageForReply;
+                  }
+                  var linkAttachment;
+                  if (messageTexToSend) {
+                    var _LinkifyIt$match;
+                    var protocolMatch = /https?:\/\/\S+/.exec(messageTexToSend);
+                    var linkifyMatchResult = !protocolMatch ? (_LinkifyIt$match = new LinkifyIt().match(messageTexToSend)) === null || _LinkifyIt$match === void 0 ? void 0 : _LinkifyIt$match[0] : null;
+                    var url = protocolMatch ? protocolMatch[0] : linkifyMatchResult ? linkifyMatchResult.schema === '' ? linkifyMatchResult.url.replace(/^http:\/\//, 'https://') : linkifyMatchResult.url : null;
+                    if (url) {
+                      var urlMetadata = oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[url];
+                      var metadata = {};
+                      if (urlMetadata) {
+                        var _urlMetadata$og, _urlMetadata$og$favic, _urlMetadata$og2, _urlMetadata$og$descr, _urlMetadata$og3, _urlMetadata$og3$imag, _urlMetadata$og3$imag2, _urlMetadata$og4, _urlMetadata$og$title;
+                        if (urlMetadata.imageWidth) metadata.szw = urlMetadata.imageWidth;
+                        if (urlMetadata.imageHeight) metadata.szh = urlMetadata.imageHeight;
+                        if ((_urlMetadata$og = urlMetadata.og) !== null && _urlMetadata$og !== void 0 && (_urlMetadata$og$favic = _urlMetadata$og.favicon) !== null && _urlMetadata$og$favic !== void 0 && _urlMetadata$og$favic.url) metadata.tur = urlMetadata.og.favicon.url;
+                        if ((_urlMetadata$og2 = urlMetadata.og) !== null && _urlMetadata$og2 !== void 0 && _urlMetadata$og2.description) metadata.dsc = (_urlMetadata$og$descr = urlMetadata.og.description) === null || _urlMetadata$og$descr === void 0 ? void 0 : _urlMetadata$og$descr.slice(0, 200);
+                        if ((_urlMetadata$og3 = urlMetadata.og) !== null && _urlMetadata$og3 !== void 0 && (_urlMetadata$og3$imag = _urlMetadata$og3.image) !== null && _urlMetadata$og3$imag !== void 0 && (_urlMetadata$og3$imag2 = _urlMetadata$og3$imag[0]) !== null && _urlMetadata$og3$imag2 !== void 0 && _urlMetadata$og3$imag2.url) metadata.iur = urlMetadata.og.image[0].url;
+                        if ((_urlMetadata$og4 = urlMetadata.og) !== null && _urlMetadata$og4 !== void 0 && _urlMetadata$og4.title) metadata.ttl = (_urlMetadata$og$title = urlMetadata.og.title) === null || _urlMetadata$og$title === void 0 ? void 0 : _urlMetadata$og$title.slice(0, 100);
+                      }
+                      if (dismissedUrls.has(url)) {
+                        metadata.hld = true;
+                      }
+                      linkAttachment = _extends({
+                        type: attachmentTypes.link,
+                        data: url,
+                        upload: false
+                      }, Object.keys(metadata).length > 0 ? {
+                        metadata: metadata,
+                        name: metadata.ttl
+                      } : {
+                        metadata: {
+                          hld: true
+                        }
+                      });
+                    }
+                  }
+                  if (messageTexToSend !== null && messageTexToSend !== void 0 && messageTexToSend.trim() && !attachments.length) {
+                    if (linkAttachment) {
+                      messageToSend.attachments = [linkAttachment];
+                    }
+                    if (isPoll) {
+                      messageToSend.pollDetails = pollDetails;
+                      messageToSend.type = 'poll';
+                      messageToSend.body = messageTextForSend === null || messageTextForSend === void 0 ? void 0 : messageTextForSend.trim();
+                    }
+                    dispatch(sendTextMessageAC(messageToSend, activeChannel.id, connectionStatus));
+                  }
+                  var _temp = function () {
+                    if (attachments.length) {
+                      return Promise.resolve(waitForImageAttachmentPreparation(attachments, attachmentPreparationPromisesRef.current)).then(function () {
+                        var sendAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
+                        messageToSend.attachments = mergePreparedAttachmentPatches(attachments, preparedAttachmentPatchesRef.current).map(function (preparedAttachment) {
+                          return {
+                            name: preparedAttachment.data.name,
+                            data: preparedAttachment.data,
+                            attachmentUrl: preparedAttachment.attachmentUrl,
+                            tid: preparedAttachment.tid,
+                            cachedUrl: preparedAttachment.cachedUrl,
+                            upload: preparedAttachment.upload,
+                            metadata: preparedAttachment.metadata,
+                            type: preparedAttachment.type,
+                            size: preparedAttachment.size,
+                            thumbnailState: preparedAttachment.thumbnailState
+                          };
+                        });
+                        if (viewOnce && canShowViewOnceToggle) {
+                          messageToSend.viewOnce = true;
+                        }
+                        var attachmentsToSent = [].concat(messageToSend.attachments);
+                        if (linkAttachment && !messageToSend.viewOnce) {
+                          attachmentsToSent.push(linkAttachment);
+                        }
+                        dispatch(sendMessageAC(_extends({}, messageToSend, {
+                          attachments: attachmentsToSent
+                        }), activeChannel.id, connectionStatus, sendAsSeparateMessage));
+                        attachments.forEach(function (attachment) {
+                          attachmentPreparationPromisesRef.current["delete"](attachment.tid);
+                          preparedAttachmentPatchesRef.current["delete"](attachment.tid);
+                        });
+                      });
+                    }
+                  }();
+                  return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+                }
+              }();
+              if (_temp7 && _temp7.then) return _temp7.then(function () {});
             }
-            if (dismissedUrls.has(url)) {
-              metadata.hld = true;
+          }();
+          return _temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4);
+        } else {
+          if (typingTimout) {
+            if (!inTypingStateTimout) {
+              handleSendTypingState(true, code);
             }
-            linkAttachment = _extends({
-              type: attachmentTypes.link,
-              data: url,
-              upload: false
-            }, Object.keys(metadata).length > 0 ? {
-              metadata: metadata,
-              name: metadata.ttl
-            } : {
-              metadata: {
-                hld: true
-              }
-            });
-          }
-        }
-        if (messageTexToSend !== null && messageTexToSend !== void 0 && messageTexToSend.trim() && !attachments.length) {
-          if (linkAttachment) {
-            messageToSend.attachments = [linkAttachment];
-          }
-          if (isPoll) {
-            messageToSend.pollDetails = pollDetails;
-            messageToSend.type = 'poll';
-            messageToSend.body = messageTextForSend === null || messageTextForSend === void 0 ? void 0 : messageTextForSend.trim();
-          }
-          dispatch(sendTextMessageAC(messageToSend, activeChannel.id, connectionStatus));
-        }
-        if (attachments.length) {
-          var sendAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
-          messageToSend.attachments = attachments.map(function (attachment) {
-            return {
-              name: attachment.data.name,
-              data: attachment.data,
-              attachmentUrl: attachment.attachmentUrl,
-              tid: attachment.tid,
-              cachedUrl: attachment.cachedUrl,
-              upload: attachment.upload,
-              metadata: attachment.metadata,
-              type: attachment.type,
-              size: attachment.size,
-              thumbnailState: attachment.thumbnailState
-            };
-          });
-          if (viewOnce && canShowViewOnceToggle) {
-            messageToSend.viewOnce = true;
-          }
-          var attachmentsToSent = [].concat(messageToSend.attachments);
-          if (linkAttachment && !messageToSend.viewOnce) {
-            attachmentsToSent.push(linkAttachment);
+            clearTimeout(typingTimout);
+          } else {
+            handleSendTypingState(true, code);
           }
-          dispatch(sendMessageAC(_extends({}, messageToSend, {
-            attachments: attachmentsToSent
-          }), activeChannel.id, connectionStatus, sendAsSeparateMessage));
-        }
-        setMessageText('');
-        fileUploader.current.value = '';
-        if (inTypingState) {
-          handleSendTypingState(false);
+          setTypingTimout(setTimeout(function () {
+            setTypingTimout(0);
+          }, 2000));
         }
-        clearTimeout(typingTimout);
-        setTypingTimout(undefined);
-      }
-      setAttachments([]);
-      attachmentsUpdate = [];
-      removeDraftMessageFromMap(activeChannel.id);
-      dispatch(setChannelDraftMessageIsRemovedAC(activeChannel.id));
-      setViewOnce(false);
-      handleCloseReply();
-      setShouldClearEditor({
-        clear: true
-      });
-      setMentionedUsers([]);
-      setMessageBodyAttributes([]);
-      closePreviewWithAnimation(function () {
-        setDetectedUrl(null);
-        setDismissedUrls(new Set());
-      });
-      dispatch(setCloseSearchChannelsAC(true));
-    } else {
-      if (typingTimout) {
-        if (!inTypingStateTimout) {
-          handleSendTypingState(true, code);
-        }
-        clearTimeout(typingTimout);
-      } else {
-        handleSendTypingState(true, code);
-      }
-      setTypingTimout(setTimeout(function () {
-        setTypingTimout(0);
-      }, 2000));
+      }();
+      return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
     }
   };
   var handleEditMessage = function handleEditMessage() {
@@ -53200,6 +53289,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         return item.tid !== attachmentId;
       });
       clearVideoPreparation(attachmentId);
+      attachmentPreparationPromisesRef.current["delete"](attachmentId);
+      preparedAttachmentPatchesRef.current["delete"](attachmentId);
       releaseBlobUrls(["compose_" + attachmentId]);
       setAttachments(updatedAttachments);
       attachmentsUpdate = updatedAttachments;
@@ -53207,6 +53298,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       attachmentsUpdate.forEach(function (attachment) {
         return clearVideoPreparation(attachment.tid);
       });
+      attachmentPreparationPromisesRef.current.clear();
+      preparedAttachmentPatchesRef.current.clear();
       releaseBlobUrls(attachmentsUpdate.map(function (item) {
         return "compose_" + item.tid;
       }));
@@ -53283,14 +53376,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
             }
           }
         }
-        var _temp = function () {
+        var _temp8 = function () {
           if (allowUpload) {
             return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
           } else {
             showFileUploadError(errorMessage);
           }
         }();
-        return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+        return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -53341,14 +53434,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                 errorMessage = allowedMediaExtensionsErrorMessage != null ? allowedMediaExtensionsErrorMessage : "Invalid file type. Allowed extensions are: " + allowedMediaExtensions.join(', ') + ".";
               }
             }
-            var _temp2 = function () {
+            var _temp9 = function () {
               if (allowUpload) {
                 return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, true)).then(function () {});
               } else {
                 showFileUploadError(errorMessage);
               }
             }();
-            return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+            return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
           } catch (e) {
             return Promise.reject(e);
           }
@@ -53487,160 +53580,172 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         return [].concat(prevState, [attachment]);
       });
       var updateAttachment = function updateAttachment(patch) {
+        preparedAttachmentPatchesRef.current.set(tid, _extends({}, preparedAttachmentPatchesRef.current.get(tid), patch));
         setAttachments(function (prevState) {
           return prevState.map(function (current) {
             return current.tid === tid ? _extends({}, current, patch) : current;
           });
         });
       };
-      setTimeout(function () {
-        try {
-          var _temp1 = function () {
-            if (fileType === 'image') {
-              var _temp5 = _catch(function () {
-                return Promise.resolve(createImageThumbnail(file)).then(function (_ref5) {
-                  var thumbnail = _ref5.thumbnail,
-                    imageWidth = _ref5.imageWidth,
-                    imageHeight = _ref5.imageHeight;
-                  var _temp4 = function () {
-                    if (customUploader) {
-                      return Promise.resolve(resizeImage(file)).then(function (resizedFile) {
-                        var patch = {
-                          size: isMediaAttachment && resizedFile !== null && resizedFile !== void 0 && resizedFile.blob ? resizedFile.blob.size : file.size,
-                          metadata: {
-                            szw: imageWidth,
-                            szh: imageHeight,
-                            tmb: thumbnail
-                          }
-                        };
-                        updateAttachment(patch);
-                        handleAttachmentImageForCache(_extends({}, attachment, patch));
-                      });
-                    } else {
-                      var _temp10 = function () {
-                        if (isMediaAttachment && file.type !== 'image/gif') {
-                          return Promise.resolve(resizeImage(file)).then(function (resizedFileData) {
-                            var resizedFile = resizedFileData.blob ? new File([resizedFileData.blob], resizedFileData.file.name, {
-                              type: file.type
-                            }) : file;
+      var preparationPromise = new Promise(function (resolve) {
+        return setTimeout(function () {
+          try {
+            return Promise.resolve(_finallyRethrows(function () {
+              var _temp16 = function () {
+                if (fileType === 'image') {
+                  var _temp10 = _catch(function () {
+                    return Promise.resolve(createImageThumbnail(file)).then(function (_ref5) {
+                      var thumbnail = _ref5.thumbnail,
+                        imageWidth = _ref5.imageWidth,
+                        imageHeight = _ref5.imageHeight;
+                      var _temp1 = function () {
+                        if (customUploader) {
+                          return Promise.resolve(resizeImage(file)).then(function (resizedFile) {
                             var patch = {
-                              data: resizedFile,
-                              size: resizedFile.size,
-                              metadata: JSON.stringify({
-                                tmb: thumbnail,
-                                szw: resizedFileData.newWidth,
-                                szh: resizedFileData.newHeight
-                              })
+                              size: isMediaAttachment && resizedFile !== null && resizedFile !== void 0 && resizedFile.blob ? resizedFile.blob.size : file.size,
+                              metadata: {
+                                szw: imageWidth,
+                                szh: imageHeight,
+                                tmb: thumbnail
+                              }
                             };
                             updateAttachment(patch);
-                            setPendingAttachment(tid, {
-                              file: resizedFile
-                            });
                             handleAttachmentImageForCache(_extends({}, attachment, patch));
                           });
                         } else {
-                          updateAttachment({
-                            metadata: JSON.stringify({
-                              tmb: thumbnail,
-                              szw: imageWidth,
-                              szh: imageHeight
-                            })
-                          });
+                          var _temp17 = function () {
+                            if (isMediaAttachment && file.type !== 'image/gif') {
+                              return Promise.resolve(resizeImage(file)).then(function (resizedFileData) {
+                                var resizedFile = resizedFileData.blob ? new File([resizedFileData.blob], resizedFileData.file.name, {
+                                  type: file.type
+                                }) : file;
+                                var patch = {
+                                  data: resizedFile,
+                                  size: resizedFile.size,
+                                  metadata: JSON.stringify({
+                                    tmb: thumbnail,
+                                    szw: resizedFileData.newWidth,
+                                    szh: resizedFileData.newHeight
+                                  })
+                                };
+                                updateAttachment(patch);
+                                setPendingAttachment(tid, {
+                                  file: resizedFile
+                                });
+                                handleAttachmentImageForCache(_extends({}, attachment, patch));
+                              });
+                            } else {
+                              updateAttachment({
+                                metadata: JSON.stringify({
+                                  tmb: thumbnail,
+                                  szw: imageWidth,
+                                  szh: imageHeight
+                                })
+                              });
+                            }
+                          }();
+                          if (_temp17 && _temp17.then) return _temp17.then(function () {});
                         }
                       }();
-                      if (_temp10 && _temp10.then) return _temp10.then(function () {});
-                    }
-                  }();
-                  if (_temp4 && _temp4.then) return _temp4.then(function () {});
-                });
-              }, function (error) {
-                log.warn('Unable to prepare image attachment preview:', error);
-              });
-              if (_temp5 && _temp5.then) return _temp5.then(function () {});
-            } else {
-              var _temp11 = function () {
-                if (fileType === 'video') {
-                  var _temp9 = function _temp9() {
-                    return Promise.resolve(remuxPromise).then(function (uploadFile) {
-                      if (uploadFile !== file) {
-                        updateAttachment({
-                          data: uploadFile,
-                          size: uploadFile.size
-                        });
-                        setPendingAttachment(tid, {
-                          file: uploadFile
-                        });
-                      }
-                      if (metadata) {
-                        completeVideoPreparation(tid, {
-                          file: uploadFile,
-                          metadata: metadata
+                      if (_temp1 && _temp1.then) return _temp1.then(function () {});
+                    });
+                  }, function (error) {
+                    log.warn('Unable to prepare image attachment preview:', error);
+                  });
+                  if (_temp10 && _temp10.then) return _temp10.then(function () {});
+                } else {
+                  var _temp18 = function () {
+                    if (fileType === 'video') {
+                      var _temp14 = function _temp14() {
+                        return Promise.resolve(remuxPromise).then(function (uploadFile) {
+                          if (uploadFile !== file) {
+                            updateAttachment({
+                              data: uploadFile,
+                              size: uploadFile.size
+                            });
+                            setPendingAttachment(tid, {
+                              file: uploadFile
+                            });
+                          }
+                          if (metadata) {
+                            completeVideoPreparation(tid, {
+                              file: uploadFile,
+                              metadata: metadata
+                            });
+                          } else {
+                            failVideoPreparation(tid);
+                            updateAttachment({
+                              thumbnailState: 'failed'
+                            });
+                          }
                         });
-                      } else {
-                        failVideoPreparation(tid);
-                        updateAttachment({
-                          thumbnailState: 'failed'
+                      };
+                      var remuxPromise = remuxVideoFileForUpload(file);
+                      var thumbnailSource = file;
+                      var metadata;
+                      var _temp13 = _catch(function () {
+                        function _temp12() {
+                          var _frame = frame,
+                            thumb = _frame.thumb,
+                            width = _frame.width,
+                            height = _frame.height,
+                            duration = _frame.duration;
+                          metadata = customUploader ? {
+                            szw: width,
+                            szh: height,
+                            tmb: thumb,
+                            dur: duration
+                          } : JSON.stringify({
+                            tmb: thumb,
+                            szw: width,
+                            szh: height,
+                            dur: duration
+                          });
+                          updateAttachment({
+                            metadata: metadata,
+                            thumbnailState: 'ready'
+                          });
+                          handleAttachmentVideoForCache(_extends({}, attachment, {
+                            metadata: metadata
+                          }));
+                        }
+                        var frame;
+                        var _temp11 = _catch(function () {
+                          return Promise.resolve(getFrame(thumbnailSource, 0)).then(function (_getFrame) {
+                            frame = _getFrame;
+                          });
+                        }, function () {
+                          return Promise.resolve(remuxPromise).then(function (_remuxPromise) {
+                            thumbnailSource = _remuxPromise;
+                            return Promise.resolve(getFrame(thumbnailSource, 0)).then(function (_getFrame2) {
+                              frame = _getFrame2;
+                            });
+                          });
                         });
-                      }
-                    });
-                  };
-                  var remuxPromise = remuxVideoFileForUpload(file);
-                  var thumbnailSource = file;
-                  var metadata;
-                  var _temp8 = _catch(function () {
-                    function _temp7() {
-                      var _frame = frame,
-                        thumb = _frame.thumb,
-                        width = _frame.width,
-                        height = _frame.height,
-                        duration = _frame.duration;
-                      metadata = customUploader ? {
-                        szw: width,
-                        szh: height,
-                        tmb: thumb,
-                        dur: duration
-                      } : JSON.stringify({
-                        tmb: thumb,
-                        szw: width,
-                        szh: height,
-                        dur: duration
+                        return _temp11 && _temp11.then ? _temp11.then(_temp12) : _temp12(_temp11);
+                      }, function (error) {
+                        log.warn('Unable to generate video thumbnail:', error);
                       });
-                      updateAttachment({
-                        metadata: metadata,
-                        thumbnailState: 'ready'
-                      });
-                      handleAttachmentVideoForCache(_extends({}, attachment, {
-                        metadata: metadata
-                      }));
+                      return _temp13 && _temp13.then ? _temp13.then(_temp14) : _temp14(_temp13);
                     }
-                    var frame;
-                    var _temp6 = _catch(function () {
-                      return Promise.resolve(getFrame(thumbnailSource, 0)).then(function (_getFrame) {
-                        frame = _getFrame;
-                      });
-                    }, function () {
-                      return Promise.resolve(remuxPromise).then(function (_remuxPromise) {
-                        thumbnailSource = _remuxPromise;
-                        return Promise.resolve(getFrame(thumbnailSource, 0)).then(function (_getFrame2) {
-                          frame = _getFrame2;
-                        });
-                      });
-                    });
-                    return _temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6);
-                  }, function (error) {
-                    log.warn('Unable to generate video thumbnail:', error);
-                  });
-                  return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
+                  }();
+                  if (_temp18 && _temp18.then) return _temp18.then(function () {});
                 }
               }();
-              if (_temp11 && _temp11.then) return _temp11.then(function () {});
-            }
-          }();
-          return Promise.resolve(_temp1 && _temp1.then ? _temp1.then(function () {}) : void 0);
-        } catch (e) {
-          return Promise.reject(e);
-        }
-      }, 0);
+              if (_temp16 && _temp16.then) return _temp16.then(function () {});
+            }, function (_wasThrown, _result) {
+              resolve();
+              if (_wasThrown) throw _result;
+              return _result;
+            }));
+          } catch (e) {
+            return Promise.reject(e);
+          }
+        }, 0);
+      });
+      if (fileType === 'image') {
+        attachmentPreparationPromisesRef.current.set(tid, preparationPromise);
+      }
       return Promise.resolve();
     } catch (e) {
       return Promise.reject(e);
@@ -53700,14 +53805,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
               }
             }
           }
-          var _temp12 = function () {
+          var _temp19 = function () {
             if (allowUpload) {
               return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
             } else {
               showFileUploadError(errorMessage);
             }
           }();
-          return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(function () {}) : void 0);
+          return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }