@liveblocks/react 2.24.0-deque1 → 2.24.0-sub1

package/dist/{room-CqmA66N2.d.cts → room-BHrloYUB.d.cts}

@@ -1,9 +1,9 @@
 import * as _liveblocks_core from '@liveblocks/core';
-import { BaseMetadata, StorageStatus, QueryMetadata, AsyncResult, DRI, AsyncSuccess, Resolve, CommentBody, CommentAttachment, PartialUnless, Patchable, InboxNotificationData, UserNotificationSettings, Relax, ToImmutable, PartialUserNotificationSettings, AsyncLoading, AsyncError, ThreadData, HistoryVersion, Client, LiveblocksError, SyncStatus, RoomEventMessage, CommentData, MutableSignal, ThreadDataWithDeleteInfo, ThreadDeleteInfo, DerivedSignal, DefaultMap, OpaqueClient, CommentUserReaction, InboxNotificationDeleteInfo, RoomNotificationSettings as RoomNotificationSettings$1, ISignal, Permission, BaseUserMeta as BaseUserMeta$1, DistributiveOmit, DU, DM, TextEditorType, IYjsProvider, DP, DS, DE } from '@liveblocks/core';
+import { BaseMetadata, StorageStatus, QueryMetadata, AsyncResult, DRI, AsyncSuccess, Resolve, CommentBody, CommentAttachment, PartialUnless, Patchable, InboxNotificationData, NotificationSettings, Relax, ToImmutable, PartialNotificationSettings, AsyncLoading, AsyncError, ThreadData, HistoryVersion, Client, LiveblocksError, SyncStatus, RoomEventMessage, CommentData, MutableSignal, ThreadDataWithDeleteInfo, ThreadDeleteInfo, DerivedSignal, DefaultMap, OpaqueClient, SubscriptionData, SubscriptionKey, CommentUserReaction, InboxNotificationDeleteInfo, SubscriptionDeleteInfo, RoomSubscriptionSettings as RoomSubscriptionSettings$1, ISignal, Permission, BaseUserMeta as BaseUserMeta$1, DistributiveOmit, DU, DM, TextEditorType, IYjsProvider, DP, DS, DE } from '@liveblocks/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react from 'react';
 import { Context, PropsWithChildren, ReactNode } from 'react';
-import { JsonObject, LsonObject, BaseUserMeta, LiveObject, User, Json, RoomNotificationSettings, Room, Status, BroadcastOptions, OthersEvent, LostConnectionEvent, History, BaseMetadata as BaseMetadata$1, Client as Client$1, ClientOptions, StorageStatus as StorageStatus$1, ThreadData as ThreadData$1, CommentData as CommentData$1 } from '@liveblocks/client';
+import { JsonObject, LsonObject, BaseUserMeta, LiveObject, User, Json, RoomSubscriptionSettings, Room, Status, BroadcastOptions, OthersEvent, LostConnectionEvent, History, BaseMetadata as BaseMetadata$1, Client as Client$1, ClientOptions, StorageStatus as StorageStatus$1, ThreadData as ThreadData$1, CommentData as CommentData$1 } from '@liveblocks/client';
 
 type UseSyncStatusOptions = {
     /**
@@ -100,9 +100,9 @@ type InboxNotificationsAsyncSuccess = PagedAsyncSuccess<InboxNotificationData[],
 type InboxNotificationsAsyncResult = PagedAsyncResult<InboxNotificationData[], "inboxNotifications">;
 type UnreadInboxNotificationsCountAsyncSuccess = AsyncSuccess<number, "count">;
 type UnreadInboxNotificationsCountAsyncResult = AsyncResult<number, "count">;
-type UserNotificationSettingsAsyncResult = AsyncResult<UserNotificationSettings, "settings">;
-type RoomNotificationSettingsAsyncSuccess = AsyncSuccess<RoomNotificationSettings, "settings">;
-type RoomNotificationSettingsAsyncResult = AsyncResult<RoomNotificationSettings, "settings">;
+type NotificationSettingsAsyncResult = AsyncResult<NotificationSettings, "settings">;
+type RoomSubscriptionSettingsAsyncSuccess = AsyncSuccess<RoomSubscriptionSettings, "settings">;
+type RoomSubscriptionSettingsAsyncResult = AsyncResult<RoomSubscriptionSettings, "settings">;
 type HistoryVersionDataAsyncResult = AsyncResult<Uint8Array>;
 type HistoryVersionsAsyncSuccess = AsyncSuccess<HistoryVersion[], "versions">;
 type HistoryVersionsAsyncResult = AsyncResult<HistoryVersion[], "versions">;
@@ -148,12 +148,18 @@ type MutationContext<P extends JsonObject, S extends LsonObject, U extends BaseU
 };
 type ThreadSubscription = Relax<{
     status: "not-subscribed";
+    subscribe: () => void;
+    unsubscribe: () => void;
 } | {
     status: "subscribed";
     unreadSince: null;
+    subscribe: () => void;
+    unsubscribe: () => void;
 } | {
     status: "subscribed";
     unreadSince: Date;
+    subscribe: () => void;
+    unsubscribe: () => void;
 }>;
 type SharedContextBundle<U extends BaseUserMeta> = {
     classic: {
@@ -596,6 +602,22 @@ type RoomContextBundleCommon<P extends JsonObject, S extends LsonObject, U exten
      * markThreadAsUnresolved("th_xxx");
      */
     useMarkThreadAsUnresolved(): (threadId: string) => void;
+    /**
+     * Returns a function that subscribes the user to a thread.
+     *
+     * @example
+     * const subscribeToThread = useSubscribeToThread();
+     * subscribeToThread("th_xxx");
+     */
+    useSubscribeToThread(): (threadId: string) => void;
+    /**
+     * Returns a function that unsubscribes the user from a thread.
+     *
+     * @example
+     * const unsubscribeFromThread = useUnsubscribeFromThread();
+     * unsubscribeFromThread("th_xxx");
+     */
+    useUnsubscribeFromThread(): (threadId: string) => void;
     /**
      * Returns a function that adds a comment to a thread.
      *
@@ -638,14 +660,21 @@ type RoomContextBundleCommon<P extends JsonObject, S extends LsonObject, U exten
      */
     useRemoveReaction(): (options: CommentReactionOptions) => void;
     /**
-     * Returns a function that updates the user's notification settings
+     * @deprecated Renamed to `useUpdateRoomSubscriptionSettings`
+     *
+     * Returns a function that updates the user's subscription settings
+     * for the current room.
+     */
+    useUpdateRoomNotificationSettings(): (settings: Partial<RoomSubscriptionSettings>) => void;
+    /**
+     * Returns a function that updates the user's subscription settings
      * for the current room.
      *
      * @example
-     * const updateRoomNotificationSettings = useUpdateRoomNotificationSettings();
-     * updateRoomNotificationSettings({ threads: "all" });
+     * const updateRoomSubscriptionSettings = useUpdateRoomSubscriptionSettings();
+     * updateRoomSubscriptionSettings({ threads: "all" });
      */
-    useUpdateRoomNotificationSettings(): (settings: Partial<RoomNotificationSettings>) => void;
+    useUpdateRoomSubscriptionSettings(): (settings: Partial<RoomSubscriptionSettings>) => void;
     /**
      * Returns a function that marks a thread as read.
      *
@@ -655,10 +684,11 @@ type RoomContextBundleCommon<P extends JsonObject, S extends LsonObject, U exten
      */
     useMarkThreadAsRead(): (threadId: string) => void;
     /**
-     * Returns the subscription status of a thread.
+     * Returns the subscription status of a thread, methods to update it, and when
+     * the thread was last read.
      *
      * @example
-     * const { status, unreadSince } = useThreadSubscription("th_xxx");
+     * const { status, subscribe, unsubscribe, unreadSince } = useThreadSubscription("th_xxx");
      */
     useThreadSubscription(threadId: string): ThreadSubscription;
 };
@@ -733,15 +763,25 @@ type RoomContextBundle<P extends JsonObject, S extends LsonObject, U extends Bas
      */
     useThreads(options?: UseThreadsOptions<M>): ThreadsAsyncResult<M>;
     /**
+     * @deprecated Renamed to `useRoomSubscriptionSettings`
+     *
      * Returns the user's notification settings for the current room
      * and a function to update them.
+     */
+    useRoomNotificationSettings(): [
+        RoomSubscriptionSettingsAsyncResult,
+        (settings: Partial<RoomSubscriptionSettings>) => void
+    ];
+    /**
+     * Returns the user's subscription settings for the current room
+     * and a function to update them.
      *
      * @example
-     * const [{ settings }, updateSettings] = useRoomNotificationSettings();
+     * const [{ settings }, updateSettings] = useRoomSubscriptionSettings();
      */
-    useRoomNotificationSettings(): [
-        RoomNotificationSettingsAsyncResult,
-        (settings: Partial<RoomNotificationSettings>) => void
+    useRoomSubscriptionSettings(): [
+        RoomSubscriptionSettingsAsyncResult,
+        (settings: Partial<RoomSubscriptionSettings>) => void
     ];
     /**
      * Returns a presigned URL for an attachment by its ID.
@@ -836,15 +876,25 @@ type RoomContextBundle<P extends JsonObject, S extends LsonObject, U extends Bas
          */
         useHistoryVersions(): HistoryVersionsAsyncSuccess;
         /**
+         * @deprecated Renamed to `useRoomSubscriptionSettings`
+         *
          * Returns the user's notification settings for the current room
          * and a function to update them.
+         */
+        useRoomNotificationSettings(): [
+            RoomSubscriptionSettingsAsyncSuccess,
+            (settings: Partial<RoomSubscriptionSettings>) => void
+        ];
+        /**
+         * Returns the user's subscription settings for the current room
+         * and a function to update them.
          *
          * @example
-         * const [{ settings }, updateSettings] = useRoomNotificationSettings();
+         * const [{ settings }, updateSettings] = useRoomSubscriptionSettings();
          */
-        useRoomNotificationSettings(): [
-            RoomNotificationSettingsAsyncSuccess,
-            (settings: Partial<RoomNotificationSettings>) => void
+        useRoomSubscriptionSettings(): [
+            RoomSubscriptionSettingsAsyncSuccess,
+            (settings: Partial<RoomSubscriptionSettings>) => void
         ];
         /**
          * Returns a presigned URL for an attachment by its ID.
@@ -919,8 +969,8 @@ type LiveblocksContextBundleCommon<M extends BaseMetadata> = {
      * const [{ settings }, updateNotificationSettings] = useNotificationSettings()
      */
     useNotificationSettings(): [
-        UserNotificationSettingsAsyncResult,
-        (settings: PartialUserNotificationSettings) => void
+        NotificationSettingsAsyncResult,
+        (settings: PartialNotificationSettings) => void
     ];
     /**
      * Returns a function that updates the user's notification
@@ -929,7 +979,7 @@ type LiveblocksContextBundleCommon<M extends BaseMetadata> = {
      * @example
      * const updateNotificationSettings = useUpdateNotificationSettings()
      */
-    useUpdateNotificationSettings(): (settings: PartialUserNotificationSettings) => void;
+    useUpdateNotificationSettings(): (settings: PartialNotificationSettings) => void;
     /**
      * Returns the current Liveblocks sync status, and triggers a re-render
      * whenever it changes. Can be used to render a "Saving..." indicator, or for
@@ -986,8 +1036,8 @@ type LiveblocksContextBundle<U extends BaseUserMeta, M extends BaseMetadata> = R
          * const [{ settings }, updateNotificationSettings] = useNotificationSettings()
          */
         useNotificationSettings(): [
-            UserNotificationSettingsAsyncResult,
-            (settings: PartialUserNotificationSettings) => void
+            NotificationSettingsAsyncResult,
+            (settings: PartialNotificationSettings) => void
         ];
         /**
          * @experimental
@@ -1047,10 +1097,10 @@ declare class ThreadDB<M extends BaseMetadata> {
      *
      * Will never return deleted threads in the result.
      */
-    findMany(roomId: string | undefined, query: ThreadsQuery<M>, direction: "asc" | "desc"): ThreadData<M>[];
+    findMany(roomId: string | undefined, query: ThreadsQuery<M> | undefined, direction: "asc" | "desc"): ThreadData<M>[];
 }
 
-type OptimisticUpdate<M extends BaseMetadata> = CreateThreadOptimisticUpdate<M> | DeleteThreadOptimisticUpdate | EditThreadMetadataOptimisticUpdate<M> | MarkThreadAsResolvedOptimisticUpdate | MarkThreadAsUnresolvedOptimisticUpdate | CreateCommentOptimisticUpdate | EditCommentOptimisticUpdate | DeleteCommentOptimisticUpdate | AddReactionOptimisticUpdate | RemoveReactionOptimisticUpdate | MarkInboxNotificationAsReadOptimisticUpdate | MarkAllInboxNotificationsAsReadOptimisticUpdate | DeleteInboxNotificationOptimisticUpdate | DeleteAllInboxNotificationsOptimisticUpdate | UpdateNotificationSettingsOptimisticUpdate | UpdateUserNotificationSettingsOptimisticUpdate;
+type OptimisticUpdate<M extends BaseMetadata> = CreateThreadOptimisticUpdate<M> | DeleteThreadOptimisticUpdate | EditThreadMetadataOptimisticUpdate<M> | MarkThreadAsResolvedOptimisticUpdate | MarkThreadAsUnresolvedOptimisticUpdate | SubscribeToThreadOptimisticUpdate | UnsubscribeFromThreadOptimisticUpdate | CreateCommentOptimisticUpdate | EditCommentOptimisticUpdate | DeleteCommentOptimisticUpdate | AddReactionOptimisticUpdate | RemoveReactionOptimisticUpdate | MarkInboxNotificationAsReadOptimisticUpdate | MarkAllInboxNotificationsAsReadOptimisticUpdate | DeleteInboxNotificationOptimisticUpdate | DeleteAllInboxNotificationsOptimisticUpdate | UpdateRoomSubscriptionSettingsOptimisticUpdate | UpdateNotificationSettingsOptimisticUpdate;
 type CreateThreadOptimisticUpdate<M extends BaseMetadata> = {
     type: "create-thread";
     id: string;
@@ -1083,6 +1133,18 @@ type MarkThreadAsUnresolvedOptimisticUpdate = {
     threadId: string;
     updatedAt: Date;
 };
+type SubscribeToThreadOptimisticUpdate = {
+    type: "subscribe-to-thread";
+    id: string;
+    threadId: string;
+    subscribedAt: Date;
+};
+type UnsubscribeFromThreadOptimisticUpdate = {
+    type: "unsubscribe-from-thread";
+    id: string;
+    threadId: string;
+    unsubscribedAt: Date;
+};
 type CreateCommentOptimisticUpdate = {
     type: "create-comment";
     id: string;
@@ -1139,16 +1201,17 @@ type DeleteAllInboxNotificationsOptimisticUpdate = {
     id: string;
     deletedAt: Date;
 };
-type UpdateNotificationSettingsOptimisticUpdate = {
-    type: "update-notification-settings";
+type UpdateRoomSubscriptionSettingsOptimisticUpdate = {
+    type: "update-room-subscription-settings";
     id: string;
     roomId: string;
-    settings: Partial<RoomNotificationSettings$1>;
+    userId: string;
+    settings: Partial<RoomSubscriptionSettings$1>;
 };
-type UpdateUserNotificationSettingsOptimisticUpdate = {
-    type: "update-user-notification-settings";
+type UpdateNotificationSettingsOptimisticUpdate = {
+    type: "update-notification-settings";
     id: string;
-    settings: PartialUserNotificationSettings;
+    settings: PartialNotificationSettings;
 };
 /**
  * Like Promise<T>, except it will have a synchronously readable `status`
@@ -1176,13 +1239,14 @@ type RoomQueryKey = string;
  */
 type NotificationsLUT = Map<string, InboxNotificationData>;
 /**
- * Notification settings by room ID.
+ * Room subscription settings by room ID.
  * e.g. { 'room-abc': { threads: "all" },
  *        'room-def': { threads: "replies_and_mentions" },
  *        'room-xyz': { threads: "none" },
  *      }
  */
-type SettingsByRoomId = Record<RoomId, RoomNotificationSettings$1>;
+type RoomSubscriptionSettingsByRoomId = Record<RoomId, RoomSubscriptionSettings$1>;
+type SubscriptionsByKey = Record<SubscriptionKey, SubscriptionData>;
 type PermissionHintsLUT = DefaultMap<RoomId, Set<Permission>>;
 type CleanThreadifications<M extends BaseMetadata> = CleanThreads<M> & CleanNotifications;
 type CleanThreads<M extends BaseMetadata> = {
@@ -1204,6 +1268,21 @@ type CleanNotifications = {
      */
     notificationsById: Record<string, InboxNotificationData>;
 };
+type CleanThreadSubscriptions = {
+    /**
+     * Thread subscriptions by key (kind + subject ID).
+     * e.g. `thread:${string}`, `$custom:${string}`, etc
+     */
+    subscriptions: SubscriptionsByKey;
+    /**
+     * All inbox notifications in a sorted array, optimistic updates applied.
+     *
+     * `useThreadSubscription` returns the subscription status based on subscriptions
+     * but also the `readAt` value of the associated notification, so we need to
+     * expose the notifications here as well.
+     */
+    notifications: InboxNotificationData[];
+};
 declare function createStore_forNotifications(): {
     signal: ISignal<NotificationsLUT>;
     markAllRead: (readAt: Date) => void;
@@ -1214,9 +1293,15 @@ declare function createStore_forNotifications(): {
     updateAssociatedNotification: (newComment: CommentData) => void;
     upsert: (notification: InboxNotificationData) => void;
 };
-declare function createStore_forRoomNotificationSettings(updates: ISignal<readonly OptimisticUpdate<BaseMetadata>[]>): {
-    signal: DerivedSignal<SettingsByRoomId>;
-    update: (roomId: string, settings: RoomNotificationSettings$1) => void;
+declare function createStore_forSubscriptions(updates: ISignal<readonly OptimisticUpdate<BaseMetadata>[]>, threads: ReadonlyThreadDB<BaseMetadata>): {
+    signal: DerivedSignal<SubscriptionsByKey>;
+    applyDelta: (newSubscriptions: SubscriptionData[], deletedSubscriptions: SubscriptionDeleteInfo[]) => void;
+    create: (subscription: SubscriptionData) => void;
+    delete: (subscriptionKey: SubscriptionKey) => void;
+};
+declare function createStore_forRoomSubscriptionSettings(updates: ISignal<readonly OptimisticUpdate<BaseMetadata>[]>): {
+    signal: DerivedSignal<RoomSubscriptionSettingsByRoomId>;
+    update: (roomId: string, settings: RoomSubscriptionSettings$1) => void;
 };
 declare function createStore_forHistoryVersions(): {
     signal: DerivedSignal<{
@@ -1231,7 +1316,8 @@ declare function createStore_forPermissionHints(): {
     update: (newHints: Record<string, Permission[]>) => void;
 };
 /**
- * User notification settings
+ * Notification settings
+ *
  * e.g.
  *  {
  *    email: {
@@ -1247,9 +1333,9 @@ declare function createStore_forPermissionHints(): {
  *  }
  * e.g. {} when before the first successful fetch.
  */
-declare function createStore_forUserNotificationSettings(updates: ISignal<readonly OptimisticUpdate<BaseMetadata>[]>): {
-    signal: DerivedSignal<UserNotificationSettings>;
-    update: (settings: UserNotificationSettings) => void;
+declare function createStore_forNotificationSettings(updates: ISignal<readonly OptimisticUpdate<BaseMetadata>[]>): {
+    signal: DerivedSignal<NotificationSettings>;
+    update: (settings: NotificationSettings) => void;
 };
 declare function createStore_forOptimistic<M extends BaseMetadata>(client: Client<BaseUserMeta$1, M>): {
     signal: ISignal<readonly OptimisticUpdate<M>[]>;
@@ -1260,10 +1346,11 @@ declare class UmbrellaStore<M extends BaseMetadata> {
     #private;
     readonly threads: ThreadDB<M>;
     readonly notifications: ReturnType<typeof createStore_forNotifications>;
-    readonly roomNotificationSettings: ReturnType<typeof createStore_forRoomNotificationSettings>;
+    readonly subscriptions: ReturnType<typeof createStore_forSubscriptions>;
+    readonly roomSubscriptionSettings: ReturnType<typeof createStore_forRoomSubscriptionSettings>;
     readonly historyVersions: ReturnType<typeof createStore_forHistoryVersions>;
     readonly permissionHints: ReturnType<typeof createStore_forPermissionHints>;
-    readonly userNotificationSettings: ReturnType<typeof createStore_forUserNotificationSettings>;
+    readonly notificationSettings: ReturnType<typeof createStore_forNotificationSettings>;
     readonly optimisticUpdates: ReturnType<typeof createStore_forOptimistic<M>>;
     readonly outputs: {
         readonly threadifications: DerivedSignal<CleanThreadifications<M>>;
@@ -1271,10 +1358,11 @@ declare class UmbrellaStore<M extends BaseMetadata> {
         readonly loadingRoomThreads: DefaultMap<RoomQueryKey, LoadableResource<ThreadsAsyncResult<M>>>;
         readonly loadingUserThreads: DefaultMap<UserQueryKey, LoadableResource<ThreadsAsyncResult<M>>>;
         readonly notifications: DerivedSignal<CleanNotifications>;
+        readonly threadSubscriptions: DerivedSignal<CleanThreadSubscriptions>;
         readonly loadingNotifications: LoadableResource<InboxNotificationsAsyncResult>;
-        readonly settingsByRoomId: DefaultMap<RoomId, LoadableResource<RoomNotificationSettingsAsyncResult>>;
+        readonly roomSubscriptionSettingsByRoomId: DefaultMap<RoomId, LoadableResource<RoomSubscriptionSettingsAsyncResult>>;
         readonly versionsByRoomId: DefaultMap<RoomId, LoadableResource<HistoryVersionsAsyncResult>>;
-        readonly userNotificationSettings: LoadableResource<UserNotificationSettingsAsyncResult>;
+        readonly notificationSettings: LoadableResource<NotificationSettingsAsyncResult>;
     };
     constructor(client: OpaqueClient);
     /**
@@ -1295,6 +1383,16 @@ declare class UmbrellaStore<M extends BaseMetadata> {
      * update.
      */
     deleteAllInboxNotifications(optimisticId: string): void;
+    /**
+     * Creates a existing subscription, replacing the corresponding
+     * optimistic update.
+     */
+    createSubscription(subscription: SubscriptionData, optimisticId: string): void;
+    /**
+     * Deletes an existing subscription, replacing the corresponding
+     * optimistic update.
+     */
+    deleteSubscription(subscriptionKey: SubscriptionKey, optimisticId: string): void;
     /**
      * Creates an new thread, replacing the corresponding optimistic update.
      */
@@ -1321,26 +1419,26 @@ declare class UmbrellaStore<M extends BaseMetadata> {
     createComment(newComment: CommentData, optimisticId: string): void;
     editComment(threadId: string, optimisticId: string, editedComment: CommentData): void;
     deleteComment(threadId: string, optimisticId: string, commentId: string, deletedAt: Date): void;
-    updateThreadifications(threads: ThreadData<M>[], notifications: InboxNotificationData[], deletedThreads?: ThreadDeleteInfo[], deletedNotifications?: InboxNotificationDeleteInfo[]): void;
+    updateThreadifications(threads: ThreadData<M>[], notifications: InboxNotificationData[], subscriptions: SubscriptionData[], deletedThreads?: ThreadDeleteInfo[], deletedNotifications?: InboxNotificationDeleteInfo[], deletedSubscriptions?: SubscriptionDeleteInfo[]): void;
     /**
-     * Updates existing notification setting for a room with a new value,
+     * Updates existing subscription settings for a room with a new value,
      * replacing the corresponding optimistic update.
      */
-    updateRoomNotificationSettings(roomId: string, optimisticId: string, settings: Readonly<RoomNotificationSettings$1>): void;
+    updateRoomSubscriptionSettings(roomId: string, optimisticId: string, settings: Readonly<RoomSubscriptionSettings$1>): void;
     fetchNotificationsDeltaUpdate(signal: AbortSignal): Promise<void>;
     fetchRoomThreadsDeltaUpdate(roomId: string, signal: AbortSignal): Promise<void>;
     fetchUserThreadsDeltaUpdate(signal: AbortSignal): Promise<void>;
     fetchRoomVersionsDeltaUpdate(roomId: string, signal: AbortSignal): Promise<void>;
-    refreshRoomNotificationSettings(roomId: string, signal: AbortSignal): Promise<void>;
+    refreshRoomSubscriptionSettings(roomId: string, signal: AbortSignal): Promise<void>;
     /**
-     * Refresh User Notification Settings from poller
+     * Refresh notification settings from poller
      */
-    refreshUserNotificationSettings(signal: AbortSignal): Promise<void>;
+    refreshNotificationSettings(signal: AbortSignal): Promise<void>;
     /**
-     * Updates user notification settings with a new value, replacing the
+     * Updates notification settings with a new value, replacing the
      * corresponding optimistic update.
      */
-    updateUserNotificationSettings_confirmOptimisticUpdate(settings: UserNotificationSettings, optimisticUpdateId: string): void;
+    updateNotificationSettings_confirmOptimisticUpdate(settings: NotificationSettings, optimisticUpdateId: string): void;
 }
 
 /**
@@ -1457,7 +1555,7 @@ declare function useUnreadInboxNotificationsCountSuspense(): {
  * @example
  * const [{ settings }, updateNotificationSettings] = useNotificationSettings()
  */
-declare function useNotificationSettings(): [UserNotificationSettingsAsyncResult, (settings: PartialUserNotificationSettings) => void];
+declare function useNotificationSettings(): [NotificationSettingsAsyncResult, (settings: PartialNotificationSettings) => void];
 /**
  * Returns notification settings for the current user.
  *
@@ -1466,9 +1564,9 @@ declare function useNotificationSettings(): [UserNotificationSettingsAsyncResult
  */
 declare function useNotificationSettingsSuspense(): [{
     readonly isLoading: false;
-    readonly settings: _liveblocks_core.UserNotificationSettings;
+    readonly settings: _liveblocks_core.NotificationSettings;
     readonly error?: undefined;
-}, (settings: PartialUserNotificationSettings) => void];
+}, (settings: PartialNotificationSettings) => void];
 /**
  * Returns a function that updates the user's notification
  * settings for a project.
@@ -1476,7 +1574,7 @@ declare function useNotificationSettingsSuspense(): [{
  * @example
  * const updateNotificationSettings = useUpdateNotificationSettings()
  */
-declare function useUpdateNotificationSettings(): (settings: PartialUserNotificationSettings) => void;
+declare function useUpdateNotificationSettings(): (settings: PartialNotificationSettings) => void;
 /**
  * Returns room info from a given room ID.
  *
@@ -1766,12 +1864,33 @@ declare function useMarkThreadAsUnresolved(): (threadId: string) => void;
  */
 declare function useMarkRoomThreadAsUnresolved(roomId: string): (threadId: string) => void;
 /**
- * Returns the subscription status of a thread.
+ * Returns a function that subscribes the user to a thread.
+ *
+ * @example
+ * const subscribeToThread = useSubscribeToThread();
+ * subscribeToThread("th_xxx");
+ */
+declare function useSubscribeToThread(): (threadId: string) => void;
+/**
+ * Returns a function that unsubscribes the user from a thread.
+ *
+ * @example
+ * const unsubscribeFromThread = useUnsubscribeFromThread();
+ * unsubscribeFromThread("th_xxx");
+ */
+declare function useUnsubscribeFromThread(): (threadId: string) => void;
+/**
+ * Returns the subscription status of a thread, methods to update it, and when
+ * the thread was last read.
  *
  * @example
- * const { status, unreadSince } = useThreadSubscription("th_xxx");
+ * const { status, subscribe, unsubscribe, unreadSince } = useThreadSubscription("th_xxx");
  */
 declare function useThreadSubscription(threadId: string): ThreadSubscription;
+/**
+ * @private
+ */
+declare function useRoomThreadSubscription(roomId: string, threadId: string): ThreadSubscription;
 /**
  * Returns the version data bianry for a given version
  *
@@ -1780,14 +1899,21 @@ declare function useThreadSubscription(threadId: string): ThreadSubscription;
  */
 declare function useHistoryVersionData(versionId: string): HistoryVersionDataAsyncResult;
 /**
- * Returns a function that updates the user's notification settings
+ * @deprecated Renamed to `useUpdateRoomSubscriptionSettings`
+ *
+ * Returns a function that updates the user's subscription settings
+ * for the current room.
+ */
+declare function useUpdateRoomNotificationSettings(): (settings: Partial<RoomSubscriptionSettings$1>) => void;
+/**
+ * Returns a function that updates the user's subscription settings
  * for the current room.
  *
  * @example
- * const updateRoomNotificationSettings = useUpdateRoomNotificationSettings();
- * updateRoomNotificationSettings({ threads: "all" });
+ * const updateRoomSubscriptionSettings = useUpdateRoomSubscriptionSettings();
+ * updateRoomSubscriptionSettings({ threads: "all" });
  */
-declare function useUpdateRoomNotificationSettings(): (settings: Partial<RoomNotificationSettings>) => void;
+declare function useUpdateRoomSubscriptionSettings(): (settings: Partial<RoomSubscriptionSettings$1>) => void;
 /**
  * Returns an array of connection IDs. This matches the values you'll get by
  * using the `useOthers()` hook.
@@ -2057,21 +2183,35 @@ declare const _useThreads: TypedBundle["useThreads"];
  */
 declare const _useThreadsSuspense: TypedBundle["suspense"]["useThreads"];
 /**
- * Returns the user's notification settings for the current room
- * and a function to update them.
+ * @deprecated Renamed to `useRoomSubscriptionSettings`
  *
- * @example
- * const [{ settings }, updateSettings] = useRoomNotificationSettings();
+ * Returns the user's subscription settings for the current room
+ * and a function to update them.
  */
 declare const _useRoomNotificationSettings: TypedBundle["useRoomNotificationSettings"];
 /**
- * Returns the user's notification settings for the current room
+ * Returns the user's subscription settings for the current room
  * and a function to update them.
  *
  * @example
- * const [{ settings }, updateSettings] = useRoomNotificationSettings();
+ * const [{ settings }, updateSettings] = useRoomSubscriptionSettings();
+ */
+declare const _useRoomSubscriptionSettings: TypedBundle["useRoomSubscriptionSettings"];
+/**
+ * @deprecated Renamed to `useRoomSubscriptionSettings`
+ *
+ * Returns the user's subscription settings for the current room
+ * and a function to update them.
  */
 declare const _useRoomNotificationSettingsSuspense: TypedBundle["suspense"]["useRoomNotificationSettings"];
+/**
+ * Returns the user's subscription settings for the current room
+ * and a function to update them.
+ *
+ * @example
+ * const [{ settings }, updateSettings] = useRoomSubscriptionSettings();
+ */
+declare const _useRoomSubscriptionSettingsSuspense: TypedBundle["suspense"]["useRoomSubscriptionSettings"];
 /**
  * (Private beta) Returns a history of versions of the current room.
  *
@@ -2313,4 +2453,4 @@ declare const _useStorageRoot: TypedBundle["useStorageRoot"];
  */
 declare const _useUpdateMyPresence: TypedBundle["useUpdateMyPresence"];
 
-export { useLostConnectionListener as $, useErrorListener as A, useMarkAllInboxNotificationsAsRead as B, ClientContext as C, useMarkInboxNotificationAsRead as D, useSyncStatus as E, createRoomContext as F, _RoomProvider as G, _useAddReaction as H, useBatch as I, _useBroadcastEvent as J, useCanRedo as K, LiveblocksProvider as L, type MutationContext as M, useCanUndo as N, useCreateComment as O, _useCreateThread as P, useDeleteComment as Q, _useDeleteThread as R, useEditComment as S, _useEditThreadMetadata as T, type UseStorageStatusOptions as U, useMarkThreadAsResolved as V, useMarkThreadAsUnresolved as W, _useEventListener as X, useHistory as Y, _useIsInsideRoom as Z, _useInboxNotificationThread as _, useAddRoomCommentReaction as a, useMarkThreadAsRead as a0, _useMutation as a1, _useMyPresence as a2, _useOthersListener as a3, useRedo as a4, useRemoveReaction as a5, _useRoom as a6, useStatus as a7, _useStorageRoot as a8, useThreadSubscription as a9, _useSelfSuspense as aA, _useStorageSuspense as aB, useStorageStatusSuspense as aC, _useThreadsSuspense as aD, useAttachmentUrlSuspense as aE, _useHistoryVersionsSuspense as aF, _useRoomNotificationSettingsSuspense as aG, useInboxNotificationsSuspense as aH, useNotificationSettingsSuspense as aI, useRoomInfoSuspense as aJ, useUnreadInboxNotificationsCountSuspense as aK, _useUserSuspense as aL, _useUserThreadsSuspense_experimental as aM, useUndo as aa, _useUpdateMyPresence as ab, useUpdateRoomNotificationSettings as ac, useHistoryVersionData as ad, _useOther as ae, _useOthers as af, useOthersConnectionIds as ag, _useOthersMapped as ah, _useSelf as ai, _useStorage as aj, useStorageStatus as ak, _useThreads as al, useAttachmentUrl as am, _useHistoryVersions as an, _useRoomNotificationSettings as ao, useInboxNotifications as ap, useNotificationSettings as aq, useUpdateNotificationSettings as ar, _useUserThreads_experimental as as, useRoomInfo as at, useUnreadInboxNotificationsCount as au, _useUser as av, _useOtherSuspense as aw, _useOthersSuspense as ax, useOthersConnectionIdsSuspense as ay, _useOthersMappedSuspense as az, useCreateRoomComment as b, useCreateRoomThread as c, useCreateTextMention as d, useDeleteRoomComment as e, useDeleteRoomThread as f, getUmbrellaStoreForClient as g, useDeleteTextMention as h, useEditRoomComment as i, useEditRoomThreadMetadata as j, useMarkRoomThreadAsRead as k, useMarkRoomThreadAsResolved as l, useMarkRoomThreadAsUnresolved as m, useMentionSuggestionsCache as n, useRemoveRoomCommentReaction as o, useReportTextEditor as p, useResolveMentionSuggestions as q, useRoomAttachmentUrl as r, useRoomPermissions as s, useYjsProvider as t, useClientOrNull as u, type UseThreadsOptions as v, createLiveblocksContext as w, useClient as x, useDeleteAllInboxNotifications as y, useDeleteInboxNotification as z };
+export { _useEventListener as $, useDeleteInboxNotification as A, useErrorListener as B, ClientContext as C, useMarkAllInboxNotificationsAsRead as D, useMarkInboxNotificationAsRead as E, useSyncStatus as F, createRoomContext as G, _RoomProvider as H, _useAddReaction as I, useBatch as J, _useBroadcastEvent as K, LiveblocksProvider as L, type MutationContext as M, useCanRedo as N, useCanUndo as O, useCreateComment as P, _useCreateThread as Q, useDeleteComment as R, _useDeleteThread as S, useEditComment as T, type UseStorageStatusOptions as U, _useEditThreadMetadata as V, useMarkThreadAsResolved as W, useMarkThreadAsUnresolved as X, useSubscribeToThread as Y, useUnsubscribeFromThread as Z, _useInboxNotificationThread as _, useAddRoomCommentReaction as a, useHistory as a0, _useIsInsideRoom as a1, useLostConnectionListener as a2, useMarkThreadAsRead as a3, _useMutation as a4, _useMyPresence as a5, _useOthersListener as a6, useRedo as a7, useRemoveReaction as a8, _useRoom as a9, _useUser as aA, _useOtherSuspense as aB, _useOthersSuspense as aC, useOthersConnectionIdsSuspense as aD, _useOthersMappedSuspense as aE, _useSelfSuspense as aF, _useStorageSuspense as aG, useStorageStatusSuspense as aH, _useThreadsSuspense as aI, useAttachmentUrlSuspense as aJ, _useHistoryVersionsSuspense as aK, _useRoomNotificationSettingsSuspense as aL, _useRoomSubscriptionSettingsSuspense as aM, useInboxNotificationsSuspense as aN, useNotificationSettingsSuspense as aO, useRoomInfoSuspense as aP, useUnreadInboxNotificationsCountSuspense as aQ, _useUserSuspense as aR, _useUserThreadsSuspense_experimental as aS, useStatus as aa, _useStorageRoot as ab, useThreadSubscription as ac, useUndo as ad, _useUpdateMyPresence as ae, useUpdateRoomNotificationSettings as af, useUpdateRoomSubscriptionSettings as ag, useHistoryVersionData as ah, _useOther as ai, _useOthers as aj, useOthersConnectionIds as ak, _useOthersMapped as al, _useSelf as am, _useStorage as an, useStorageStatus as ao, _useThreads as ap, useAttachmentUrl as aq, _useHistoryVersions as ar, _useRoomNotificationSettings as as, _useRoomSubscriptionSettings as at, useInboxNotifications as au, useNotificationSettings as av, useUpdateNotificationSettings as aw, _useUserThreads_experimental as ax, useRoomInfo as ay, useUnreadInboxNotificationsCount as az, useCreateRoomComment as b, useCreateRoomThread as c, useCreateTextMention as d, useDeleteRoomComment as e, useDeleteRoomThread as f, getUmbrellaStoreForClient as g, useDeleteTextMention as h, useEditRoomComment as i, useEditRoomThreadMetadata as j, useMarkRoomThreadAsRead as k, useMarkRoomThreadAsResolved as l, useMarkRoomThreadAsUnresolved as m, useMentionSuggestionsCache as n, useRemoveRoomCommentReaction as o, useReportTextEditor as p, useResolveMentionSuggestions as q, useRoomAttachmentUrl as r, useRoomPermissions as s, useRoomThreadSubscription as t, useClientOrNull as u, useYjsProvider as v, type UseThreadsOptions as w, createLiveblocksContext as x, useClient as y, useDeleteAllInboxNotifications as z };