stream-chat-react-native-core 6.7.3 → 7.0.0-rc.10

package/lib/commonjs/contexts/messageInputContext/MessageInputContext.js

@@ -11,7 +11,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _uniq = _interopRequireDefault(require("lodash/uniq"));
-var _mimeTypes = require("mime-types");
 var _streamChat = require("stream-chat");
 var _useCreateMessageInputContext = require("./hooks/useCreateMessageInputContext");
 var _useMessageDetailsForState = require("./hooks/useMessageDetailsForState");
@@ -221,7 +220,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
   });
   var takeAndUploadImage = useStableCallback(function () {
     var _ref2 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee(mediaType) {
-      var photo;
+      var file;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -233,8 +232,8 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
               mediaType: mediaType
             });
           case 4:
-            photo = _context.sent;
-            if (photo.askToOpenSettings) {
+            file = _context.sent;
+            if (file.askToOpenSettings) {
               _reactNative.Alert.alert(t('Allow camera access in device settings'), t('Device camera is used to take photos or videos.'), [{
                 style: 'cancel',
                 text: t('Cancel')
@@ -246,25 +245,22 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
                 text: t('Open Settings')
               }]);
             }
-            if (photo.cancelled) {
+            if (file.cancelled) {
               _context.next = 14;
               break;
             }
-            if (!photo.type.includes('image')) {
+            if (!file.type.includes('image')) {
               _context.next = 12;
               break;
             }
             _context.next = 10;
-            return uploadNewImage(photo);
+            return uploadNewImage(file);
           case 10:
             _context.next = 14;
             break;
           case 12:
             _context.next = 14;
-            return uploadNewFile(Object.assign({}, photo, {
-              mimeType: photo.type,
-              type: _types.FileTypes.Video
-            }));
+            return uploadNewFile(file);
           case 14:
           case "end":
             return _context.stop();
@@ -316,25 +312,29 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
         case 11:
           result.assets.forEach(function () {
             var _ref4 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee2(asset) {
+              var compressedURI;
               return _regenerator["default"].wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
                     if (!asset.type.includes('image')) {
-                      _context2.next = 5;
+                      _context2.next = 8;
                       break;
                     }
                     _context2.next = 3;
-                    return uploadNewImage(asset);
+                    return (0, _compressImage.compressedImageURI)(asset, value.compressImageQuality);
                   case 3:
-                    _context2.next = 7;
-                    break;
-                  case 5:
-                    _context2.next = 7;
-                    return uploadNewFile(Object.assign({}, asset, {
-                      mimeType: asset.type,
-                      type: _types.FileTypes.Video
+                    compressedURI = _context2.sent;
+                    _context2.next = 6;
+                    return uploadNewImage(Object.assign({}, asset, {
+                      uri: compressedURI
                     }));
-                  case 7:
+                  case 6:
+                    _context2.next = 10;
+                    break;
+                  case 8:
+                    _context2.next = 10;
+                    return uploadNewFile(asset);
+                  case 10:
                   case "end":
                     return _context2.stop();
                 }
@@ -399,12 +399,29 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
           if (!result.cancelled && result.assets) {
             result.assets.forEach(function () {
               var _ref6 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee4(asset) {
+                var compressedURI;
                 return _regenerator["default"].wrap(function _callee4$(_context4) {
                   while (1) switch (_context4.prev = _context4.next) {
                     case 0:
-                      _context4.next = 2;
+                      if (!asset.type.includes('image')) {
+                        _context4.next = 8;
+                        break;
+                      }
+                      _context4.next = 3;
+                      return (0, _compressImage.compressedImageURI)(asset, value.compressImageQuality);
+                    case 3:
+                      compressedURI = _context4.sent;
+                      _context4.next = 6;
+                      return uploadNewImage(Object.assign({}, asset, {
+                        uri: compressedURI
+                      }));
+                    case 6:
+                      _context4.next = 10;
+                      break;
+                    case 8:
+                      _context4.next = 10;
                       return uploadNewFile(asset);
-                    case 2:
+                    case 10:
                     case "end":
                       return _context4.stop();
                   }
@@ -469,14 +486,12 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
     }
   });
   var mapImageUploadToAttachment = useStableCallback(function (image) {
-    var mime_type = (0, _mimeTypes.lookup)(image.file.name);
-    var name = image.file.name;
     return {
-      fallback: name,
+      fallback: image.file.name,
       image_url: image.url,
-      mime_type: mime_type ? mime_type : undefined,
-      original_height: image.height,
-      original_width: image.width,
+      mime_type: image.file.type,
+      original_height: image.file.height,
+      original_width: image.file.width,
       originalImage: image.file,
       type: _types.FileTypes.Image
     };
@@ -486,7 +501,9 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
       return {
         fallback: file.file.name,
         image_url: file.url,
-        mime_type: file.file.mimeType,
+        mime_type: file.file.type,
+        original_height: file.file.height,
+        original_width: file.file.width,
         originalFile: file.file,
         type: _types.FileTypes.Image
       };
@@ -495,7 +512,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
         asset_url: file.url || file.file.uri,
         duration: file.file.duration,
         file_size: file.file.size,
-        mime_type: file.file.mimeType,
+        mime_type: file.file.type,
         originalFile: file.file,
         title: file.file.name,
         type: _types.FileTypes.Audio
@@ -505,7 +522,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
         asset_url: file.url || file.file.uri,
         duration: file.file.duration,
         file_size: file.file.size,
-        mime_type: file.file.mimeType,
+        mime_type: file.file.type,
         originalFile: file.file,
         thumb_url: file.thumb_url,
         title: file.file.name,
@@ -516,7 +533,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
         asset_url: file.url || file.file.uri,
         duration: file.file.duration,
         file_size: file.file.size,
-        mime_type: file.file.mimeType,
+        mime_type: file.file.type,
         originalFile: file.file,
         title: file.file.name,
         type: _types.FileTypes.VoiceRecording,
@@ -526,7 +543,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
       return {
         asset_url: file.url || file.file.uri,
         file_size: file.file.size,
-        mime_type: file.file.mimeType,
+        mime_type: file.file.type,
         originalFile: file.file,
         title: file.file.name,
         type: _types.FileTypes.File
@@ -735,7 +752,11 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
           }
           updatedMessage = Object.assign({}, message, {
             attachments: attachments,
-            mentioned_users: mentionedUsers,
+            mentioned_users: mentionedUsers.map(function (userId) {
+              return {
+                id: userId
+              };
+            }),
             quoted_message: undefined,
             text: prevText
           }, customMessageData);
@@ -918,7 +939,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
   });
   var uploadFile = useStableCallback(function () {
     var _ref11 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee8(_ref10) {
-      var newFile, file, id, filename, response, _file$mimeType, compressedUri, extraData;
+      var newFile, file, id, filename, response, _file$type, compressedUri, extraData;
       return _regenerator["default"].wrap(function _callee8$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -944,7 +965,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
               break;
             }
             uploadAbortControllerRef.current.set(filename, client.createAbortControllerForNextRequest());
-            if (!((_file$mimeType = file.mimeType) != null && _file$mimeType.includes('image'))) {
+            if (!((_file$type = file.type) != null && _file$type.includes('image'))) {
               _context9.next = 23;
               break;
             }
@@ -953,14 +974,14 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
           case 17:
             compressedUri = _context9.sent;
             _context9.next = 20;
-            return channel.sendFile(compressedUri, filename, file.mimeType);
+            return channel.sendFile(compressedUri, filename, file.type);
           case 20:
             response = _context9.sent;
             _context9.next = 26;
             break;
           case 23:
             _context9.next = 25;
-            return channel.sendFile(file.uri, filename, file.mimeType);
+            return channel.sendFile(file.uri, filename, file.type);
           case 25:
             response = _context9.sent;
           case 26:
@@ -997,7 +1018,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
   var uploadImage = useStableCallback(function () {
     var _ref13 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9(_ref12) {
       var _file$name;
-      var newImage, _ref14, file, id, response, uri, filename, compressedUri, contentType, newImageUploads;
+      var newImage, _ref14, file, id, response, uri, filename, contentType, newImageUploads;
       return _regenerator["default"].wrap(function _callee9$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
           case 0:
@@ -1013,32 +1034,28 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
             uri = file.uri || '';
             filename = escapeRegExp((_file$name = file.name) != null ? _file$name : (0, _utils2.getFileNameFromPath)(uri));
             _context10.prev = 7;
-            _context10.next = 10;
-            return (0, _compressImage.compressedImageURI)(file, value.compressImageQuality);
-          case 10:
-            compressedUri = _context10.sent;
-            contentType = (0, _mimeTypes.lookup)(filename) || 'multipart/form-data';
+            contentType = file.type || 'multipart/form-data';
             if (!value.doImageUploadRequest) {
-              _context10.next = 18;
+              _context10.next = 15;
               break;
             }
-            _context10.next = 15;
+            _context10.next = 12;
             return value.doImageUploadRequest(file, channel);
-          case 15:
+          case 12:
             response = _context10.sent;
-            _context10.next = 29;
+            _context10.next = 26;
             break;
-          case 18:
-            if (!(compressedUri && channel)) {
-              _context10.next = 29;
+          case 15:
+            if (!channel) {
+              _context10.next = 26;
               break;
             }
             if (!value.sendImageAsync) {
-              _context10.next = 24;
+              _context10.next = 21;
               break;
             }
             uploadAbortControllerRef.current.set(filename, client.createAbortControllerForNextRequest());
-            channel.sendImage(compressedUri, filename, contentType).then(function (res) {
+            channel.sendImage(file.uri, filename, contentType).then(function (res) {
               uploadAbortControllerRef.current["delete"](filename);
               if (asyncIds.includes(id)) {
                 setAsyncUploads(function (prevAsyncUploads) {
@@ -1057,16 +1074,16 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
             }, function () {
               uploadAbortControllerRef.current["delete"](filename);
             });
-            _context10.next = 29;
+            _context10.next = 26;
             break;
-          case 24:
+          case 21:
             uploadAbortControllerRef.current.set(filename, client.createAbortControllerForNextRequest());
-            _context10.next = 27;
-            return channel.sendImage(compressedUri, filename, contentType);
-          case 27:
+            _context10.next = 24;
+            return channel.sendImage(file.uri, filename, contentType);
+          case 24:
             response = _context10.sent;
             uploadAbortControllerRef.current["delete"](filename);
-          case 29:
+          case 26:
             if (Object.keys(response).length) {
               newImageUploads = getUploadSetStateAction(id, _utils2.FileState.UPLOADED, {
                 height: file.height,
@@ -1075,32 +1092,32 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
               });
               setImageUploads(newImageUploads);
             }
-            _context10.next = 38;
+            _context10.next = 35;
             break;
-          case 32:
-            _context10.prev = 32;
+          case 29:
+            _context10.prev = 29;
             _context10.t0 = _context10["catch"](7);
             if (!(_context10.t0 instanceof Error && (_context10.t0.name === 'AbortError' || _context10.t0.name === 'CanceledError'))) {
-              _context10.next = 37;
+              _context10.next = 34;
               break;
             }
             uploadAbortControllerRef.current["delete"](filename);
             return _context10.abrupt("return");
-          case 37:
+          case 34:
             handleFileOrImageUploadError(_context10.t0, true, id);
-          case 38:
+          case 35:
           case "end":
             return _context10.stop();
         }
-      }, _callee9, null, [[7, 32]]);
+      }, _callee9, null, [[7, 29]]);
     }));
     return function (_x5) {
       return _ref13.apply(this, arguments);
     };
   }());
   var uploadNewFile = useStableCallback(function () {
-    var _ref15 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee10(file) {
-      var _file$mimeType2, id, fileConfig, size_limit, isAllowed, sizeLimit, fileState, fileType, newFile;
+    var _ref15 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee10(file, fileType) {
+      var id, fileConfig, size_limit, isAllowed, sizeLimit, fileState, derivedFileType, newFile;
       return _regenerator["default"].wrap(function _callee10$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
@@ -1127,13 +1144,15 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
             return _context11.abrupt("return");
           case 10:
             fileState = isAllowed ? _utils2.FileState.UPLOADING : _utils2.FileState.NOT_SUPPORTED;
-            fileType = file.type || ((_file$mimeType2 = file.mimeType) == null ? void 0 : _file$mimeType2.split('/')[0]);
+            derivedFileType = fileType != null ? fileType : (0, _utils2.getFileTypeFromMimeType)(file.type);
             newFile = {
               duration: file.duration || 0,
               file: file,
-              id: file.id || id,
+              id: id,
+              mime_type: file.type,
               state: fileState,
-              type: fileType,
+              thumb_url: file.thumb_url,
+              type: derivedFileType,
               url: file.uri
             };
             _context11.next = 15;
@@ -1164,7 +1183,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
         }
       }, _callee10, null, [[0, 20]]);
     }));
-    return function (_x6) {
+    return function (_x6, _x7) {
       return _ref15.apply(this, arguments);
     };
   }());
@@ -1201,7 +1220,9 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
               file: image,
               height: image.height,
               id: id,
+              mime_type: image.type,
               state: imageState,
+              type: _types.FileTypes.Image,
               url: image.uri,
               width: image.width
             };
@@ -1233,7 +1254,7 @@ var MessageInputProvider = exports.MessageInputProvider = function MessageInputP
         }
       }, _callee11, null, [[0, 19]]);
     }));
-    return function (_x7) {
+    return function (_x8) {
       return _ref16.apply(this, arguments);
     };
   }());