@amityco/ts-sdk 6.8.2 → 6.8.3-3fa65b7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/index.cjs.js +17 -10
  2. package/dist/index.esm.js +17 -10
  3. package/dist/index.umd.js +1 -1
  4. package/dist/marker/events/onMessageMarked.d.ts.map +1 -1
  5. package/package.json +1 -1
  6. package/src/marker/events/onMessageMarked.ts +17 -10
package/dist/index.cjs.js CHANGED
@@ -6534,24 +6534,31 @@ const onMessageMarked = (callback) => {
6534
6534
  var _a, _b;
6535
6535
  ingestInCache(payload);
6536
6536
  const cacheCollection = queryCache(['message', 'collection']);
6537
- if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0) {
6538
- const contentMarker = payload.contentMarkers[0];
6537
+ const { contentMarkers, feedMarkers } = payload;
6538
+ if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0 && (feedMarkers === null || feedMarkers === void 0 ? void 0 : feedMarkers.length) > 0) {
6539
+ /**
6540
+ * in case of read the message collection,
6541
+ * use feedId of the feedMarkers to check if it equal to subChannelId.
6542
+ */
6539
6543
  const currentMessageCollection = cacheCollection.filter(currentMessage => {
6540
- if (!isObject(currentMessage.key[2]))
6544
+ const cacheKey = currentMessage.key;
6545
+ if (!isObject(cacheKey[2]))
6541
6546
  return false;
6542
- return currentMessage.key[2].subChannelId === contentMarker.feedId;
6547
+ const queryParams = cacheKey[2];
6548
+ return queryParams.subChannelId === feedMarkers[0].feedId;
6543
6549
  });
6544
- if (currentMessageCollection.length > 0) {
6550
+ if (currentMessageCollection.length > 0 && (contentMarkers === null || contentMarkers === void 0 ? void 0 : contentMarkers.length) > 0) {
6545
6551
  const currentMessages = ((_b = (_a = currentMessageCollection[0].data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.map(messageId => {
6546
6552
  return pullFromCache(['message', 'get', messageId]);
6547
6553
  })) || [];
6548
6554
  currentMessages.forEach(message => {
6549
- const isSameSubChannelId = contentMarker.feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
6550
- const isReadCountLatest = contentMarker.readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
6551
- const isDeliveredCountLatest = contentMarker.deliveredCount > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
6555
+ var _a;
6556
+ const isSameSubChannelId = contentMarkers[0].feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
6557
+ const isReadCountLatest = contentMarkers[0].readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
6558
+ const isDeliveredCountLatest = ((_a = contentMarkers[0]) === null || _a === void 0 ? void 0 : _a.deliveredCount) > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
6552
6559
  if (isSameSubChannelId) {
6553
- pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarker.readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
6554
- ? contentMarker.deliveredCount
6560
+ pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarkers[0].readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
6561
+ ? contentMarkers[0].deliveredCount
6555
6562
  : message === null || message === void 0 ? void 0 : message.data.deliveredCount }));
6556
6563
  }
6557
6564
  });
package/dist/index.esm.js CHANGED
@@ -22625,24 +22625,31 @@ const onMessageMarked = (callback) => {
22625
22625
  var _a, _b;
22626
22626
  ingestInCache(payload);
22627
22627
  const cacheCollection = queryCache(['message', 'collection']);
22628
- if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0) {
22629
- const contentMarker = payload.contentMarkers[0];
22628
+ const { contentMarkers, feedMarkers } = payload;
22629
+ if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0 && (feedMarkers === null || feedMarkers === void 0 ? void 0 : feedMarkers.length) > 0) {
22630
+ /**
22631
+ * in case of read the message collection,
22632
+ * use feedId of the feedMarkers to check if it equal to subChannelId.
22633
+ */
22630
22634
  const currentMessageCollection = cacheCollection.filter(currentMessage => {
22631
- if (!isObject(currentMessage.key[2]))
22635
+ const cacheKey = currentMessage.key;
22636
+ if (!isObject(cacheKey[2]))
22632
22637
  return false;
22633
- return currentMessage.key[2].subChannelId === contentMarker.feedId;
22638
+ const queryParams = cacheKey[2];
22639
+ return queryParams.subChannelId === feedMarkers[0].feedId;
22634
22640
  });
22635
- if (currentMessageCollection.length > 0) {
22641
+ if (currentMessageCollection.length > 0 && (contentMarkers === null || contentMarkers === void 0 ? void 0 : contentMarkers.length) > 0) {
22636
22642
  const currentMessages = ((_b = (_a = currentMessageCollection[0].data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.map(messageId => {
22637
22643
  return pullFromCache(['message', 'get', messageId]);
22638
22644
  })) || [];
22639
22645
  currentMessages.forEach(message => {
22640
- const isSameSubChannelId = contentMarker.feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
22641
- const isReadCountLatest = contentMarker.readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
22642
- const isDeliveredCountLatest = contentMarker.deliveredCount > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
22646
+ var _a;
22647
+ const isSameSubChannelId = contentMarkers[0].feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
22648
+ const isReadCountLatest = contentMarkers[0].readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
22649
+ const isDeliveredCountLatest = ((_a = contentMarkers[0]) === null || _a === void 0 ? void 0 : _a.deliveredCount) > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
22643
22650
  if (isSameSubChannelId) {
22644
- pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarker.readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
22645
- ? contentMarker.deliveredCount
22651
+ pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarkers[0].readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
22652
+ ? contentMarkers[0].deliveredCount
22646
22653
  : message === null || message === void 0 ? void 0 : message.data.deliveredCount }));
22647
22654
  }
22648
22655
  });