sceyt-chat-react-uikit 1.7.1-beta.11 → 1.7.1-beta.12

package/index.js

@@ -18829,7 +18829,7 @@ function getMessagesQuery(action) {
   }, _marked7$1, null, [[0, 49, 50, 52]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, messages, _t0;
+  var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
@@ -18837,30 +18837,36 @@ function getMessageQuery(action) {
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId;
         _context0.n = 1;
-        return effects.call(getChannelFromMap, channelId);
+        return effects.call(getChannelFromAllChannels, channelId);
       case 1:
         channel = _context0.v;
         _context0.n = 2;
         return effects.call(channel.getMessagesById, [messageId]);
       case 2:
         messages = _context0.v;
+        fetchedMessage = messages && messages[0] ? JSON.parse(JSON.stringify(messages[0])) : null;
+        if (!fetchedMessage) {
+          _context0.n = 5;
+          break;
+        }
         _context0.n = 3;
-        return effects.put(updateMessageAC(messageId, messages[0]));
+        return effects.put(updateMessageAC(messageId, fetchedMessage));
       case 3:
         updateMessageOnMap(channel.id, {
           messageId: messageId,
-          params: messages[0]
+          params: fetchedMessage
         });
-        updateMessageOnAllMessages(messageId, messages[0]);
+        updateMessageOnAllMessages(messageId, fetchedMessage);
         _context0.n = 4;
         return effects.put(setScrollToMessagesAC(messageId, false));
       case 4:
-        if (!(channel.lastMessage.id === messageId)) {
+        if (!(channel.lastMessage && channel.lastMessage.id === messageId)) {
           _context0.n = 5;
           break;
         }
+        updateChannelLastMessageOnAllChannels(channel.id, fetchedMessage);
         _context0.n = 5;
-        return effects.put(updateChannelLastMessageAC(messages[0], channel));
+        return effects.put(updateChannelLastMessageAC(fetchedMessage, channel));
       case 5:
         _context0.n = 7;
         break;
@@ -19402,7 +19408,7 @@ function MessageSaga() {
         return effects.takeLatest(GET_MESSAGES, getMessagesQuery);
       case 7:
         _context18.n = 8;
-        return effects.takeLatest(GET_MESSAGE, getMessageQuery);
+        return effects.takeEvery(GET_MESSAGE, getMessageQuery);
       case 8:
         _context18.n = 9;
         return effects.takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);

package/index.modern.js

@@ -18808,7 +18808,7 @@ function getMessagesQuery(action) {
   }, _marked7$1, null, [[0, 49, 50, 52]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, messages, _t0;
+  var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
@@ -18816,30 +18816,36 @@ function getMessageQuery(action) {
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId;
         _context0.n = 1;
-        return call(getChannelFromMap, channelId);
+        return call(getChannelFromAllChannels, channelId);
       case 1:
         channel = _context0.v;
         _context0.n = 2;
         return call(channel.getMessagesById, [messageId]);
       case 2:
         messages = _context0.v;
+        fetchedMessage = messages && messages[0] ? JSON.parse(JSON.stringify(messages[0])) : null;
+        if (!fetchedMessage) {
+          _context0.n = 5;
+          break;
+        }
         _context0.n = 3;
-        return put(updateMessageAC(messageId, messages[0]));
+        return put(updateMessageAC(messageId, fetchedMessage));
       case 3:
         updateMessageOnMap(channel.id, {
           messageId: messageId,
-          params: messages[0]
+          params: fetchedMessage
         });
-        updateMessageOnAllMessages(messageId, messages[0]);
+        updateMessageOnAllMessages(messageId, fetchedMessage);
         _context0.n = 4;
         return put(setScrollToMessagesAC(messageId, false));
       case 4:
-        if (!(channel.lastMessage.id === messageId)) {
+        if (!(channel.lastMessage && channel.lastMessage.id === messageId)) {
           _context0.n = 5;
           break;
         }
+        updateChannelLastMessageOnAllChannels(channel.id, fetchedMessage);
         _context0.n = 5;
-        return put(updateChannelLastMessageAC(messages[0], channel));
+        return put(updateChannelLastMessageAC(fetchedMessage, channel));
       case 5:
         _context0.n = 7;
         break;
@@ -19381,7 +19387,7 @@ function MessageSaga() {
         return takeLatest(GET_MESSAGES, getMessagesQuery);
       case 7:
         _context18.n = 8;
-        return takeLatest(GET_MESSAGE, getMessageQuery);
+        return takeEvery(GET_MESSAGE, getMessageQuery);
       case 8:
         _context18.n = 9;
         return takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);

package/package.json

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