sceyt-chat-react-uikit 1.8.0-beta.10 → 1.8.0-beta.12

package/index.js

@@ -10924,33 +10924,30 @@ var shouldSkipDeliveryStatusUpdate = function shouldSkipDeliveryStatusUpdate(mar
   return false;
 };
 var updateMessageDeliveryStatusAndMarkers = function updateMessageDeliveryStatusAndMarkers(message, markerName) {
-  var _message$markerTotals;
+  var isOwnMarker = message.user.id !== getClient().user.id;
   if (shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) {
     return {
       markerTotals: message.markerTotals,
       deliveryStatus: message.deliveryStatus
     };
   }
-  var markerInMarkersTotal = message === null || message === void 0 ? void 0 : (_message$markerTotals = message.markerTotals) === null || _message$markerTotals === void 0 ? void 0 : _message$markerTotals.find(function (marker) {
+  var markersTotal = isOwnMarker ? message.userMarkers : message.markerTotals;
+  var markerInMarkersTotal = markersTotal === null || markersTotal === void 0 ? void 0 : markersTotal.find(function (marker) {
     return marker.name === markerName;
   });
   if (!markerInMarkersTotal) {
-    return {
-      markerTotals: [].concat(message.markerTotals || [], [{
-        name: markerName,
-        count: 1
-      }]),
-      deliveryStatus: markerName
-    };
+    var _ref;
+    return _ref = {}, _ref[isOwnMarker ? 'userMarkers' : 'markerTotals'] = [].concat(markersTotal || [], [{
+      name: markerName,
+      count: 1
+    }]), _ref.deliveryStatus = markerName, _ref;
   } else {
-    return {
-      markerTotals: message.markerTotals.map(function (marker) {
-        return marker.name === markerName ? _extends({}, marker, {
-          count: marker.count + 1
-        }) : marker;
-      }),
-      deliveryStatus: markerName
-    };
+    var _ref2;
+    return _ref2 = {}, _ref2[isOwnMarker ? 'userMarkers' : 'markerTotals'] = markersTotal.map(function (marker) {
+      return marker.name === markerName ? _extends({}, marker, {
+        count: marker.count + 1
+      }) : marker;
+    }), _ref2.deliveryStatus = markerName, _ref2;
   }
 };
 var sendMessageHandler;
@@ -11590,13 +11587,8 @@ var messageSlice = createSlice({
         }
         if (state.activeChannelMessages[index].state !== 'Deleted') {
           var message = state.activeChannelMessages[index];
-          var _updateMessageDeliver = updateMessageDeliveryStatusAndMarkers(message, markerName),
-            markerTotals = _updateMessageDeliver.markerTotals,
-            deliveryStatus = _updateMessageDeliver.deliveryStatus;
-          state.activeChannelMessages[index] = _extends({}, message, {
-            markerTotals: markerTotals,
-            deliveryStatus: deliveryStatus
-          });
+          var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, markerName);
+          state.activeChannelMessages[index] = _extends({}, message, statusUpdatedMessage);
         }
       }
       state.activeChannelMessages.sort(function (a, b) {
@@ -20279,6 +20271,7 @@ function sendMessage(action) {
                 _pending = _extends({}, messageForSend, {
                   attachments: [attachment],
                   createdAt: new Date(Date.now()),
+                  mentionedUsers: message.mentionedUsers,
                   parentMessage: message.parentMessage || null
                 });
                 pendingMessages.push(_pending);
@@ -20337,6 +20330,7 @@ function sendMessage(action) {
         pending = _extends({}, messageToSend, {
           attachments: message.attachments,
           createdAt: new Date(Date.now()),
+          mentionedUsers: message.mentionedUsers,
           parentMessage: message.parentMessage || null
         });
         pendingMessages.push(pending);
@@ -20715,7 +20709,7 @@ function sendTextMessage(action) {
       case 20:
         _context5.p = 20;
         _t3 = _context5.v;
-        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type, _t3);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         if (!(!isErrorResendable && (_channel3 = channel) !== null && _channel3 !== void 0 && _channel3.id && sendMessageTid)) {
           _context5.n = 22;
@@ -22248,45 +22242,51 @@ function loadMoreMessageAttachments(action) {
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
-        _context18.n = 1;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
+        if (AttachmentQuery) {
+          _context18.n = 1;
+          break;
+        }
+        return _context18.a(2);
       case 1:
-        AttachmentQuery.limit = limit;
         _context18.n = 2;
-        return effects.call(AttachmentQuery.loadPrevious);
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
+        AttachmentQuery.limit = limit;
+        _context18.n = 3;
+        return effects.call(AttachmentQuery.loadPrevious);
+      case 3:
         _yield$call3 = _context18.v;
         attachments = _yield$call3.attachments;
         hasNext = _yield$call3.hasNext;
         if (!forPopup) {
-          _context18.n = 4;
+          _context18.n = 5;
           break;
         }
-        _context18.n = 3;
+        _context18.n = 4;
         return effects.put(addAttachmentsForPopupAC(attachments, direction));
-      case 3:
-        _context18.n = 7;
-        break;
       case 4:
-        _context18.n = 5;
-        return effects.put(setAttachmentsCompleteAC(hasNext));
+        _context18.n = 8;
+        break;
       case 5:
         _context18.n = 6;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setAttachmentsCompleteAC(hasNext));
       case 6:
         _context18.n = 7;
-        return effects.put(addAttachmentsAC(attachments));
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 7:
-        _context18.n = 9;
-        break;
+        _context18.n = 8;
+        return effects.put(addAttachmentsAC(attachments));
       case 8:
-        _context18.p = 8;
+        _context18.n = 10;
+        break;
+      case 9:
+        _context18.p = 9;
         _t26 = _context18.v;
         log.error('error in message attachment query', _t26);
-      case 9:
+      case 10:
         return _context18.a(2);
     }
-  }, _marked13$1, null, [[0, 8]]);
+  }, _marked13$1, null, [[0, 9]]);
 }
 function pauseAttachmentUploading(action) {
   var attachmentId, isPaused, _t27;

package/index.modern.js

@@ -10923,33 +10923,30 @@ var shouldSkipDeliveryStatusUpdate = function shouldSkipDeliveryStatusUpdate(mar
   return false;
 };
 var updateMessageDeliveryStatusAndMarkers = function updateMessageDeliveryStatusAndMarkers(message, markerName) {
-  var _message$markerTotals;
+  var isOwnMarker = message.user.id !== getClient().user.id;
   if (shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) {
     return {
       markerTotals: message.markerTotals,
       deliveryStatus: message.deliveryStatus
     };
   }
-  var markerInMarkersTotal = message === null || message === void 0 ? void 0 : (_message$markerTotals = message.markerTotals) === null || _message$markerTotals === void 0 ? void 0 : _message$markerTotals.find(function (marker) {
+  var markersTotal = isOwnMarker ? message.userMarkers : message.markerTotals;
+  var markerInMarkersTotal = markersTotal === null || markersTotal === void 0 ? void 0 : markersTotal.find(function (marker) {
     return marker.name === markerName;
   });
   if (!markerInMarkersTotal) {
-    return {
-      markerTotals: [].concat(message.markerTotals || [], [{
-        name: markerName,
-        count: 1
-      }]),
-      deliveryStatus: markerName
-    };
+    var _ref;
+    return _ref = {}, _ref[isOwnMarker ? 'userMarkers' : 'markerTotals'] = [].concat(markersTotal || [], [{
+      name: markerName,
+      count: 1
+    }]), _ref.deliveryStatus = markerName, _ref;
   } else {
-    return {
-      markerTotals: message.markerTotals.map(function (marker) {
-        return marker.name === markerName ? _extends({}, marker, {
-          count: marker.count + 1
-        }) : marker;
-      }),
-      deliveryStatus: markerName
-    };
+    var _ref2;
+    return _ref2 = {}, _ref2[isOwnMarker ? 'userMarkers' : 'markerTotals'] = markersTotal.map(function (marker) {
+      return marker.name === markerName ? _extends({}, marker, {
+        count: marker.count + 1
+      }) : marker;
+    }), _ref2.deliveryStatus = markerName, _ref2;
   }
 };
 var sendMessageHandler;
@@ -11589,13 +11586,8 @@ var messageSlice = createSlice({
         }
         if (state.activeChannelMessages[index].state !== 'Deleted') {
           var message = state.activeChannelMessages[index];
-          var _updateMessageDeliver = updateMessageDeliveryStatusAndMarkers(message, markerName),
-            markerTotals = _updateMessageDeliver.markerTotals,
-            deliveryStatus = _updateMessageDeliver.deliveryStatus;
-          state.activeChannelMessages[index] = _extends({}, message, {
-            markerTotals: markerTotals,
-            deliveryStatus: deliveryStatus
-          });
+          var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, markerName);
+          state.activeChannelMessages[index] = _extends({}, message, statusUpdatedMessage);
         }
       }
       state.activeChannelMessages.sort(function (a, b) {
@@ -20278,6 +20270,7 @@ function sendMessage(action) {
                 _pending = _extends({}, messageForSend, {
                   attachments: [attachment],
                   createdAt: new Date(Date.now()),
+                  mentionedUsers: message.mentionedUsers,
                   parentMessage: message.parentMessage || null
                 });
                 pendingMessages.push(_pending);
@@ -20336,6 +20329,7 @@ function sendMessage(action) {
         pending = _extends({}, messageToSend, {
           attachments: message.attachments,
           createdAt: new Date(Date.now()),
+          mentionedUsers: message.mentionedUsers,
           parentMessage: message.parentMessage || null
         });
         pendingMessages.push(pending);
@@ -20714,7 +20708,7 @@ function sendTextMessage(action) {
       case 20:
         _context5.p = 20;
         _t3 = _context5.v;
-        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type, _t3);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         if (!(!isErrorResendable && (_channel3 = channel) !== null && _channel3 !== void 0 && _channel3.id && sendMessageTid)) {
           _context5.n = 22;
@@ -22247,45 +22241,51 @@ function loadMoreMessageAttachments(action) {
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
-        _context18.n = 1;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
+        if (AttachmentQuery) {
+          _context18.n = 1;
+          break;
+        }
+        return _context18.a(2);
       case 1:
-        AttachmentQuery.limit = limit;
         _context18.n = 2;
-        return call(AttachmentQuery.loadPrevious);
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
+        AttachmentQuery.limit = limit;
+        _context18.n = 3;
+        return call(AttachmentQuery.loadPrevious);
+      case 3:
         _yield$call3 = _context18.v;
         attachments = _yield$call3.attachments;
         hasNext = _yield$call3.hasNext;
         if (!forPopup) {
-          _context18.n = 4;
+          _context18.n = 5;
           break;
         }
-        _context18.n = 3;
+        _context18.n = 4;
         return put(addAttachmentsForPopupAC(attachments, direction));
-      case 3:
-        _context18.n = 7;
-        break;
       case 4:
-        _context18.n = 5;
-        return put(setAttachmentsCompleteAC(hasNext));
+        _context18.n = 8;
+        break;
       case 5:
         _context18.n = 6;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return put(setAttachmentsCompleteAC(hasNext));
       case 6:
         _context18.n = 7;
-        return put(addAttachmentsAC(attachments));
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 7:
-        _context18.n = 9;
-        break;
+        _context18.n = 8;
+        return put(addAttachmentsAC(attachments));
       case 8:
-        _context18.p = 8;
+        _context18.n = 10;
+        break;
+      case 9:
+        _context18.p = 9;
         _t26 = _context18.v;
         log.error('error in message attachment query', _t26);
-      case 9:
+      case 10:
         return _context18.a(2);
     }
-  }, _marked13$1, null, [[0, 8]]);
+  }, _marked13$1, null, [[0, 9]]);
 }
 function pauseAttachmentUploading(action) {
   var attachmentId, isPaused, _t27;

package/package.json

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

package/types/index.d.ts

@@ -145,10 +145,7 @@ export interface IMessage {
     updatedAt?: Date;
     type: string;
     deliveryStatus: string;
-    markerTotals: {
-        name: string;
-        count: number;
-    }[];
+    markerTotals: IMarker[];
     userMarkers: IMarker[];
     incoming: boolean;
     metadata: any;