stream-chat-react-native-core 5.8.0-beta.1 → 5.8.0-beta.2

package/lib/commonjs/components/Channel/Channel.js

@@ -83,6 +83,8 @@ var _addReactionToLocalState = require("../../utils/addReactionToLocalState");
 
 var _DBSyncManager = require("../../utils/DBSyncManager");
 
+var _patchMessageTextCommand = require("../../utils/patchMessageTextCommand");
+
 var _removeReactionFromLocalState = require("../../utils/removeReactionFromLocalState");
 
 var _utils = require("../../utils/utils");
@@ -1505,7 +1507,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
 
   var sendMessageRequest = function () {
     var _ref17 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee13(message, retrying) {
-      var _updatedMessage, __html, attachments, created_at, deleted_at, html, id, latest_reactions, mentioned_users, own_reactions, parent_id, quoted_message, reaction_counts, reactions, status, text, type, updated_at, user, extraFields, _messageData, messageResponse;
+      var _updatedMessage, __html, attachments, created_at, deleted_at, html, id, latest_reactions, mentioned_users, own_reactions, parent_id, quoted_message, reaction_counts, reactions, status, text, type, updated_at, user, extraFields, mentionedUserIds, _messageData, messageResponse;
 
       return _regenerator["default"].wrap(function _callee13$(_context13) {
         while (1) {
@@ -1527,43 +1529,44 @@ var ChannelWithContext = function ChannelWithContext(props) {
               return _context13.abrupt("return");
 
             case 7:
+              mentionedUserIds = (mentioned_users == null ? void 0 : mentioned_users.map(function (user) {
+                return user.id;
+              })) || [];
               _messageData = (0, _extends2["default"])({
                 attachments: attachments,
                 id: id,
-                mentioned_users: (mentioned_users == null ? void 0 : mentioned_users.map(function (mentionedUser) {
-                  return mentionedUser.id;
-                })) || [],
+                mentioned_users: mentionedUserIds,
                 parent_id: parent_id,
-                text: text
+                text: (0, _patchMessageTextCommand.patchMessageTextCommand)(text != null ? text : '', mentionedUserIds)
               }, extraFields);
               messageResponse = {};
 
               if (!doSendMessageRequest) {
-                _context13.next = 15;
+                _context13.next = 16;
                 break;
               }
 
-              _context13.next = 12;
+              _context13.next = 13;
               return doSendMessageRequest((channel == null ? void 0 : channel.cid) || '', _messageData);
 
-            case 12:
+            case 13:
               messageResponse = _context13.sent;
-              _context13.next = 19;
+              _context13.next = 20;
               break;
 
-            case 15:
+            case 16:
               if (!channel) {
-                _context13.next = 19;
+                _context13.next = 20;
                 break;
               }
 
-              _context13.next = 18;
+              _context13.next = 19;
               return channel.sendMessage(_messageData);
 
-            case 18:
+            case 19:
               messageResponse = _context13.sent;
 
-            case 19:
+            case 20:
               if (messageResponse.message) {
                 messageResponse.message.status = _utils.MessageStatusTypes.RECEIVED;
 
@@ -1582,11 +1585,11 @@ var ChannelWithContext = function ChannelWithContext(props) {
                 }
               }
 
-              _context13.next = 28;
+              _context13.next = 29;
               break;
 
-            case 22:
-              _context13.prev = 22;
+            case 23:
+              _context13.prev = 23;
               _context13.t0 = _context13["catch"](0);
               console.log(_context13.t0);
               message.status = _utils.MessageStatusTypes.FAILED;
@@ -1602,12 +1605,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
                 });
               }
 
-            case 28:
+            case 29:
             case "end":
               return _context13.stop();
           }
         }
-      }, _callee13, null, [[0, 22]]);
+      }, _callee13, null, [[0, 23]]);
     }));
 
     return function sendMessageRequest(_x6, _x7) {
@@ -2428,7 +2431,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1970,
+        lineNumber: 1973,
         columnNumber: 12
       }
     });
@@ -2443,7 +2446,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1975,
+        lineNumber: 1978,
         columnNumber: 7
       }
     }, t('Please select a channel first'));
@@ -2457,7 +2460,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1982,
+      lineNumber: 1985,
       columnNumber: 5
     }
   }), _react["default"].createElement(_ChannelContext.ChannelProvider, {
@@ -2465,7 +2468,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1988,
+      lineNumber: 1991,
       columnNumber: 7
     }
   }, _react["default"].createElement(_OwnCapabilitiesContext.OwnCapabilitiesProvider, {
@@ -2473,7 +2476,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1989,
+      lineNumber: 1992,
       columnNumber: 9
     }
   }, _react["default"].createElement(_TypingContext.TypingProvider, {
@@ -2481,7 +2484,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1990,
+      lineNumber: 1993,
       columnNumber: 11
     }
   }, _react["default"].createElement(_PaginatedMessageListContext.PaginatedMessageListProvider, {
@@ -2489,7 +2492,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1991,
+      lineNumber: 1994,
       columnNumber: 13
     }
   }, _react["default"].createElement(_MessagesContext.MessagesProvider, {
@@ -2497,7 +2500,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1992,
+      lineNumber: 1995,
       columnNumber: 15
     }
   }, _react["default"].createElement(_ThreadContext.ThreadProvider, {
@@ -2505,7 +2508,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1993,
+      lineNumber: 1996,
       columnNumber: 17
     }
   }, _react["default"].createElement(_SuggestionsContext.SuggestionsProvider, {
@@ -2513,7 +2516,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1994,
+      lineNumber: 1997,
       columnNumber: 19
     }
   }, _react["default"].createElement(_MessageInputContext.MessageInputProvider, {
@@ -2521,7 +2524,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1995,
+      lineNumber: 1998,
       columnNumber: 21
     }
   }, _react["default"].createElement(_reactNative.View, {
@@ -2531,7 +2534,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1996,
+      lineNumber: 1999,
       columnNumber: 23
     }
   }, children))))))))));
@@ -2588,7 +2591,7 @@ var Channel = function Channel(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2053,
+      lineNumber: 2056,
       columnNumber: 5
     }
   }));