@liveblocks/emails 2.17.0-usrnotsettings3 → 2.18.0

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { detectDupes } from "@liveblocks/core";
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/emails";
-var PKG_VERSION = "2.17.0-usrnotsettings3";
+var PKG_VERSION = "2.18.0";
 var PKG_FORMAT = "esm";
 
 // ../../node_modules/lib0/map.js
@@ -7691,10 +7691,7 @@ function createBatchUsersResolver({
 }
 
 // src/liveblocks-text-editor.tsx
-import {
-  html,
-  htmlSafe
-} from "@liveblocks/core";
+import { html, htmlSafe } from "@liveblocks/core";
 
 // src/lib/constants.ts
 var MENTION_CHARACTER = "@";
@@ -8547,14 +8544,22 @@ function filterCommentsWithBody(comments) {
 // src/thread-notification.tsx
 var getUnreadComments = ({
   comments,
+  previousUnreadInboxNotification,
   inboxNotification,
   userId
 }) => {
   const commentsWithBody = filterCommentsWithBody(comments);
+  const otherUserComments = commentsWithBody.filter((c) => c.userId !== userId);
   const readAt = inboxNotification.readAt;
-  return commentsWithBody.filter((c) => c.userId !== userId).filter(
-    (c) => readAt ? c.createdAt > readAt && c.createdAt <= inboxNotification.notifiedAt : c.createdAt <= inboxNotification.notifiedAt
-  );
+  return otherUserComments.filter((c) => {
+    if (readAt !== null) {
+      return c.createdAt > readAt && c.createdAt <= inboxNotification.notifiedAt;
+    }
+    if (previousUnreadInboxNotification !== null) {
+      return c.createdAt >= previousUnreadInboxNotification.notifiedAt && c.createdAt <= inboxNotification.notifiedAt;
+    }
+    return c.createdAt <= inboxNotification.notifiedAt;
+  });
 };
 var getLastUnreadCommentWithMention = ({
   comments,
@@ -8570,12 +8575,17 @@ var extractThreadNotificationData = async ({
   event
 }) => {
   const { threadId, roomId, userId, inboxNotificationId } = event.data;
-  const [thread, inboxNotification] = await Promise.all([
+  const [thread, inboxNotification, { data: inboxNotifications }] = await Promise.all([
     client.getThread({ roomId, threadId }),
-    client.getInboxNotification({ inboxNotificationId, userId })
+    client.getInboxNotification({ inboxNotificationId, userId }),
+    client.getInboxNotifications({ userId, query: { unread: true } })
   ]);
+  const previousUnreadInboxNotification = inboxNotifications.sort((a, b) => b.notifiedAt.getTime() - a.notifiedAt.getTime()).filter(
+    ({ id: id2, kind }) => kind === "thread" && id2 !== inboxNotification.id
+  )[0] ?? null;
   const unreadComments = getUnreadComments({
     comments: thread.comments,
+    previousUnreadInboxNotification,
     inboxNotification,
     userId
   });