sceyt-chat-react-uikit 1.9.0-beta.17 → 1.9.0-beta.18

package/index.js

@@ -13434,6 +13434,21 @@ function addReactionToMessageOnMap(channelId, message, reaction, isSelf) {
     });
   }
 }
+var removeReactionFromTotals = function removeReactionFromTotals(reactionTotals, reactionKey) {
+  if (reactionTotals === void 0) {
+    reactionTotals = [];
+  }
+  return reactionTotals.reduce(function (totals, reactionTotal) {
+    if (reactionTotal.key !== reactionKey) {
+      totals.push(reactionTotal);
+    } else if (reactionTotal.count > 1) {
+      totals.push(_extends({}, reactionTotal, {
+        count: reactionTotal.count - 1
+      }));
+    }
+    return totals;
+  }, []);
+};
 function removeReactionToMessageOnMap(channelId, message, reaction, isSelf) {
   if (messagesMap[channelId]) {
     var messageShouldBeUpdated = messagesMap[channelId][message.id];
@@ -13450,7 +13465,7 @@ function removeReactionToMessageOnMap(channelId, message, reaction, isSelf) {
       delete messagesMap[channelId][message.tid];
     }
     messagesMap[channelId][message.id || message.tid] = _extends({}, messageShouldBeUpdated, {
-      reactionTotals: message.reactionTotals || messageShouldBeUpdated.reactionTotals || [],
+      reactionTotals: removeReactionFromTotals(messageShouldBeUpdated.reactionTotals, reaction.key),
       userReactions: userReactions
     });
   }
@@ -14204,7 +14219,7 @@ var messageSlice = createSlice({
             });
           }
           return _extends({}, msg, {
-            reactionTotals: message.reactionTotals || msg.reactionTotals || [],
+            reactionTotals: removeReactionFromTotals(msg.reactionTotals, reaction.key),
             userReactions: userReactions
           });
         }
@@ -22308,7 +22323,8 @@ function deleteReaction(action) {
         }
         channelUpdateParam = {
           userMessageReactions: [],
-          lastReactedMessage: null
+          lastReactedMessage: null,
+          newReactions: []
         };
         _context40.n = 3;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam));
@@ -23904,7 +23920,7 @@ function MessageSaga() {
         return effects.takeEvery(CANCEL_CHANNEL_MESSAGE_PROCESSES, cancelChannelMessageProcesses);
       case 22:
         _context65.n = 23;
-        return effects.takeEvery(GET_REACTIONS, getReactions);
+        return effects.takeLatest(GET_REACTIONS, getReactions);
       case 23:
         _context65.n = 24;
         return effects.takeEvery(LOAD_MORE_REACTIONS, loadMoreReactions);
@@ -39825,6 +39841,7 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
     markPreferredSourceLoaded = _useProgressiveMediaS.markPreferredSourceLoaded;
   var isExtractingRef = React.useRef(false);
   var hasExtractionFailedRef = React.useRef(false);
+  var previousVideoSourceRef = React.useRef(undefined);
   React.useEffect(function () {
     if (!videoThumb || downloadedPreviewImage) return;
     var cancelled = false;
@@ -39841,10 +39858,16 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
   }, [videoThumb, downloadedPreviewImage, dispatch, messageType]);
   React.useEffect(function () {
     var videoSource = src;
-    if (!videoSource || !shouldExtractVideoFirstFrame(file.metadata) || isExtractingRef.current || hasExtractionFailedRef.current) return;
+    var canExtractFirstFrame = shouldExtractVideoFirstFrame(file.metadata);
+    if (previousVideoSourceRef.current !== videoSource) {
+      previousVideoSourceRef.current = videoSource;
+      hasExtractionFailedRef.current = false;
+    }
+    if (!videoSource || !canExtractFirstFrame || isExtractingRef.current || hasExtractionFailedRef.current) {
+      return;
+    }
     if (attachmentVideoFirstFrame || isPreview && setVideoIsReadyToSend) return;
     var frameCacheKey = typeof file.url === 'string' ? file.url : undefined;
-    hasExtractionFailedRef.current = false;
     var checkCache = function checkCache() {
       try {
         var _exit = false;
@@ -40566,6 +40589,9 @@ var Attachment = function Attachment(_ref) {
     var _getVideoAttachmentCa = getVideoAttachmentCacheKeys(attachment.url, attachment.metadata),
       videoThumb = _getVideoAttachmentCa.videoThumb,
       originalVideoCacheKey = _getVideoAttachmentCa.originalVideo;
+    if (sharedOriginalVideoDownload.state === 'completed' && originalVideoDownloadStartedRef.current) {
+      originalVideoDownloadStartedRef.current = false;
+    }
     if (typeof originalVideoUrlFromMap === 'string') {
       setAttachmentUrl(originalVideoUrlFromMap);
       setIsCached(true);
@@ -40644,7 +40670,7 @@ var Attachment = function Attachment(_ref) {
     return function () {
       cancelled = true;
     };
-  }, [attachment.id, attachment.type, attachment.url, attachment.metadata, attachment.attachmentUrl, isDetailsView, originalVideoUrlFromMap, connectionStatus, dispatch, messageType, attachment.size, videoDownloadRetry, isSharedOriginalVideoCancelled]);
+  }, [attachment.id, attachment.type, attachment.url, attachment.metadata, attachment.attachmentUrl, isDetailsView, originalVideoUrlFromMap, connectionStatus, dispatch, messageType, attachment.size, videoDownloadRetry, isSharedOriginalVideoCancelled, sharedOriginalVideoDownload.state]);
   var handleResumeOriginalVideoDownload = function handleResumeOriginalVideoDownload(event) {
     event.stopPropagation();
     if (!attachment.url) return;
@@ -49421,6 +49447,13 @@ function ReactionsPopup(_ref) {
   var _useState = React.useState('all'),
     activeTabKey = _useState[0],
     setActiveTabKey = _useState[1];
+  var reactionTotalsSignature = reactionTotals.map(function (_ref2) {
+    var key = _ref2.key,
+      count = _ref2.count,
+      score = _ref2.score;
+    return key + ":" + count + ":" + score;
+  }).join('|');
+  var reactionTotalsSignatureRef = React.useRef(reactionTotalsSignature);
   var _useState2 = React.useState(0),
     popupHeight = _useState2[0],
     setPopupHeight = _useState2[1];
@@ -49449,7 +49482,7 @@ function ReactionsPopup(_ref) {
     }
   };
   var handleClicks = function handleClicks(e) {
-    if (e.target.closest('.reactions_popup')) {
+    if (e.target.closest('.reactions_popup') || e.target.closest('[data-reactions-container]')) {
       return;
     }
     if (closeIsApproved) {
@@ -49481,6 +49514,19 @@ function ReactionsPopup(_ref) {
       handleReactionsPopupClose();
     }
   }, [reactionTotals]);
+  React.useEffect(function () {
+    if (reactionTotalsSignatureRef.current === reactionTotalsSignature || !reactionTotals.length) {
+      return;
+    }
+    reactionTotalsSignatureRef.current = reactionTotalsSignature;
+    var nextActiveTabKey = activeTabKey !== 'all' && reactionTotals.some(function (reaction) {
+      return reaction.key === activeTabKey;
+    }) ? activeTabKey : 'all';
+    if (nextActiveTabKey !== activeTabKey) {
+      setActiveTabKey(nextActiveTabKey);
+    }
+    handleGetReactions(nextActiveTabKey === 'all' ? undefined : nextActiveTabKey);
+  }, [activeTabKey, reactionTotals, reactionTotalsSignature]);
   var reactionsHeight = React.useMemo(function () {
     return reactions.length * 50 + 45;
   }, [reactions]);
@@ -55124,21 +55170,6 @@ var Emoji$1 = styled__default.li(_templateObject8$m || (_templateObject8$m = _ta
   return props.hoverBackgroundColor;
 });
 
-var isVideoAttachment = function isVideoAttachment(attachment) {
-  var _attachment$data, _attachment$data$type;
-  return attachment.type === attachmentTypes.video || ((_attachment$data = attachment.data) === null || _attachment$data === void 0 ? void 0 : (_attachment$data$type = _attachment$data.type) === null || _attachment$data$type === void 0 ? void 0 : _attachment$data$type.startsWith('video/'));
-};
-var waitForMediaAttachmentPreparation = function waitForMediaAttachmentPreparation(attachments, preparations) {
-  try {
-    return Promise.resolve(Promise.all(attachments.filter(function (attachment) {
-      return attachment.type === attachmentTypes.image || isVideoAttachment(attachment);
-    }).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);
@@ -56896,33 +56927,36 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   var _useState22 = React.useState(false),
     sendMessageIsActive = _useState22[0],
     setSendMessageIsActive = _useState22[1];
-  var _useState23 = React.useState([]),
-    attachments = _useState23[0],
-    setAttachments = _useState23[1];
-  var _useState24 = React.useState(false),
-    forwardPopupOpen = _useState24[0],
-    setForwardPopupOpen = _useState24[1];
+  var _useState23 = React.useState(false),
+    isSendMessageInFlight = _useState23[0],
+    setIsSendMessageInFlight = _useState23[1];
+  var _useState24 = React.useState([]),
+    attachments = _useState24[0],
+    setAttachments = _useState24[1];
   var _useState25 = React.useState(false),
-    deletePopupOpen = _useState25[0],
-    setDeletePopupOpen = _useState25[1];
+    forwardPopupOpen = _useState25[0],
+    setForwardPopupOpen = _useState25[1];
   var _useState26 = React.useState(false),
-    isIncomingMessage = _useState26[0],
-    setIsIncomingMessage = _useState26[1];
-  var _useState27 = React.useState('.jpg,.jpeg,.png,.gif,.mp4,.mov,.avi,.wmv,.flv,.webm,.jfif'),
-    mediaExtensions = _useState27[0],
-    setMediaExtensions = _useState27[1];
-  var _useState28 = React.useState(''),
-    uploadErrorMessage = _useState28[0],
-    setUploadErrorMessage = _useState28[1];
-  var _useState29 = React.useState(false),
-    viewOnce = _useState29[0],
-    setViewOnce = _useState29[1];
-  var _useState30 = React.useState(areDraftMessagesHydrated()),
-    draftsHydrated = _useState30[0],
-    setDraftsHydrated = _useState30[1];
-  var _useState31 = React.useState(activeChannel.id || ''),
-    composerChannelId = _useState31[0],
-    setComposerChannelId = _useState31[1];
+    deletePopupOpen = _useState26[0],
+    setDeletePopupOpen = _useState26[1];
+  var _useState27 = React.useState(false),
+    isIncomingMessage = _useState27[0],
+    setIsIncomingMessage = _useState27[1];
+  var _useState28 = React.useState('.jpg,.jpeg,.png,.gif,.mp4,.mov,.avi,.wmv,.flv,.webm,.jfif'),
+    mediaExtensions = _useState28[0],
+    setMediaExtensions = _useState28[1];
+  var _useState29 = React.useState(''),
+    uploadErrorMessage = _useState29[0],
+    setUploadErrorMessage = _useState29[1];
+  var _useState30 = React.useState(false),
+    viewOnce = _useState30[0],
+    setViewOnce = _useState30[1];
+  var _useState31 = React.useState(areDraftMessagesHydrated()),
+    draftsHydrated = _useState31[0],
+    setDraftsHydrated = _useState31[1];
+  var _useState32 = React.useState(activeChannel.id || ''),
+    composerChannelId = _useState32[0],
+    setComposerChannelId = _useState32[1];
   var typingOrRecordingIndicator = useSelector(typingOrRecordingIndicatorArraySelector(activeChannel.id));
   var contactsMap = useSelector(contactsMapSelector);
   var connectionStatus = useSelector(connectionStatusSelector, reactRedux.shallowEqual);
@@ -56935,40 +56969,47 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   var metadataDebounceRef = React.useRef(null);
   var attachmentPreparationPromisesRef = React.useRef(new Map());
   var preparedAttachmentPatchesRef = React.useRef(new Map());
+  var isSendMessageInFlightRef = React.useRef(false);
   var sendMessageWrapperRef = React.useRef(null);
   var restoringDraftRef = React.useRef(false);
   var restoredDraftChannelIdRef = React.useRef(null);
   var isNavigatingChannelRef = React.useRef(false);
-  var _useState32 = React.useState(),
-    realEditorState = _useState32[0],
-    setRealEditorState = _useState32[1];
-  var _useState33 = React.useState(null),
-    floatingAnchorElem = _useState33[0],
-    setFloatingAnchorElem = _useState33[1];
-  var _useState34 = React.useState(false),
-    isSmallWidthViewport = _useState34[0],
-    setIsSmallWidthViewport = _useState34[1];
+  var releaseSendMessageLock = function releaseSendMessageLock() {
+    Promise.resolve().then(function () {
+      isSendMessageInFlightRef.current = false;
+      setIsSendMessageInFlight(false);
+    });
+  };
+  var _useState33 = React.useState(),
+    realEditorState = _useState33[0],
+    setRealEditorState = _useState33[1];
+  var _useState34 = React.useState(null),
+    floatingAnchorElem = _useState34[0],
+    setFloatingAnchorElem = _useState34[1];
   var _useState35 = React.useState(false),
-    isScrolling = _useState35[0],
-    setIsScrolling = _useState35[1];
-  var _useState36 = React.useState(null),
-    linkPreview = _useState36[0],
-    setLinkPreview = _useState36[1];
+    isSmallWidthViewport = _useState35[0],
+    setIsSmallWidthViewport = _useState35[1];
+  var _useState36 = React.useState(false),
+    isScrolling = _useState36[0],
+    setIsScrolling = _useState36[1];
   var _useState37 = React.useState(null),
-    detectedUrl = _useState37[0],
-    setDetectedUrl = _useState37[1];
-  var _useState38 = React.useState(new Set()),
-    dismissedUrls = _useState38[0],
-    setDismissedUrls = _useState38[1];
-  var _useState39 = React.useState(false),
-    isClosingPreview = _useState39[0],
-    setIsClosingPreview = _useState39[1];
+    linkPreview = _useState37[0],
+    setLinkPreview = _useState37[1];
+  var _useState38 = React.useState(null),
+    detectedUrl = _useState38[0],
+    setDetectedUrl = _useState38[1];
+  var _useState39 = React.useState(new Set()),
+    dismissedUrls = _useState39[0],
+    setDismissedUrls = _useState39[1];
   var _useState40 = React.useState(false),
-    replyLinkPreviewImageFailed = _useState40[0],
-    setReplyLinkPreviewImageFailed = _useState40[1];
+    isClosingPreview = _useState40[0],
+    setIsClosingPreview = _useState40[1];
   var _useState41 = React.useState(false),
-    linkPreviewImageFailed = _useState41[0],
-    setLinkPreviewImageFailed = _useState41[1];
+    replyLinkPreviewImageFailed = _useState41[0],
+    setReplyLinkPreviewImageFailed = _useState41[1];
+  var _useState42 = React.useState(false),
+    linkPreviewImageFailed = _useState42[0],
+    setLinkPreviewImageFailed = _useState42[1];
   var addAttachmentByMenu = showChooseFileAttachment && showChooseMediaAttachment;
   var linkify = new LinkifyIt();
   var oGMetadata = useSelector(function (state) {
@@ -57235,178 +57276,167 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           });
         }
       }
-      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));
-          };
+      if (shouldSend && !mentionsIsOpen) {
+        if (isSendMessageInFlightRef.current) {
           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 (hasSendableTextOrPoll(messageTexToSend, isPoll) && !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(waitForMediaAttachmentPreparation(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: getOutgoingAttachmentType(preparedAttachment),
-                            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);
+          return Promise.resolve();
+        }
+        isSendMessageInFlightRef.current = true;
+        setIsSendMessageInFlight(true);
+        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);
                 }
-              }();
-              if (_temp7 && _temp7.then) return _temp7.then(function () {});
+                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
+                }
+              });
             }
-          }();
-          return _temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4);
-        } else {
-          if (typingTimout) {
-            if (!inTypingStateTimout) {
-              handleSendTypingState(true, code);
+          }
+          if (hasSendableTextOrPoll(messageTexToSend, isPoll) && !attachments.length) {
+            if (linkAttachment) {
+              messageToSend.attachments = [linkAttachment];
             }
-            clearTimeout(typingTimout);
-          } else {
+            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 = 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: getOutgoingAttachmentType(preparedAttachment),
+                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);
+            });
+          }
+          setMessageText('');
+          fileUploader.current.value = '';
+          if (inTypingState) {
+            handleSendTypingState(false);
+          }
+          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));
+        releaseSendMessageLock();
+      } else {
+        if (typingTimout) {
+          if (!inTypingStateTimout) {
             handleSendTypingState(true, code);
           }
-          setTypingTimout(setTimeout(function () {
-            setTypingTimout(0);
-          }, 2000));
+          clearTimeout(typingTimout);
+        } else {
+          handleSendTypingState(true, code);
         }
-      }();
-      return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
+        setTypingTimout(setTimeout(function () {
+          setTypingTimout(0);
+        }, 2000));
+      }
+      return Promise.resolve();
     } catch (e) {
       return Promise.reject(e);
     }
@@ -57594,14 +57624,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     filesToProcess.forEach(function (file) {
       try {
         var validationError = isMediaAttachment ? validateMediaAttachment(file) : null;
-        var _temp8 = function () {
+        var _temp = function () {
           if (!validationError) {
             return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
           } else {
             showFileUploadError(validationError);
           }
         }();
-        return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
+        return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -57640,21 +57670,21 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           try {
             var mediaValidationError = validateMediaAttachment(file);
             var canAddAsMedia = showChooseMediaAttachment && !mediaValidationError;
-            var _temp0 = function () {
+            var _temp3 = function () {
               if (canAddAsMedia) {
                 return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, true)).then(function () {});
               } else {
-                var _temp1 = function () {
+                var _temp4 = function () {
                   if (showChooseFileAttachment) {
                     return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, false)).then(function () {});
                   } else {
                     showFileUploadError(mediaValidationError || allowedMediaExtensionsErrorMessage || UNSUPPORTED_PASTED_FILE_MESSAGE);
                   }
                 }();
-                if (_temp1 && _temp1.then) return _temp1.then(function () {});
+                if (_temp4 && _temp4.then) return _temp4.then(function () {});
               }
             }();
-            return Promise.resolve(_temp0 && _temp0.then ? _temp0.then(function () {}) : void 0);
+            return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
           } catch (e) {
             return Promise.reject(e);
           }
@@ -57790,14 +57820,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         return setTimeout(function () {
           try {
             return Promise.resolve(_finallyRethrows(function () {
-              var _temp18 = function () {
+              var _temp11 = function () {
                 if (fileType === 'image') {
-                  var _temp12 = _catch(function () {
+                  var _temp7 = _catch(function () {
                     return Promise.resolve(createImageThumbnail(file)).then(function (_ref5) {
                       var thumbnail = _ref5.thumbnail,
                         imageWidth = _ref5.imageWidth,
                         imageHeight = _ref5.imageHeight;
-                      var _temp11 = function () {
+                      var _temp6 = function () {
                         if (customUploader) {
                           return Promise.resolve(resizeImage(file)).then(function (resizedFile) {
                             var patch = {
@@ -57812,7 +57842,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                             handleAttachmentImageForCache(_extends({}, attachment, patch));
                           });
                         } else {
-                          var _temp19 = function () {
+                          var _temp12 = 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, {
@@ -57843,19 +57873,19 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                               });
                             }
                           }();
-                          if (_temp19 && _temp19.then) return _temp19.then(function () {});
+                          if (_temp12 && _temp12.then) return _temp12.then(function () {});
                         }
                       }();
-                      if (_temp11 && _temp11.then) return _temp11.then(function () {});
+                      if (_temp6 && _temp6.then) return _temp6.then(function () {});
                     });
                   }, function (error) {
                     log.warn('Unable to prepare image attachment preview:', error);
                   });
-                  if (_temp12 && _temp12.then) return _temp12.then(function () {});
+                  if (_temp7 && _temp7.then) return _temp7.then(function () {});
                 } else {
-                  var _temp20 = function () {
+                  var _temp13 = function () {
                     if (fileType === 'video') {
-                      var _temp16 = function _temp16() {
+                      var _temp1 = function _temp1() {
                         return Promise.resolve(remuxPromise).then(function (uploadFile) {
                           if (uploadFile !== file) {
                             updateAttachment({
@@ -57885,8 +57915,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                       var thumbnailSource = file;
                       var metadata;
                       var frame;
-                      var _temp15 = _catch(function () {
-                        function _temp14() {
+                      var _temp0 = _catch(function () {
+                        function _temp9() {
                           var _frame2 = frame,
                             thumb = _frame2.thumb,
                             width = _frame2.width,
@@ -57910,7 +57940,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                           dispatch(setUpdateMessageAttachmentAC(thumb, frame.frameBlobUrl));
                           setVideoIsReadyToSend(tid);
                         }
-                        var _temp13 = _catch(function () {
+                        var _temp8 = _catch(function () {
                           return Promise.resolve(getFrame(thumbnailSource, 0)).then(function (_getFrame) {
                             frame = _getFrame;
                           });
@@ -57922,17 +57952,17 @@ var SendMessageInput = function SendMessageInput(_ref3) {
                             });
                           });
                         });
-                        return _temp13 && _temp13.then ? _temp13.then(_temp14) : _temp14(_temp13);
+                        return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
                       }, function (error) {
                         log.warn('Unable to generate video thumbnail:', error);
                       });
-                      return _temp15 && _temp15.then ? _temp15.then(_temp16) : _temp16(_temp15);
+                      return _temp0 && _temp0.then ? _temp0.then(_temp1) : _temp1(_temp0);
                     }
                   }();
-                  if (_temp20 && _temp20.then) return _temp20.then(function () {});
+                  if (_temp13 && _temp13.then) return _temp13.then(function () {});
                 }
               }();
-              if (_temp18 && _temp18.then) return _temp18.then(function () {});
+              if (_temp11 && _temp11.then) return _temp11.then(function () {});
             }, function (_wasThrown, _result) {
               resolve();
               if (_wasThrown) throw _result;
@@ -57990,14 +58020,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       filesToProcess.forEach(function (file) {
         try {
           var validationError = isMediaAttachment ? validateMediaAttachment(file) : null;
-          var _temp21 = function () {
+          var _temp14 = function () {
             if (!validationError) {
               return Promise.resolve(handleAddAttachmentWithViewOnceCheck(file, isMediaAttachment)).then(function () {});
             } else {
               showFileUploadError(validationError);
             }
           }();
-          return Promise.resolve(_temp21 && _temp21.then ? _temp21.then(function () {}) : void 0);
+          return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -58347,11 +58377,16 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     return linkPreview && linkPreview.metadata && !isDescriptionOnlySymbol((_linkPreview$metadata = linkPreview.metadata.og) === null || _linkPreview$metadata === void 0 ? void 0 : _linkPreview$metadata.description) && (((_linkPreview$metadata2 = linkPreview.metadata.og) === null || _linkPreview$metadata2 === void 0 ? void 0 : _linkPreview$metadata2.title) || ((_linkPreview$metadata3 = linkPreview.metadata.og) === null || _linkPreview$metadata3 === void 0 ? void 0 : _linkPreview$metadata3.description) || ((_linkPreview$metadata4 = linkPreview.metadata.og) === null || _linkPreview$metadata4 === void 0 ? void 0 : (_linkPreview$metadata5 = _linkPreview$metadata4.image) === null || _linkPreview$metadata5 === void 0 ? void 0 : (_linkPreview$metadata6 = _linkPreview$metadata5[0]) === null || _linkPreview$metadata6 === void 0 ? void 0 : _linkPreview$metadata6.url) || ((_linkPreview$metadata7 = linkPreview.metadata.og) === null || _linkPreview$metadata7 === void 0 ? void 0 : (_linkPreview$metadata8 = _linkPreview$metadata7.favicon) === null || _linkPreview$metadata8 === void 0 ? void 0 : _linkPreview$metadata8.url));
   }, [linkPreview]);
   React.useEffect(function () {
-    if (messageContRef && messageContRef.current) {
-      setTimeout(function () {
-        dispatch(setSendMessageInputHeightAC(messageContRef.current.getBoundingClientRect().height));
-      }, 301);
-    }
+    if (!messageContRef.current) return undefined;
+    var timeout = setTimeout(function () {
+      var messageContainer = messageContRef.current;
+      if (messageContainer) {
+        dispatch(setSendMessageInputHeightAC(messageContainer.getBoundingClientRect().height));
+      }
+    }, 301);
+    return function () {
+      return clearTimeout(timeout);
+    };
   }, [showLinkPreview]);
   return /*#__PURE__*/React__default.createElement(SendMessageWrapper, {
     ref: sendMessageWrapperRef,
@@ -58750,11 +58785,11 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     anchorElem: floatingAnchorElem
   })))))))), sendMessageIsActive || attachments.length > 0 || !voiceMessage && !((_getAudioRecordingFro2 = getAudioRecordingFromMap(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.id)) !== null && _getAudioRecordingFro2 !== void 0 && _getAudioRecordingFro2.file) || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
     isCustomButton: CustomSendMessageButton,
-    isActive: sendMessageIsActive,
+    isActive: sendMessageIsActive && !isSendMessageInFlight,
     order: sendIconOrder,
     color: backgroundSections,
     height: inputContainerHeight || minHeight,
-    onClick: sendMessageIsActive ? handleSendEditMessage : null,
+    onClick: sendMessageIsActive && !isSendMessageInFlight ? handleSendEditMessage : null,
     iconColor: accentColor,
     activeColor: accentColor
   }, CustomSendMessageButton || /*#__PURE__*/React__default.createElement(SvgSend, null))) : (/*#__PURE__*/React__default.createElement(SendMessageButton, {