@liveblocks/emails 2.17.0-usrnotsettings3 → 2.18.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { CommentBodyText, CommentBodyLink, BaseUserMeta, DU, CommentBodyMention, ResolveUsersArgs, OptionalPromise, DRI, CommentBody } from '@liveblocks/core';
+import { CommentBodyText, CommentBodyLink, BaseUserMeta, DU, CommentBodyMention, ResolveUsersArgs, Awaitable, DRI, CommentBody } from '@liveblocks/core';
 export { ResolveUsersArgs } from '@liveblocks/core';
 import { ReactNode, ComponentType } from 'react';
 import { Properties } from 'csstype';
@@ -204,7 +204,7 @@ type PrepareTextMentionNotificationEmailBaseDataOptions = {
     /**
      * A function that returns room info from room IDs.
      */
-    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => OptionalPromise<DRI | undefined>;
+    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => Awaitable<DRI | undefined>;
 };
 type MentionEmailAsReactData<U extends BaseUserMeta = DU> = Omit<MentionEmailBaseData, "userId" | "textEditorNodes"> & {
     author: U;
@@ -218,7 +218,7 @@ type PrepareTextMentionNotificationEmailAsReactOptions<U extends BaseUserMeta =
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The components used to customize the resulting React nodes. Each components has
      * priority over the base components inherited.
@@ -259,7 +259,7 @@ type PrepareTextMentionNotificationEmailAsHtmlOptions<U extends BaseUserMeta = D
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The styles used to customize the html elements in the resulting html safe string.
      * Each styles has priority over the base styles inherited.
@@ -306,7 +306,7 @@ type PrepareThreadNotificationEmailBaseDataOptions = {
     /**
      * A function that returns room info from room IDs.
      */
-    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => OptionalPromise<DRI | undefined>;
+    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => Awaitable<DRI | undefined>;
 };
 type CommentEmailAsHtmlData<U extends BaseUserMeta = DU> = Omit<CommentEmailBaseData, "userId" | "rawBody"> & {
     author: U;
@@ -331,7 +331,7 @@ type PrepareThreadNotificationEmailAsHtmlOptions<U extends BaseUserMeta = DU> =
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The styles used to customize the html elements in the resulting html safe string inside a comment body.
      * Each styles has priority over the base styles inherited.
@@ -370,7 +370,7 @@ type PrepareThreadNotificationEmailAsReactOptions<U extends BaseUserMeta = DU> =
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The components used to customize the resulting React nodes inside a comment body.
      * Each components has priority over the base components inherited internally defined.

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CommentBodyText, CommentBodyLink, BaseUserMeta, DU, CommentBodyMention, ResolveUsersArgs, OptionalPromise, DRI, CommentBody } from '@liveblocks/core';
+import { CommentBodyText, CommentBodyLink, BaseUserMeta, DU, CommentBodyMention, ResolveUsersArgs, Awaitable, DRI, CommentBody } from '@liveblocks/core';
 export { ResolveUsersArgs } from '@liveblocks/core';
 import { ReactNode, ComponentType } from 'react';
 import { Properties } from 'csstype';
@@ -204,7 +204,7 @@ type PrepareTextMentionNotificationEmailBaseDataOptions = {
     /**
      * A function that returns room info from room IDs.
      */
-    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => OptionalPromise<DRI | undefined>;
+    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => Awaitable<DRI | undefined>;
 };
 type MentionEmailAsReactData<U extends BaseUserMeta = DU> = Omit<MentionEmailBaseData, "userId" | "textEditorNodes"> & {
     author: U;
@@ -218,7 +218,7 @@ type PrepareTextMentionNotificationEmailAsReactOptions<U extends BaseUserMeta =
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The components used to customize the resulting React nodes. Each components has
      * priority over the base components inherited.
@@ -259,7 +259,7 @@ type PrepareTextMentionNotificationEmailAsHtmlOptions<U extends BaseUserMeta = D
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The styles used to customize the html elements in the resulting html safe string.
      * Each styles has priority over the base styles inherited.
@@ -306,7 +306,7 @@ type PrepareThreadNotificationEmailBaseDataOptions = {
     /**
      * A function that returns room info from room IDs.
      */
-    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => OptionalPromise<DRI | undefined>;
+    resolveRoomInfo?: (args: ResolveRoomInfoArgs) => Awaitable<DRI | undefined>;
 };
 type CommentEmailAsHtmlData<U extends BaseUserMeta = DU> = Omit<CommentEmailBaseData, "userId" | "rawBody"> & {
     author: U;
@@ -331,7 +331,7 @@ type PrepareThreadNotificationEmailAsHtmlOptions<U extends BaseUserMeta = DU> =
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The styles used to customize the html elements in the resulting html safe string inside a comment body.
      * Each styles has priority over the base styles inherited.
@@ -370,7 +370,7 @@ type PrepareThreadNotificationEmailAsReactOptions<U extends BaseUserMeta = DU> =
     /**
      * A function that returns info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => Awaitable<(U["info"] | undefined)[] | undefined>;
     /**
      * The components used to customize the resulting React nodes inside a comment body.
      * Each components has priority over the base components inherited internally defined.

package/dist/index.js

@@ -3,7 +3,7 @@ var _core = require('@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 = "cjs";
 
 // ../../node_modules/lib0/map.js
@@ -7693,9 +7693,6 @@ function createBatchUsersResolver({
 // src/liveblocks-text-editor.tsx
 
 
-
-
-
 // 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 = _nullishCoalesce(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
   });