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

package/index.js

@@ -8498,6 +8498,31 @@ var getAllowEditDeleteIncomingMessage = function getAllowEditDeleteIncomingMessa
 var compareMessageBodyAttributes = function compareMessageBodyAttributes(attributes1, attributes2) {
   return JSON.stringify(attributes1) === JSON.stringify(attributes2);
 };
+var trimMessageBodyWithAttributes = function trimMessageBodyWithAttributes(text, attributes) {
+  var body = text.trim();
+  var leadingTrim = text.length - text.trimStart().length;
+  var bodyAttributes = (attributes || []).map(function (att) {
+    var offset = att.offset - leadingTrim;
+    var length = att.length;
+    if (offset < 0) {
+      length += offset;
+      offset = 0;
+    }
+    if (offset + length > body.length) {
+      length = body.length - offset;
+    }
+    return _extends({}, att, {
+      offset: offset,
+      length: length
+    });
+  }).filter(function (att) {
+    return att.length > 0 && att.offset >= 0 && att.offset < body.length;
+  });
+  return {
+    body: body,
+    bodyAttributes: bodyAttributes
+  };
+};
 var bodyAttributesMapByType = {
   1: ['bold'],
   2: ['italic'],
@@ -16014,6 +16039,10 @@ var SDKErrorTypeEnum = {
   Authentication: {
     value: 'Authentication',
     isResendable: true
+  },
+  AttachmentUnavailable: {
+    value: 'AttachmentUnavailable',
+    isResendable: false
   }
 };
 var fromValue = function fromValue(value) {
@@ -16031,6 +16060,11 @@ var isResendableError = function isResendableError(value) {
   var errorType = fromValue(value);
   return (_errorType$isResendab = errorType === null || errorType === void 0 ? void 0 : errorType.isResendable) != null ? _errorType$isResendab : true;
 };
+var createAttachmentUnavailableError = function createAttachmentUnavailableError(message) {
+  var error = new Error(message);
+  error.type = SDKErrorTypeEnum.AttachmentUnavailable.value;
+  return error;
+};
 
 var _excluded$1 = ["lastMessage"];
 var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
@@ -16093,6 +16127,8 @@ var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
   _marked56 = /*#__PURE__*/_regenerator().m(loadMorePollVotes),
   _marked57 = /*#__PURE__*/_regenerator().m(refreshCacheAroundMessage),
   _marked58 = /*#__PURE__*/_regenerator().m(MessageSaga);
+var MAX_AUTO_RESEND_ATTEMPTS = 5;
+var autoResendAttempts = new Map();
 var loadMoreMessagesInFlight = new Set();
 var prefetchInFlight = new Set();
 var queuedPrefetchRequests = new Map();
@@ -16316,6 +16352,7 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
   try {
     return Promise.resolve(Promise.all(attachments.map(function (attachment) {
       try {
+        var _attachment$url, _attachment$url$type;
         var _temp10 = function _temp10() {
           function _temp0() {
             store.dispatch(updateAttachmentUploadingStateAC(UPLOAD_STATE.SUCCESS, attachment.tid));
@@ -16337,14 +16374,15 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
             return attachmentToSend;
           }
           var _temp9 = function () {
-            if (!attachment.cachedUrl && attachment.url.type.split('/')[0] === 'image') {
+            if (!attachment.cachedUrl && fileType === 'image') {
               return _catch(function () {
                 var _temp2 = function () {
                   if (blobLocal && blobLocal.type.startsWith('image/')) {
+                    var _attachment, _attachment2;
                     var file = attachment.url instanceof File ? attachment.url : new File([attachment.url], attachment.name || 'image', {
                       type: attachment.url.type || blobLocal.type
                     });
-                    var _calculateRenderedIma = calculateRenderedImageWidth((attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szw) || 1280, (attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szh) || 1080),
+                    var _calculateRenderedIma = calculateRenderedImageWidth(((_attachment = attachment) === null || _attachment === void 0 ? void 0 : _attachment.metadata.szw) || 1280, ((_attachment2 = attachment) === null || _attachment2 === void 0 ? void 0 : _attachment2.metadata.szh) || 1080),
                       newWidth = _calculateRenderedIma[0],
                       newHeight = _calculateRenderedIma[1];
                     return Promise.resolve(resizeImageWithPica(file, newWidth, newHeight, 1)).then(function (_ref) {
@@ -16382,10 +16420,11 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
               });
             } else {
               var _temp11 = function () {
-                if (!attachment.cachedUrl && attachment.url.type.split('/')[0] === 'video') {
+                if (!attachment.cachedUrl && fileType === 'video') {
                   var _temp7 = function () {
                     if (blobLocal) {
-                      var _calculateRenderedIma2 = calculateRenderedImageWidth((attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szw) || 1280, (attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szh) || 1080),
+                      var _attachment3, _attachment4;
+                      var _calculateRenderedIma2 = calculateRenderedImageWidth(((_attachment3 = attachment) === null || _attachment3 === void 0 ? void 0 : _attachment3.metadata.szw) || 1280, ((_attachment4 = attachment) === null || _attachment4 === void 0 ? void 0 : _attachment4.metadata.szh) || 1080),
                         newWidth = _calculateRenderedIma2[0],
                         newHeight = _calculateRenderedIma2[1];
                       return Promise.resolve(getVideoFirstFrame(blobLocal, newWidth, newHeight)).then(function (result) {
@@ -16443,7 +16482,19 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
             total = _ref2.total;
           store.dispatch(updateAttachmentUploadingProgressAC(loaded, total, attachment.tid));
         };
-        var fileType = attachment.url.type.split('/')[0];
+        if (!attachment.cachedUrl && !(attachment.url instanceof Blob)) {
+          var _getPendingAttachment;
+          var pendingFile = (_getPendingAttachment = getPendingAttachment(attachment.tid)) === null || _getPendingAttachment === void 0 ? void 0 : _getPendingAttachment.file;
+          if (pendingFile instanceof Blob) {
+            attachment = _extends({}, attachment, {
+              url: pendingFile,
+              data: pendingFile
+            });
+          } else {
+            throw createAttachmentUnavailableError("Attachment file for tid " + attachment.tid + " is no longer available for upload");
+          }
+        }
+        var fileType = (_attachment$url = attachment.url) === null || _attachment$url === void 0 ? void 0 : (_attachment$url$type = _attachment$url.type) === null || _attachment$url$type === void 0 ? void 0 : _attachment$url$type.split('/')[0];
         var fileSize = attachment.size;
         var filePath;
         var uriLocal;
@@ -16946,11 +16997,19 @@ function sendMessage(action) {
           break;
         }
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
+          var attachment, _getPendingAttachment2, pendingFile, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
           return _regenerator().w(function (_context11) {
             while (1) switch (_context11.n) {
               case 0:
                 attachment = mediaAttachments[i];
+                if (customUploader && !attachment.cachedUrl && !(attachment.data instanceof Blob)) {
+                  pendingFile = (_getPendingAttachment2 = getPendingAttachment(attachment.tid)) === null || _getPendingAttachment2 === void 0 ? void 0 : _getPendingAttachment2.file;
+                  if (pendingFile instanceof Blob) {
+                    attachment = _extends({}, attachment, {
+                      data: pendingFile
+                    });
+                  }
+                }
                 if (attachment.cachedUrl) {
                   uri = attachment.cachedUrl;
                 }
@@ -17251,6 +17310,9 @@ function sendMessage(action) {
                 return effects.call(channel.sendMessage, messageToSend);
               case 5:
                 messageResponse = _context12.v;
+                if (messageToSend.tid) {
+                  autoResendAttempts["delete"](messageToSend.tid);
+                }
                 if (!customUploader) {
                   _context12.n = 10;
                   break;
@@ -17783,12 +17845,17 @@ function forwardMessage(action) {
 }
 function resendMessage(action) {
   var _message$attachments;
-  var payload, message, connectionState, channelId, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
+  var payload, payloadMessage, connectionState, channelId, liveMessage, message, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
+        payloadMessage = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
+        liveMessage = payloadMessage !== null && payloadMessage !== void 0 && payloadMessage.tid || payloadMessage !== null && payloadMessage !== void 0 && payloadMessage.id ? getMessageFromMap(channelId, payloadMessage.tid || payloadMessage.id) : null;
+        message = liveMessage || payloadMessage;
+        if (message !== null && message !== void 0 && message.tid || message !== null && message !== void 0 && message.id) {
+          autoResendAttempts["delete"](message.tid || message.id);
+        }
         attachments = message === null || message === void 0 ? void 0 : (_message$attachments = message.attachments) === null || _message$attachments === void 0 ? void 0 : _message$attachments.filter(function (att) {
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
@@ -17983,7 +18050,7 @@ function editMessage(action) {
   }, _marked14, null, [[0, 8]]);
 }
 var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connectionState) {
-  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, pendingPollActionsMap, _t7, _t8, _t9;
+  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, resendKey, attempts, pendingPollActionsMap, _t7, _t8, _t9;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -17991,26 +18058,41 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
         _t7 = _regeneratorKeys(pendingMessagesMap);
       case 1:
         if ((_t8 = _t7()).done) {
-          _context19.n = 12;
+          _context19.n = 13;
           break;
         }
         channelId = _t8.value;
         _iterator3 = _createForOfIteratorHelperLoose(pendingMessagesMap[channelId]);
       case 2:
         if ((_step3 = _iterator3()).done) {
-          _context19.n = 11;
+          _context19.n = 12;
           break;
         }
         msg = _step3.value;
         attachments = msg === null || msg === void 0 ? void 0 : (_msg$attachments = msg.attachments) === null || _msg$attachments === void 0 ? void 0 : _msg$attachments.filter(function (att) {
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
-        _context19.p = 3;
+        resendKey = (msg === null || msg === void 0 ? void 0 : msg.tid) || (msg === null || msg === void 0 ? void 0 : msg.id);
+        if (!resendKey) {
+          _context19.n = 4;
+          break;
+        }
+        attempts = autoResendAttempts.get(resendKey) || 0;
+        if (!(attempts >= MAX_AUTO_RESEND_ATTEMPTS)) {
+          _context19.n = 3;
+          break;
+        }
+        log.info("Skipping auto-resend of message " + resendKey + " after " + attempts + " failed attempts");
+        return _context19.a(3, 11);
+      case 3:
+        autoResendAttempts.set(resendKey, attempts + 1);
+      case 4:
+        _context19.p = 4;
         if (!(msg !== null && msg !== void 0 && msg.forwardingDetails)) {
-          _context19.n = 5;
+          _context19.n = 6;
           break;
         }
-        _context19.n = 4;
+        _context19.n = 5;
         return effects.call(forwardMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18020,15 +18102,15 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             isForward: true
           }
         });
-      case 4:
-        _context19.n = 8;
-        break;
       case 5:
+        _context19.n = 9;
+        break;
+      case 6:
         if (!(attachments && attachments.length > 0)) {
-          _context19.n = 7;
+          _context19.n = 8;
           break;
         }
-        _context19.n = 6;
+        _context19.n = 7;
         return effects.call(sendMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18038,11 +18120,11 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             sendAttachmentsAsSeparateMessage: false
           }
         });
-      case 6:
-        _context19.n = 8;
-        break;
       case 7:
-        _context19.n = 8;
+        _context19.n = 9;
+        break;
+      case 8:
+        _context19.n = 9;
         return effects.call(sendTextMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18051,31 +18133,31 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             channelId: channelId
           }
         });
-      case 8:
-        _context19.n = 10;
-        break;
       case 9:
-        _context19.p = 9;
+        _context19.n = 11;
+        break;
+      case 10:
+        _context19.p = 10;
         _t9 = _context19.v;
         log.error("Failed to send pending message " + (msg.tid || msg.id) + ":", _t9);
-      case 10:
+      case 11:
         _context19.n = 2;
         break;
-      case 11:
+      case 12:
         _context19.n = 1;
         break;
-      case 12:
+      case 13:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         if (!(pendingPollActionsMap && Object.keys(pendingPollActionsMap).length > 0)) {
-          _context19.n = 13;
+          _context19.n = 14;
           break;
         }
-        _context19.n = 13;
+        _context19.n = 14;
         return effects.put(resendPendingPollActionsAC(connectionState));
-      case 13:
+      case 14:
         return _context19.a(2);
     }
-  }, _callee5, null, [[3, 9]]);
+  }, _callee5, null, [[4, 10]]);
 });
 var shouldAppendPendingMessages = function shouldAppendPendingMessages(channelOrId, messages, options) {
   var _getStoredChannel9, _getStoredChannel9$la, _channelOrId$lastMess;
@@ -18300,7 +18382,7 @@ function loadOGMetadataForLinkMessages(messages, getFromServer) {
     getFromServer = true;
   }
   return /*#__PURE__*/_regenerator().m(function _callee6() {
-    var i, _message$attachments2, message, isOnlyLinkAttachments, firstAttachment, j, _attachment, _firstAttachment, _store$getState$Messa, _firstAttachment2, _firstAttachment3, _firstAttachment4, metadata, storedData;
+    var i, _message$attachments2, message, isOnlyLinkAttachments, firstAttachment, j, _attachment5, _firstAttachment, _store$getState$Messa, _firstAttachment2, _firstAttachment3, _firstAttachment4, metadata, storedData;
     return _regenerator().w(function (_context22) {
       while (1) switch (_context22.n) {
         case 0:
@@ -18329,13 +18411,13 @@ function loadOGMetadataForLinkMessages(messages, getFromServer) {
             _context22.n = 6;
             break;
           }
-          _attachment = message.attachments[j];
-          if (!(_attachment.type === attachmentTypes.link)) {
+          _attachment5 = message.attachments[j];
+          if (!(_attachment5.type === attachmentTypes.link)) {
             _context22.n = 4;
             break;
           }
           if (!firstAttachment) {
-            firstAttachment = _attachment;
+            firstAttachment = _attachment5;
           }
           _context22.n = 5;
           break;
@@ -52382,17 +52464,19 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       if (messageToEdit) {
         handleEditMessage();
       } else if (messageTextForSend !== null && messageTextForSend !== void 0 && messageTextForSend.trim() || attachments.length && attachments.length > 0) {
-        var messageTexToSend = messageTextForSend === null || messageTextForSend === void 0 ? void 0 : messageTextForSend.trim();
+        var _trimMessageBodyWithA = trimMessageBodyWithAttributes(messageText, messageBodyAttributes),
+          messageTexToSend = _trimMessageBodyWithA.body,
+          adjustedBodyAttributes = _trimMessageBodyWithA.bodyAttributes;
         var messageToSend = {
           body: messageTexToSend,
-          bodyAttributes: messageBodyAttributes,
+          bodyAttributes: adjustedBodyAttributes,
           mentionedUsers: [],
           attachments: [],
           type: 'text'
         };
         var mentionUsersToSend = [];
-        if (messageBodyAttributes && messageBodyAttributes.length) {
-          messageBodyAttributes.forEach(function (att) {
+        if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
+          adjustedBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
               var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
@@ -52520,12 +52604,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
   };
   var handleEditMessage = function handleEditMessage() {
-    var messageTexToSend = editMessageText.trim();
+    var _trimMessageBodyWithA2 = trimMessageBodyWithAttributes(editMessageText, messageBodyAttributes),
+      messageTexToSend = _trimMessageBodyWithA2.body,
+      adjustedBodyAttributes = _trimMessageBodyWithA2.bodyAttributes;
     var hasTextChanged = messageTexToSend !== messageToEdit.body;
     var normalizeAttrs = function normalizeAttrs(attrs) {
       return !attrs || attrs.length === 0 ? [] : attrs;
     };
-    var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(messageBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
+    var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(adjustedBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
     if (!hasTextChanged && !hasAttributesChanged) {
       handleCloseEditMode();
       return;
@@ -52569,8 +52655,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var mentionedUsersPositions = [];
       var mentionUsersToSend = [];
       if (mentionedUsers && mentionedUsers.length) {
-        if (messageBodyAttributes && messageBodyAttributes.length) {
-          messageBodyAttributes.forEach(function (att) {
+        if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
+          adjustedBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
               var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
@@ -52592,7 +52678,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var messageToSend = _extends({}, messageToEdit, {
         attachments: updatedAttachments,
         metadata: mentionedUsersPositions,
-        bodyAttributes: messageBodyAttributes,
+        bodyAttributes: adjustedBodyAttributes,
         mentionedUsers: mentionUsersToSend,
         body: messageTexToSend
       });

package/index.modern.js

@@ -8478,6 +8478,31 @@ var getAllowEditDeleteIncomingMessage = function getAllowEditDeleteIncomingMessa
 var compareMessageBodyAttributes = function compareMessageBodyAttributes(attributes1, attributes2) {
   return JSON.stringify(attributes1) === JSON.stringify(attributes2);
 };
+var trimMessageBodyWithAttributes = function trimMessageBodyWithAttributes(text, attributes) {
+  var body = text.trim();
+  var leadingTrim = text.length - text.trimStart().length;
+  var bodyAttributes = (attributes || []).map(function (att) {
+    var offset = att.offset - leadingTrim;
+    var length = att.length;
+    if (offset < 0) {
+      length += offset;
+      offset = 0;
+    }
+    if (offset + length > body.length) {
+      length = body.length - offset;
+    }
+    return _extends({}, att, {
+      offset: offset,
+      length: length
+    });
+  }).filter(function (att) {
+    return att.length > 0 && att.offset >= 0 && att.offset < body.length;
+  });
+  return {
+    body: body,
+    bodyAttributes: bodyAttributes
+  };
+};
 var bodyAttributesMapByType = {
   1: ['bold'],
   2: ['italic'],
@@ -15994,6 +16019,10 @@ var SDKErrorTypeEnum = {
   Authentication: {
     value: 'Authentication',
     isResendable: true
+  },
+  AttachmentUnavailable: {
+    value: 'AttachmentUnavailable',
+    isResendable: false
   }
 };
 var fromValue = function fromValue(value) {
@@ -16011,6 +16040,11 @@ var isResendableError = function isResendableError(value) {
   var errorType = fromValue(value);
   return (_errorType$isResendab = errorType === null || errorType === void 0 ? void 0 : errorType.isResendable) != null ? _errorType$isResendab : true;
 };
+var createAttachmentUnavailableError = function createAttachmentUnavailableError(message) {
+  var error = new Error(message);
+  error.type = SDKErrorTypeEnum.AttachmentUnavailable.value;
+  return error;
+};
 
 var _excluded$1 = ["lastMessage"];
 var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
@@ -16073,6 +16107,8 @@ var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
   _marked56 = /*#__PURE__*/_regenerator().m(loadMorePollVotes),
   _marked57 = /*#__PURE__*/_regenerator().m(refreshCacheAroundMessage),
   _marked58 = /*#__PURE__*/_regenerator().m(MessageSaga);
+var MAX_AUTO_RESEND_ATTEMPTS = 5;
+var autoResendAttempts = new Map();
 var loadMoreMessagesInFlight = new Set();
 var prefetchInFlight = new Set();
 var queuedPrefetchRequests = new Map();
@@ -16296,6 +16332,7 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
   try {
     return Promise.resolve(Promise.all(attachments.map(function (attachment) {
       try {
+        var _attachment$url, _attachment$url$type;
         var _temp10 = function _temp10() {
           function _temp0() {
             store.dispatch(updateAttachmentUploadingStateAC(UPLOAD_STATE.SUCCESS, attachment.tid));
@@ -16317,14 +16354,15 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
             return attachmentToSend;
           }
           var _temp9 = function () {
-            if (!attachment.cachedUrl && attachment.url.type.split('/')[0] === 'image') {
+            if (!attachment.cachedUrl && fileType === 'image') {
               return _catch(function () {
                 var _temp2 = function () {
                   if (blobLocal && blobLocal.type.startsWith('image/')) {
+                    var _attachment, _attachment2;
                     var file = attachment.url instanceof File ? attachment.url : new File([attachment.url], attachment.name || 'image', {
                       type: attachment.url.type || blobLocal.type
                     });
-                    var _calculateRenderedIma = calculateRenderedImageWidth((attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szw) || 1280, (attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szh) || 1080),
+                    var _calculateRenderedIma = calculateRenderedImageWidth(((_attachment = attachment) === null || _attachment === void 0 ? void 0 : _attachment.metadata.szw) || 1280, ((_attachment2 = attachment) === null || _attachment2 === void 0 ? void 0 : _attachment2.metadata.szh) || 1080),
                       newWidth = _calculateRenderedIma[0],
                       newHeight = _calculateRenderedIma[1];
                     return Promise.resolve(resizeImageWithPica(file, newWidth, newHeight, 1)).then(function (_ref) {
@@ -16362,10 +16400,11 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
               });
             } else {
               var _temp11 = function () {
-                if (!attachment.cachedUrl && attachment.url.type.split('/')[0] === 'video') {
+                if (!attachment.cachedUrl && fileType === 'video') {
                   var _temp7 = function () {
                     if (blobLocal) {
-                      var _calculateRenderedIma2 = calculateRenderedImageWidth((attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szw) || 1280, (attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szh) || 1080),
+                      var _attachment3, _attachment4;
+                      var _calculateRenderedIma2 = calculateRenderedImageWidth(((_attachment3 = attachment) === null || _attachment3 === void 0 ? void 0 : _attachment3.metadata.szw) || 1280, ((_attachment4 = attachment) === null || _attachment4 === void 0 ? void 0 : _attachment4.metadata.szh) || 1080),
                         newWidth = _calculateRenderedIma2[0],
                         newHeight = _calculateRenderedIma2[1];
                       return Promise.resolve(getVideoFirstFrame(blobLocal, newWidth, newHeight)).then(function (result) {
@@ -16423,7 +16462,19 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
             total = _ref2.total;
           store.dispatch(updateAttachmentUploadingProgressAC(loaded, total, attachment.tid));
         };
-        var fileType = attachment.url.type.split('/')[0];
+        if (!attachment.cachedUrl && !(attachment.url instanceof Blob)) {
+          var _getPendingAttachment;
+          var pendingFile = (_getPendingAttachment = getPendingAttachment(attachment.tid)) === null || _getPendingAttachment === void 0 ? void 0 : _getPendingAttachment.file;
+          if (pendingFile instanceof Blob) {
+            attachment = _extends({}, attachment, {
+              url: pendingFile,
+              data: pendingFile
+            });
+          } else {
+            throw createAttachmentUnavailableError("Attachment file for tid " + attachment.tid + " is no longer available for upload");
+          }
+        }
+        var fileType = (_attachment$url = attachment.url) === null || _attachment$url === void 0 ? void 0 : (_attachment$url$type = _attachment$url.type) === null || _attachment$url$type === void 0 ? void 0 : _attachment$url$type.split('/')[0];
         var fileSize = attachment.size;
         var filePath;
         var uriLocal;
@@ -16926,11 +16977,19 @@ function sendMessage(action) {
           break;
         }
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
+          var attachment, _getPendingAttachment2, pendingFile, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
           return _regenerator().w(function (_context11) {
             while (1) switch (_context11.n) {
               case 0:
                 attachment = mediaAttachments[i];
+                if (customUploader && !attachment.cachedUrl && !(attachment.data instanceof Blob)) {
+                  pendingFile = (_getPendingAttachment2 = getPendingAttachment(attachment.tid)) === null || _getPendingAttachment2 === void 0 ? void 0 : _getPendingAttachment2.file;
+                  if (pendingFile instanceof Blob) {
+                    attachment = _extends({}, attachment, {
+                      data: pendingFile
+                    });
+                  }
+                }
                 if (attachment.cachedUrl) {
                   uri = attachment.cachedUrl;
                 }
@@ -17231,6 +17290,9 @@ function sendMessage(action) {
                 return call(channel.sendMessage, messageToSend);
               case 5:
                 messageResponse = _context12.v;
+                if (messageToSend.tid) {
+                  autoResendAttempts["delete"](messageToSend.tid);
+                }
                 if (!customUploader) {
                   _context12.n = 10;
                   break;
@@ -17763,12 +17825,17 @@ function forwardMessage(action) {
 }
 function resendMessage(action) {
   var _message$attachments;
-  var payload, message, connectionState, channelId, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
+  var payload, payloadMessage, connectionState, channelId, liveMessage, message, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
+        payloadMessage = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
+        liveMessage = payloadMessage !== null && payloadMessage !== void 0 && payloadMessage.tid || payloadMessage !== null && payloadMessage !== void 0 && payloadMessage.id ? getMessageFromMap(channelId, payloadMessage.tid || payloadMessage.id) : null;
+        message = liveMessage || payloadMessage;
+        if (message !== null && message !== void 0 && message.tid || message !== null && message !== void 0 && message.id) {
+          autoResendAttempts["delete"](message.tid || message.id);
+        }
         attachments = message === null || message === void 0 ? void 0 : (_message$attachments = message.attachments) === null || _message$attachments === void 0 ? void 0 : _message$attachments.filter(function (att) {
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
@@ -17963,7 +18030,7 @@ function editMessage(action) {
   }, _marked14, null, [[0, 8]]);
 }
 var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connectionState) {
-  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, pendingPollActionsMap, _t7, _t8, _t9;
+  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, resendKey, attempts, pendingPollActionsMap, _t7, _t8, _t9;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -17971,26 +18038,41 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
         _t7 = _regeneratorKeys(pendingMessagesMap);
       case 1:
         if ((_t8 = _t7()).done) {
-          _context19.n = 12;
+          _context19.n = 13;
           break;
         }
         channelId = _t8.value;
         _iterator3 = _createForOfIteratorHelperLoose(pendingMessagesMap[channelId]);
       case 2:
         if ((_step3 = _iterator3()).done) {
-          _context19.n = 11;
+          _context19.n = 12;
           break;
         }
         msg = _step3.value;
         attachments = msg === null || msg === void 0 ? void 0 : (_msg$attachments = msg.attachments) === null || _msg$attachments === void 0 ? void 0 : _msg$attachments.filter(function (att) {
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
-        _context19.p = 3;
+        resendKey = (msg === null || msg === void 0 ? void 0 : msg.tid) || (msg === null || msg === void 0 ? void 0 : msg.id);
+        if (!resendKey) {
+          _context19.n = 4;
+          break;
+        }
+        attempts = autoResendAttempts.get(resendKey) || 0;
+        if (!(attempts >= MAX_AUTO_RESEND_ATTEMPTS)) {
+          _context19.n = 3;
+          break;
+        }
+        log.info("Skipping auto-resend of message " + resendKey + " after " + attempts + " failed attempts");
+        return _context19.a(3, 11);
+      case 3:
+        autoResendAttempts.set(resendKey, attempts + 1);
+      case 4:
+        _context19.p = 4;
         if (!(msg !== null && msg !== void 0 && msg.forwardingDetails)) {
-          _context19.n = 5;
+          _context19.n = 6;
           break;
         }
-        _context19.n = 4;
+        _context19.n = 5;
         return call(forwardMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18000,15 +18082,15 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             isForward: true
           }
         });
-      case 4:
-        _context19.n = 8;
-        break;
       case 5:
+        _context19.n = 9;
+        break;
+      case 6:
         if (!(attachments && attachments.length > 0)) {
-          _context19.n = 7;
+          _context19.n = 8;
           break;
         }
-        _context19.n = 6;
+        _context19.n = 7;
         return call(sendMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18018,11 +18100,11 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             sendAttachmentsAsSeparateMessage: false
           }
         });
-      case 6:
-        _context19.n = 8;
-        break;
       case 7:
-        _context19.n = 8;
+        _context19.n = 9;
+        break;
+      case 8:
+        _context19.n = 9;
         return call(sendTextMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18031,31 +18113,31 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             channelId: channelId
           }
         });
-      case 8:
-        _context19.n = 10;
-        break;
       case 9:
-        _context19.p = 9;
+        _context19.n = 11;
+        break;
+      case 10:
+        _context19.p = 10;
         _t9 = _context19.v;
         log.error("Failed to send pending message " + (msg.tid || msg.id) + ":", _t9);
-      case 10:
+      case 11:
         _context19.n = 2;
         break;
-      case 11:
+      case 12:
         _context19.n = 1;
         break;
-      case 12:
+      case 13:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         if (!(pendingPollActionsMap && Object.keys(pendingPollActionsMap).length > 0)) {
-          _context19.n = 13;
+          _context19.n = 14;
           break;
         }
-        _context19.n = 13;
+        _context19.n = 14;
         return put(resendPendingPollActionsAC(connectionState));
-      case 13:
+      case 14:
         return _context19.a(2);
     }
-  }, _callee5, null, [[3, 9]]);
+  }, _callee5, null, [[4, 10]]);
 });
 var shouldAppendPendingMessages = function shouldAppendPendingMessages(channelOrId, messages, options) {
   var _getStoredChannel9, _getStoredChannel9$la, _channelOrId$lastMess;
@@ -18280,7 +18362,7 @@ function loadOGMetadataForLinkMessages(messages, getFromServer) {
     getFromServer = true;
   }
   return /*#__PURE__*/_regenerator().m(function _callee6() {
-    var i, _message$attachments2, message, isOnlyLinkAttachments, firstAttachment, j, _attachment, _firstAttachment, _store$getState$Messa, _firstAttachment2, _firstAttachment3, _firstAttachment4, metadata, storedData;
+    var i, _message$attachments2, message, isOnlyLinkAttachments, firstAttachment, j, _attachment5, _firstAttachment, _store$getState$Messa, _firstAttachment2, _firstAttachment3, _firstAttachment4, metadata, storedData;
     return _regenerator().w(function (_context22) {
       while (1) switch (_context22.n) {
         case 0:
@@ -18309,13 +18391,13 @@ function loadOGMetadataForLinkMessages(messages, getFromServer) {
             _context22.n = 6;
             break;
           }
-          _attachment = message.attachments[j];
-          if (!(_attachment.type === attachmentTypes.link)) {
+          _attachment5 = message.attachments[j];
+          if (!(_attachment5.type === attachmentTypes.link)) {
             _context22.n = 4;
             break;
           }
           if (!firstAttachment) {
-            firstAttachment = _attachment;
+            firstAttachment = _attachment5;
           }
           _context22.n = 5;
           break;
@@ -52362,17 +52444,19 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       if (messageToEdit) {
         handleEditMessage();
       } else if (messageTextForSend !== null && messageTextForSend !== void 0 && messageTextForSend.trim() || attachments.length && attachments.length > 0) {
-        var messageTexToSend = messageTextForSend === null || messageTextForSend === void 0 ? void 0 : messageTextForSend.trim();
+        var _trimMessageBodyWithA = trimMessageBodyWithAttributes(messageText, messageBodyAttributes),
+          messageTexToSend = _trimMessageBodyWithA.body,
+          adjustedBodyAttributes = _trimMessageBodyWithA.bodyAttributes;
         var messageToSend = {
           body: messageTexToSend,
-          bodyAttributes: messageBodyAttributes,
+          bodyAttributes: adjustedBodyAttributes,
           mentionedUsers: [],
           attachments: [],
           type: 'text'
         };
         var mentionUsersToSend = [];
-        if (messageBodyAttributes && messageBodyAttributes.length) {
-          messageBodyAttributes.forEach(function (att) {
+        if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
+          adjustedBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
               var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
@@ -52500,12 +52584,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
   };
   var handleEditMessage = function handleEditMessage() {
-    var messageTexToSend = editMessageText.trim();
+    var _trimMessageBodyWithA2 = trimMessageBodyWithAttributes(editMessageText, messageBodyAttributes),
+      messageTexToSend = _trimMessageBodyWithA2.body,
+      adjustedBodyAttributes = _trimMessageBodyWithA2.bodyAttributes;
     var hasTextChanged = messageTexToSend !== messageToEdit.body;
     var normalizeAttrs = function normalizeAttrs(attrs) {
       return !attrs || attrs.length === 0 ? [] : attrs;
     };
-    var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(messageBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
+    var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(adjustedBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
     if (!hasTextChanged && !hasAttributesChanged) {
       handleCloseEditMode();
       return;
@@ -52549,8 +52635,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var mentionedUsersPositions = [];
       var mentionUsersToSend = [];
       if (mentionedUsers && mentionedUsers.length) {
-        if (messageBodyAttributes && messageBodyAttributes.length) {
-          messageBodyAttributes.forEach(function (att) {
+        if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
+          adjustedBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
               var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
@@ -52572,7 +52658,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var messageToSend = _extends({}, messageToEdit, {
         attachments: updatedAttachments,
         metadata: mentionedUsersPositions,
-        bodyAttributes: messageBodyAttributes,
+        bodyAttributes: adjustedBodyAttributes,
         mentionedUsers: mentionUsersToSend,
         body: messageTexToSend
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.8.8-beta.17",
+  "version": "1.8.8-beta.18",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",