stream-chat-react-native-core 9.0.2-beta.1 → 9.1.0-beta.1

package/lib/module/components/Channel/Channel.js

@@ -11,7 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
-var _mimeTypes = require("mime-types");
 var _streamChat = require("stream-chat");
 var _useChannelDataState2 = require("./hooks/useChannelDataState");
 var _useCreateChannelContext = require("./hooks/useCreateChannelContext");
@@ -768,63 +767,66 @@ var ChannelWithContext = function ChannelWithContext(props) {
     var _ref15 = (0, _asyncToGenerator2.default)(function* (message) {
       var _updatedMessage$attac;
       var updatedMessage = Object.assign({}, message);
-      if ((_updatedMessage$attac = updatedMessage.attachments) != null && _updatedMessage$attac.length) {
-        for (var i = 0; i < ((_updatedMessage$attac2 = updatedMessage.attachments) == null ? void 0 : _updatedMessage$attac2.length); i++) {
-          var _updatedMessage$attac2;
-          var attachment = updatedMessage.attachments[i];
+      if (!((_updatedMessage$attac = updatedMessage.attachments) != null && _updatedMessage$attac.length) || !(channel != null && channel.cid)) {
+        return updatedMessage;
+      }
+      var uploadOne = function () {
+        var _ref16 = (0, _asyncToGenerator2.default)(function* (attachment) {
+          var _client$offlineDb;
           if (attachment.image_url && !(0, _utils.isLocalUrl)(attachment.image_url) || attachment.asset_url && !(0, _utils.isLocalUrl)(attachment.asset_url)) {
-            continue;
+            return;
           }
-          var image = attachment.originalFile;
-          var file = attachment.originalFile;
-          if (attachment.type === _types.FileTypes.Image && image != null && image.uri) {
-            var _image$name, _client$offlineDb;
-            var filename = (_image$name = image.name) != null ? _image$name : (0, _utils.getFileNameFromPath)(image.uri);
-            var controller = uploadAbortControllerRef.current.get(filename);
-            if (controller) {
-              controller.abort();
-              uploadAbortControllerRef.current.delete(filename);
-            }
-            var compressedUri = yield (0, _compressImage.compressedImageURI)(image, compressImageQuality);
-            var contentType = (0, _mimeTypes.lookup)(filename) || 'multipart/form-data';
-            var uploadResponse = doFileUploadRequest ? yield doFileUploadRequest(image) : yield channel.sendImage(compressedUri, filename, contentType);
-            attachment.image_url = uploadResponse.file;
-            delete attachment.originalFile;
-            (_client$offlineDb = client.offlineDb) == null || _client$offlineDb.executeQuerySafely(function (db) {
-              return db.updateMessage({
-                message: Object.assign({}, updatedMessage, {
-                  cid: channel.cid
-                })
-              });
-            }, {
-              method: 'updateMessage'
+          var originalFile = attachment.originalFile;
+          if (!(originalFile != null && originalFile.uri)) {
+            return;
+          }
+          var localId = attachment.localId;
+          if (!localId) {
+            console.warn('uploadPendingAttachments: local attachment missing localId, skipping upload');
+            return;
+          }
+          var fileForUpload = originalFile;
+          if (attachment.type === _types.FileTypes.Image && !doFileUploadRequest) {
+            var _originalFile$name;
+            var filename = (_originalFile$name = originalFile.name) != null ? _originalFile$name : (0, _utils.getFileNameFromPath)(originalFile.uri);
+            var compressedUri = yield (0, _compressImage.compressedImageURI)(originalFile, compressImageQuality);
+            fileForUpload = Object.assign({}, originalFile, {
+              name: filename,
+              uri: compressedUri
             });
           }
-          if (attachment.type !== _types.FileTypes.Image && file != null && file.uri) {
-            var _client$offlineDb2;
-            var _controller = uploadAbortControllerRef.current.get(file.name);
-            if (_controller) {
-              _controller.abort();
-              uploadAbortControllerRef.current.delete(file.name);
-            }
-            var response = doFileUploadRequest ? yield doFileUploadRequest(file) : yield channel.sendFile(file.uri, file.name, file.type);
+          var response = yield client.uploadManager.upload({
+            channelCid: channel.cid,
+            file: fileForUpload,
+            id: localId
+          });
+          if (attachment.type === _types.FileTypes.Image) {
+            attachment.image_url = response.file;
+          } else {
             attachment.asset_url = response.file;
             if (response.thumb_url) {
               attachment.thumb_url = response.thumb_url;
             }
-            delete attachment.originalFile;
-            (_client$offlineDb2 = client.offlineDb) == null || _client$offlineDb2.executeQuerySafely(function (db) {
-              return db.updateMessage({
-                message: Object.assign({}, updatedMessage, {
-                  cid: channel.cid
-                })
-              });
-            }, {
-              method: 'updateMessage'
-            });
           }
-        }
-      }
+          delete attachment.originalFile;
+          delete attachment.localId;
+          (_client$offlineDb = client.offlineDb) == null || _client$offlineDb.executeQuerySafely(function (db) {
+            return db.updateMessage({
+              message: Object.assign({}, updatedMessage, {
+                cid: channel.cid
+              })
+            });
+          }, {
+            method: 'updateMessage'
+          });
+        });
+        return function uploadOne(_x4) {
+          return _ref16.apply(this, arguments);
+        };
+      }();
+      yield Promise.all(updatedMessage.attachments.map(function (att) {
+        return uploadOne(att);
+      }));
       return updatedMessage;
     });
     return function (_x3) {
@@ -832,15 +834,15 @@ var ChannelWithContext = function ChannelWithContext(props) {
     };
   }());
   var sendMessageRequest = (0, _hooks.useStableCallback)(function () {
-    var _ref17 = (0, _asyncToGenerator2.default)(function* (_ref16) {
-      var localMessage = _ref16.localMessage,
-        message = _ref16.message,
-        options = _ref16.options,
-        retrying = _ref16.retrying;
+    var _ref18 = (0, _asyncToGenerator2.default)(function* (_ref17) {
+      var localMessage = _ref17.localMessage,
+        message = _ref17.message,
+        options = _ref17.options,
+        retrying = _ref17.retrying;
       var failedMessageUpdated = false;
       var handleFailedMessage = function handleFailedMessage() {
         if (!failedMessageUpdated) {
-          var _client$offlineDb3;
+          var _client$offlineDb2;
           var updatedMessage = Object.assign({}, localMessage, {
             cid: channel.cid,
             status: _utils.MessageStatusTypes.FAILED
@@ -850,7 +852,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
             message: updatedMessage
           });
           optimisticallyUpdatedNewMessages.delete(localMessage.id);
-          (_client$offlineDb3 = client.offlineDb) == null || _client$offlineDb3.executeQuerySafely(function (db) {
+          (_client$offlineDb2 = client.offlineDb) == null || _client$offlineDb2.executeQuerySafely(function (db) {
             return db.updateMessage({
               message: updatedMessage
             });
@@ -884,11 +886,11 @@ var ChannelWithContext = function ChannelWithContext(props) {
           messageResponse = yield channel.sendMessage(messageData, options);
         }
         if ((_messageResponse = messageResponse) != null && _messageResponse.message) {
-          var _client$offlineDb4;
+          var _client$offlineDb3;
           var newMessageResponse = Object.assign({}, messageResponse.message, {
             status: _utils.MessageStatusTypes.RECEIVED
           });
-          (_client$offlineDb4 = client.offlineDb) == null || _client$offlineDb4.executeQuerySafely(function (db) {
+          (_client$offlineDb3 = client.offlineDb) == null || _client$offlineDb3.executeQuerySafely(function (db) {
             return db.updateMessage({
               message: Object.assign({}, newMessageResponse, {
                 cid: channel.cid
@@ -908,16 +910,16 @@ var ChannelWithContext = function ChannelWithContext(props) {
         yield handleFailedMessage();
       }
     });
-    return function (_x4) {
-      return _ref17.apply(this, arguments);
+    return function (_x5) {
+      return _ref18.apply(this, arguments);
     };
   }());
   var sendMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref19 = (0, _asyncToGenerator2.default)(function* (_ref18) {
-      var _channel$state, _client$offlineDb5;
-      var localMessage = _ref18.localMessage,
-        message = _ref18.message,
-        options = _ref18.options;
+    var _ref20 = (0, _asyncToGenerator2.default)(function* (_ref19) {
+      var _channel$state, _client$offlineDb4;
+      var localMessage = _ref19.localMessage,
+        message = _ref19.message,
+        options = _ref19.options;
       if (channel != null && (_channel$state = channel.state) != null && _channel$state.filterErrorMessages) {
         channel.state.filterErrorMessages();
       }
@@ -926,7 +928,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
         message: localMessage
       });
       optimisticallyUpdatedNewMessages.add(localMessage.id);
-      (_client$offlineDb5 = client.offlineDb) == null || _client$offlineDb5.executeQuerySafely(function (db) {
+      (_client$offlineDb4 = client.offlineDb) == null || _client$offlineDb4.executeQuerySafely(function (db) {
         return db.upsertMessages({
           messages: [Object.assign({}, localMessage, {
             cid: channel.cid,
@@ -949,12 +951,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
         options: options
       });
     });
-    return function (_x5) {
-      return _ref19.apply(this, arguments);
+    return function (_x6) {
+      return _ref20.apply(this, arguments);
     };
   }());
   var retrySendMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref20 = (0, _asyncToGenerator2.default)(function* (localMessage) {
+    var _ref21 = (0, _asyncToGenerator2.default)(function* (localMessage) {
       var statusPendingMessage = Object.assign({}, localMessage, {
         status: _utils.MessageStatusTypes.SENDING
       });
@@ -968,15 +970,15 @@ var ChannelWithContext = function ChannelWithContext(props) {
         retrying: true
       });
     });
-    return function (_x6) {
-      return _ref20.apply(this, arguments);
+    return function (_x7) {
+      return _ref21.apply(this, arguments);
     };
   }());
   var editMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref22 = (0, _asyncToGenerator2.default)(function* (_ref21) {
-      var _client$offlineDb6;
-      var localMessage = _ref21.localMessage,
-        options = _ref21.options;
+    var _ref23 = (0, _asyncToGenerator2.default)(function* (_ref22) {
+      var _client$offlineDb5;
+      var localMessage = _ref22.localMessage,
+        options = _ref22.options;
       if (!channel) {
         throw new Error('Channel has not been initialized');
       }
@@ -992,7 +994,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       });
       updateMessage(optimisticMessage);
       threadInstance == null || threadInstance.updateParentMessageOrReplyLocally(optimisticMessage);
-      (_client$offlineDb6 = client.offlineDb) == null || _client$offlineDb6.executeQuerySafely(function (db) {
+      (_client$offlineDb5 = client.offlineDb) == null || _client$offlineDb5.executeQuerySafely(function (db) {
         return db.updateMessage({
           message: Object.assign({}, optimisticMessage, {
             cid: cid
@@ -1003,10 +1005,10 @@ var ChannelWithContext = function ChannelWithContext(props) {
       });
       var response = doUpdateMessageRequest ? yield doUpdateMessageRequest(cid, localMessage, options) : yield client.updateMessage(localMessage, undefined, options);
       if (response != null && response.message) {
-        var _client$offlineDb7;
+        var _client$offlineDb6;
         updateMessage(response.message);
         threadInstance == null || threadInstance.updateParentMessageOrReplyLocally(response.message);
-        (_client$offlineDb7 = client.offlineDb) == null || _client$offlineDb7.executeQuerySafely(function (db) {
+        (_client$offlineDb6 = client.offlineDb) == null || _client$offlineDb6.executeQuerySafely(function (db) {
           return db.updateMessage({
             message: Object.assign({}, response.message, {
               cid: cid
@@ -1018,12 +1020,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
       }
       return response;
     });
-    return function (_x7) {
-      return _ref22.apply(this, arguments);
+    return function (_x8) {
+      return _ref23.apply(this, arguments);
     };
   }());
   var removeMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref23 = (0, _asyncToGenerator2.default)(function* (message) {
+    var _ref24 = (0, _asyncToGenerator2.default)(function* (message) {
       if (channel) {
         channel.state.removeMessage(message);
         copyMessagesStateFromChannel(channel);
@@ -1037,12 +1039,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
         });
       }
     });
-    return function (_x8) {
-      return _ref23.apply(this, arguments);
+    return function (_x9) {
+      return _ref24.apply(this, arguments);
     };
   }());
   var sendReaction = (0, _hooks.useStableCallback)(function () {
-    var _ref24 = (0, _asyncToGenerator2.default)(function* (type, messageId) {
+    var _ref25 = (0, _asyncToGenerator2.default)(function* (type, messageId) {
       if (!(channel != null && channel.id) || !client.user) {
         throw new Error('Channel has not been initialized');
       }
@@ -1068,12 +1070,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
         });
       }
     });
-    return function (_x9, _x10) {
-      return _ref24.apply(this, arguments);
+    return function (_x10, _x11) {
+      return _ref25.apply(this, arguments);
     };
   }());
   var deleteMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref25 = (0, _asyncToGenerator2.default)(function* (message) {
+    var _ref26 = (0, _asyncToGenerator2.default)(function* (message) {
       var optionsOrHardDelete = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var options = {};
       if (typeof optionsOrHardDelete === 'boolean') {
@@ -1110,12 +1112,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
         updateMessage(Object.assign({}, data.message));
       }
     });
-    return function (_x11) {
-      return _ref25.apply(this, arguments);
+    return function (_x12) {
+      return _ref26.apply(this, arguments);
     };
   }());
   var deleteReaction = (0, _hooks.useStableCallback)(function () {
-    var _ref26 = (0, _asyncToGenerator2.default)(function* (type, messageId) {
+    var _ref27 = (0, _asyncToGenerator2.default)(function* (type, messageId) {
       if (!(channel != null && channel.id) || !client.user) {
         throw new Error('Channel has not been initialized');
       }
@@ -1131,8 +1133,8 @@ var ChannelWithContext = function ChannelWithContext(props) {
       }
       yield channel.deleteReaction.apply(channel, payload);
     });
-    return function (_x12, _x13) {
-      return _ref26.apply(this, arguments);
+    return function (_x13, _x14) {
+      return _ref27.apply(this, arguments);
     };
   }());
   var openThread = (0, _react.useCallback)(function (message) {