@stream-io/feeds-client 0.2.0 → 0.2.1

package/src/feed/event-handlers/bookmark/handle-bookmark-added.ts

@@ -1,63 +1,106 @@
 import type { Feed } from '../../../feed';
-import type { ActivityResponse, BookmarkAddedEvent } from '../../../gen/models';
-import type { EventPayload, UpdateStateResult } from '../../../types-internal';
+import type {
+  ActivityPinResponse,
+  ActivityResponse,
+  BookmarkAddedEvent,
+} from '../../../gen/models';
+import type { EventPayload } from '../../../types-internal';
+import { updateEntityInArray } from '../../../utils';
 
-import { updateActivityInState } from '../activity';
+const sharedUpdateActivity = ({
+  currentActivity,
+  event,
+  eventBelongsToCurrentUser,
+}: {
+  currentActivity: ActivityResponse;
+  event: BookmarkAddedEvent;
+  eventBelongsToCurrentUser: boolean;
+}): ActivityResponse => {
+  let newOwnBookmarks = currentActivity.own_bookmarks;
 
-export const addBookmarkToActivity = (
-  event: BookmarkAddedEvent,
-  activity: ActivityResponse,
-  isCurrentUser: boolean,
-): UpdateStateResult<ActivityResponse> => {
-  // Update own_bookmarks if the bookmark is from the current user
-  const ownBookmarks = [...(activity.own_bookmarks || [])];
-  if (isCurrentUser) {
-    ownBookmarks.push(event.bookmark);
+  if (eventBelongsToCurrentUser) {
+    newOwnBookmarks = [...newOwnBookmarks, event.bookmark];
   }
 
   return {
-    ...activity,
-    own_bookmarks: ownBookmarks,
-    changed: true,
+    ...event.bookmark.activity,
+    own_bookmarks: newOwnBookmarks,
+    own_reactions: currentActivity.own_reactions,
   };
 };
 
 export const addBookmarkToActivities = (
   event: BookmarkAddedEvent,
   activities: ActivityResponse[] | undefined,
-  isCurrentUser: boolean,
-): UpdateStateResult<{ activities: ActivityResponse[] }> => {
-  if (!activities) {
-    return { changed: false, activities: [] };
-  }
+  eventBelongsToCurrentUser: boolean,
+) =>
+  updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.bookmark.activity.id,
+    updater: (matchedActivity) =>
+      sharedUpdateActivity({
+        currentActivity: matchedActivity,
+        event,
+        eventBelongsToCurrentUser,
+      }),
+  });
 
-  const activityIndex = activities.findIndex(
-    (a) => a.id === event.bookmark.activity.id,
-  );
-  if (activityIndex === -1) {
-    return { changed: false, activities };
-  }
+export const addBookmarkToPinnedActivities = (
+  event: BookmarkAddedEvent,
+  pinnedActivities: ActivityPinResponse[] | undefined,
+  eventBelongsToCurrentUser: boolean,
+) =>
+  updateEntityInArray({
+    entities: pinnedActivities,
+    matcher: (pinnedActivity) =>
+      pinnedActivity.activity.id === event.bookmark.activity.id,
+    updater: (matchedPinnedActivity) => {
+      const newActivity = sharedUpdateActivity({
+        currentActivity: matchedPinnedActivity.activity,
+        event,
+        eventBelongsToCurrentUser,
+      });
 
-  const activity = activities[activityIndex];
-  const updatedActivity = addBookmarkToActivity(event, activity, isCurrentUser);
-  return updateActivityInState(updatedActivity, activities, true);
-};
+      if (newActivity === matchedPinnedActivity.activity) {
+        return matchedPinnedActivity;
+      }
+
+      return {
+        ...matchedPinnedActivity,
+        activity: newActivity,
+      };
+    },
+  });
 
 export function handleBookmarkAdded(
   this: Feed,
   event: EventPayload<'feeds.bookmark.added'>,
 ) {
-  const currentActivities = this.currentState.activities;
+  const {
+    activities: currentActivities,
+    pinned_activities: currentPinnedActivities,
+  } = this.currentState;
   const { connected_user: connectedUser } = this.client.state.getLatestValue();
-  const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
+  const eventBelongsToCurrentUser =
+    event.bookmark.user.id === connectedUser?.id;
 
-  const result = addBookmarkToActivities(
-    event,
-    currentActivities,
-    isCurrentUser,
-  );
+  const [result1, result2] = [
+    addBookmarkToActivities(
+      event,
+      currentActivities,
+      eventBelongsToCurrentUser,
+    ),
+    addBookmarkToPinnedActivities(
+      event,
+      currentPinnedActivities,
+      eventBelongsToCurrentUser,
+    ),
+  ];
 
-  if (result.changed) {
-    this.state.partialNext({ activities: result.activities });
+  if (result1.changed || result2.changed) {
+    this.state.partialNext({
+      activities: result1.entities,
+      pinned_activities: result2.entities,
+    });
   }
 }

package/src/feed/event-handlers/bookmark/handle-bookmark-deleted.test.ts

@@ -0,0 +1,188 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { Feed } from '../../../feed';
+import { FeedsClient } from '../../../feeds-client';
+import { handleBookmarkDeleted } from './handle-bookmark-deleted';
+import {
+  generateActivityPinResponse,
+  generateActivityResponse,
+  generateFeedResponse,
+  generateOwnUser,
+  getHumanId,
+  generateFeedReactionResponse,
+  generateBookmarkDeletedEvent,
+  generateBookmarkResponse,
+} from '../../../test-utils/response-generators';
+
+describe(handleBookmarkDeleted.name, () => {
+  let feed: Feed;
+  let client: FeedsClient;
+  let currentUserId: string;
+
+  beforeEach(() => {
+    client = new FeedsClient('mock-api-key');
+    currentUserId = getHumanId();
+    client.state.partialNext({
+      connected_user: generateOwnUser({ id: currentUserId }),
+    });
+    const feedResponse = generateFeedResponse({
+      id: 'main',
+      group_id: 'user',
+      created_by: { id: currentUserId },
+    });
+    feed = new Feed(
+      client,
+      feedResponse.group_id,
+      feedResponse.id,
+      feedResponse,
+    );
+  });
+
+  it('removes a bookmark for the current user and updates activities', () => {
+    const event = generateBookmarkDeletedEvent({
+      bookmark: {
+        activity: {
+          own_reactions: [],
+          bookmark_count: 0,
+        },
+        user: { id: currentUserId },
+      },
+    });
+    const activity = generateActivityResponse({
+      id: event.bookmark.activity.id,
+      bookmark_count: 1,
+      own_bookmarks: [
+        generateBookmarkResponse({
+          activity: { id: event.bookmark.activity.id },
+          user: { id: currentUserId },
+        }),
+      ],
+      own_reactions: [generateFeedReactionResponse()],
+    });
+    const activityPin = generateActivityPinResponse({
+      activity: { ...activity },
+    });
+    feed.state.partialNext({
+      activities: [activity],
+      pinned_activities: [activityPin],
+    });
+
+    const stateBefore = feed.currentState;
+    expect(stateBefore.activities![0].own_bookmarks).toHaveLength(1);
+    expect(
+      stateBefore.pinned_activities![0].activity.own_bookmarks,
+    ).toHaveLength(1);
+    expect(stateBefore.activities![0].bookmark_count).toEqual(1);
+    expect(stateBefore.pinned_activities![0].activity.bookmark_count).toEqual(
+      1,
+    );
+
+    handleBookmarkDeleted.call(feed, event);
+
+    const stateAfter = feed.currentState;
+    expect(stateAfter.activities![0].own_bookmarks).toHaveLength(0);
+    expect(
+      stateAfter.pinned_activities![0].activity.own_bookmarks,
+    ).toHaveLength(0);
+    expect(stateAfter.activities![0].own_reactions).toEqual(
+      stateBefore.activities![0].own_reactions,
+    );
+    expect(stateAfter.pinned_activities![0].activity.own_reactions).toEqual(
+      stateBefore.pinned_activities![0].activity.own_reactions,
+    );
+    expect(stateAfter.activities![0].bookmark_count).toEqual(0);
+    expect(stateAfter.pinned_activities![0].activity.bookmark_count).toEqual(0);
+  });
+
+  it('does not remove from own_bookmarks if bookmark is from another user but still updates activity', () => {
+    const event = generateBookmarkDeletedEvent({
+      bookmark: {
+        activity: {
+          own_reactions: [],
+          bookmark_count: 0,
+        },
+        user: { id: 'other-user-id' },
+      },
+    });
+    const activity = generateActivityResponse({
+      id: event.bookmark.activity.id,
+      bookmark_count: 1,
+      own_bookmarks: [
+        generateBookmarkResponse({
+          activity: { id: event.bookmark.activity.id },
+          user: { id: currentUserId },
+        }),
+      ],
+      own_reactions: [generateFeedReactionResponse()],
+    });
+    const activityPin = generateActivityPinResponse({
+      activity: { ...activity },
+    });
+    feed.state.partialNext({
+      activities: [activity],
+      pinned_activities: [activityPin],
+    });
+
+    const stateBefore = feed.currentState;
+    expect(stateBefore.activities![0].own_bookmarks).toHaveLength(1);
+    expect(
+      stateBefore.pinned_activities![0].activity.own_bookmarks,
+    ).toHaveLength(1);
+    expect(stateBefore.activities![0].bookmark_count).toEqual(1);
+    expect(stateBefore.pinned_activities![0].activity.bookmark_count).toEqual(
+      1,
+    );
+
+    handleBookmarkDeleted.call(feed, event);
+
+    const stateAfter = feed.currentState;
+    expect(stateAfter.activities![0].own_bookmarks).toEqual(
+      stateBefore.activities![0].own_bookmarks,
+    );
+    expect(stateAfter.pinned_activities![0].activity.own_bookmarks).toEqual(
+      stateBefore.pinned_activities![0].activity.own_bookmarks,
+    );
+    expect(stateAfter.activities![0].own_reactions).toEqual(
+      stateBefore.activities![0].own_reactions,
+    );
+    expect(stateAfter.pinned_activities![0].activity.own_reactions).toEqual(
+      stateBefore.pinned_activities![0].activity.own_reactions,
+    );
+    expect(stateAfter.activities![0].bookmark_count).toEqual(0);
+    expect(stateAfter.pinned_activities![0].activity.bookmark_count).toEqual(0);
+  });
+
+  it('does nothing if activity is not found', () => {
+    const event = generateBookmarkDeletedEvent({
+      bookmark: {
+        activity: {
+          own_reactions: [],
+          bookmark_count: 0,
+        },
+        user: { id: currentUserId },
+      },
+    });
+    const activity = generateActivityResponse({
+      id: 'another-activity-id',
+      bookmark_count: 1,
+      own_bookmarks: [
+        generateBookmarkResponse({
+          activity: { id: 'another-activity-id', },
+          user: { id: currentUserId },
+        }),
+      ],
+      own_reactions: [generateFeedReactionResponse()],
+    });
+    const activityPin = generateActivityPinResponse({
+      activity: { ...activity },
+    });
+    feed.state.partialNext({
+      activities: [activity],
+      pinned_activities: [activityPin],
+    });
+
+    const stateBefore = feed.currentState;
+    handleBookmarkDeleted.call(feed, event);
+    const stateAfter = feed.currentState;
+    expect(stateAfter).toBe(stateBefore);
+  });
+});

package/src/feed/event-handlers/bookmark/handle-bookmark-deleted.ts

@@ -1,12 +1,12 @@
 import type { Feed } from '../../../feed';
 import type {
+  ActivityPinResponse,
   ActivityResponse,
   BookmarkDeletedEvent,
   BookmarkResponse,
 } from '../../../gen/models';
-import type { EventPayload, UpdateStateResult } from '../../../types-internal';
-
-import { updateActivityInState } from '../activity';
+import type { EventPayload } from '../../../types-internal';
+import { updateEntityInArray } from '../../../utils';
 
 // Helper function to check if two bookmarks are the same
 // A bookmark is identified by activity_id + folder_id + user_id
@@ -21,64 +21,102 @@ export const isSameBookmark = (
   );
 };
 
-export const removeBookmarkFromActivities = (
-  event: BookmarkDeletedEvent,
-  activities: ActivityResponse[] | undefined,
-  isCurrentUser: boolean,
-): UpdateStateResult<{ activities: ActivityResponse[] }> => {
-  if (!activities) {
-    return { changed: false, activities: [] };
-  }
+const sharedUpdateActivity = ({
+  currentActivity,
+  event,
+  eventBelongsToCurrentUser,
+}: {
+  currentActivity: ActivityResponse;
+  event: BookmarkDeletedEvent;
+  eventBelongsToCurrentUser: boolean;
+}): ActivityResponse => {
+  let newOwnBookmarks = currentActivity.own_bookmarks;
 
-  const activityIndex = activities.findIndex(
-    (a) => a.id === event.bookmark.activity.id,
-  );
-  if (activityIndex === -1) {
-    return { changed: false, activities };
+  if (eventBelongsToCurrentUser) {
+    newOwnBookmarks = currentActivity.own_bookmarks.filter(
+      (bookmark) => !isSameBookmark(bookmark, event.bookmark),
+    );
   }
 
-  const activity = activities[activityIndex];
-  const updatedActivity = removeBookmarkFromActivity(
-    event,
-    activity,
-    isCurrentUser,
-  );
-  return updateActivityInState(updatedActivity, activities, true);
+  return {
+    ...event.bookmark.activity,
+    own_bookmarks: newOwnBookmarks,
+    own_reactions: currentActivity.own_reactions,
+  };
 };
 
-export const removeBookmarkFromActivity = (
+export const removeBookmarkFromActivities = (
   event: BookmarkDeletedEvent,
-  activity: ActivityResponse,
-  isCurrentUser: boolean,
-): UpdateStateResult<ActivityResponse> => {
-  // Update own_bookmarks if the bookmark is from the current user
-  const ownBookmarks = isCurrentUser
-    ? (activity.own_bookmarks || []).filter(
-        (bookmark) => !isSameBookmark(bookmark, event.bookmark),
-      )
-    : activity.own_bookmarks;
+  activities: ActivityResponse[] | undefined,
+  eventBelongsToCurrentUser: boolean,
+) =>
+  updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.bookmark.activity.id,
+    updater: (matchedActivity) =>
+      sharedUpdateActivity({
+        currentActivity: matchedActivity,
+        event,
+        eventBelongsToCurrentUser,
+      }),
+  });
 
-  return {
-    ...activity,
-    own_bookmarks: ownBookmarks,
-    changed: true,
-  };
-};
+export const removeBookmarkFromPinnedActivities = (
+  event: BookmarkDeletedEvent,
+  pinnedActivities: ActivityPinResponse[] | undefined,
+  eventBelongsToCurrentUser: boolean,
+) =>
+  updateEntityInArray({
+    entities: pinnedActivities,
+    matcher: (pinnedActivity) =>
+      pinnedActivity.activity.id === event.bookmark.activity.id,
+    updater: (matchedPinnedActivity) => {
+      const newActivity = sharedUpdateActivity({
+        currentActivity: matchedPinnedActivity.activity,
+        event,
+        eventBelongsToCurrentUser,
+      });
+
+      if (newActivity === matchedPinnedActivity.activity) {
+        return matchedPinnedActivity;
+      }
+
+      return {
+        ...matchedPinnedActivity,
+        activity: newActivity,
+      };
+    },
+  });
 
 export function handleBookmarkDeleted(
   this: Feed,
   event: EventPayload<'feeds.bookmark.deleted'>,
 ) {
-  const currentActivities = this.currentState.activities;
+  const {
+    activities: currentActivities,
+    pinned_activities: currentPinnedActivities,
+  } = this.currentState;
   const { connected_user: connectedUser } = this.client.state.getLatestValue();
-  const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
+  const eventBelongsToCurrentUser =
+    event.bookmark.user.id === connectedUser?.id;
 
-  const result = removeBookmarkFromActivities(
-    event,
-    currentActivities,
-    isCurrentUser,
-  );
-  if (result.changed) {
-    this.state.partialNext({ activities: result.activities });
+  const [result1, result2] = [
+    removeBookmarkFromActivities(
+      event,
+      currentActivities,
+      eventBelongsToCurrentUser,
+    ),
+    removeBookmarkFromPinnedActivities(
+      event,
+      currentPinnedActivities,
+      eventBelongsToCurrentUser,
+    ),
+  ];
+
+  if (result1.changed || result2.changed) {
+    this.state.partialNext({
+      activities: result1.entities,
+      pinned_activities: result2.entities,
+    });
   }
 }

package/src/feed/event-handlers/bookmark/handle-bookmark-updated.test.ts

@@ -0,0 +1,196 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { Feed } from '../../../feed';
+import { FeedsClient } from '../../../feeds-client';
+import { handleBookmarkUpdated } from './handle-bookmark-updated';
+import {
+  generateActivityPinResponse,
+  generateActivityResponse,
+  generateFeedResponse,
+  generateOwnUser,
+  getHumanId,
+  generateFeedReactionResponse,
+  generateBookmarkUpdatedEvent,
+  generateBookmarkResponse,
+} from '../../../test-utils/response-generators';
+
+describe(handleBookmarkUpdated.name, () => {
+  let feed: Feed;
+  let client: FeedsClient;
+  let currentUserId: string;
+
+  beforeEach(() => {
+    client = new FeedsClient('mock-api-key');
+    currentUserId = getHumanId();
+    client.state.partialNext({
+      connected_user: generateOwnUser({ id: currentUserId }),
+    });
+    const feedResponse = generateFeedResponse({
+      id: 'main',
+      group_id: 'user',
+      created_by: { id: currentUserId },
+    });
+    feed = new Feed(
+      client,
+      feedResponse.group_id,
+      feedResponse.id,
+      feedResponse,
+    );
+  });
+
+  it('updates a bookmark for the current user and updates activities', () => {
+    const event = generateBookmarkUpdatedEvent({
+      bookmark: {
+        activity: {
+          own_reactions: [],
+          bookmark_count: 1,
+        },
+        user: { id: currentUserId },
+        updated_at: new Date('2025-08-06T12:00:00Z'),
+      },
+    });
+    const activity = generateActivityResponse({
+      id: event.bookmark.activity.id,
+      bookmark_count: 1,
+      own_bookmarks: [
+        generateBookmarkResponse({
+          activity: { id: event.bookmark.activity.id },
+          user: { id: currentUserId },
+          updated_at: new Date('2025-08-05T12:00:00Z'),
+        }),
+      ],
+      own_reactions: [generateFeedReactionResponse()],
+    });
+    const activityPin = generateActivityPinResponse({
+      activity: { ...activity },
+    });
+    feed.state.partialNext({
+      activities: [activity],
+      pinned_activities: [activityPin],
+    });
+
+    const stateBefore = feed.currentState;
+    expect(stateBefore.activities![0].own_bookmarks).toHaveLength(1);
+    expect(
+      stateBefore.pinned_activities![0].activity.own_bookmarks,
+    ).toHaveLength(1);
+    expect(stateBefore.activities![0].own_bookmarks[0].updated_at).not.toEqual(
+      event.bookmark.updated_at,
+    );
+    expect(
+      stateBefore.pinned_activities![0].activity.own_bookmarks[0].updated_at,
+    ).not.toEqual(event.bookmark.updated_at);
+
+    handleBookmarkUpdated.call(feed, event);
+
+    const stateAfter = feed.currentState;
+    expect(stateAfter.activities![0].own_bookmarks).toHaveLength(1);
+    expect(stateAfter.pinned_activities![0].activity.own_bookmarks).toHaveLength(1);
+    expect(stateAfter.activities![0].own_bookmarks[0]).toEqual(event.bookmark);
+    expect(stateAfter.pinned_activities![0].activity.own_bookmarks[0]).toEqual(
+      event.bookmark,
+    );
+    expect(stateAfter.activities![0].own_reactions).toEqual(
+      stateBefore.activities![0].own_reactions,
+    );
+    expect(stateAfter.pinned_activities![0].activity.own_reactions).toEqual(
+      stateBefore.pinned_activities![0].activity.own_reactions,
+    );
+    expect(stateAfter.activities![0].bookmark_count).toEqual(1);
+    expect(stateAfter.pinned_activities![0].activity.bookmark_count).toEqual(1);
+  });
+
+  it('does not update own_bookmarks if bookmark is from another user but still updates activity', () => {
+    const event = generateBookmarkUpdatedEvent({
+      bookmark: {
+        activity: {
+          own_reactions: [],
+          bookmark_count: 2,
+        },
+        user: { id: 'other-user-id' },
+        updated_at: new Date('2025-08-06T12:00:00Z'),
+      },
+    });
+    const activity = generateActivityResponse({
+      id: event.bookmark.activity.id,
+      bookmark_count: 1,
+      own_bookmarks: [
+        generateBookmarkResponse({
+          activity: { id: event.bookmark.activity.id },
+          user: { id: currentUserId },
+          updated_at: new Date('2025-08-05T12:00:00Z'),
+        }),
+      ],
+      own_reactions: [generateFeedReactionResponse()],
+    });
+    const activityPin = generateActivityPinResponse({
+      activity: { ...activity },
+    });
+    feed.state.partialNext({
+      activities: [activity],
+      pinned_activities: [activityPin],
+    });
+
+    const stateBefore = feed.currentState;
+    expect(stateBefore.activities![0].own_bookmarks).toHaveLength(1);
+    expect(
+      stateBefore.pinned_activities![0].activity.own_bookmarks,
+    ).toHaveLength(1);
+    expect(stateBefore.activities![0].bookmark_count).toEqual(1);
+    expect(stateBefore.pinned_activities![0].activity.bookmark_count).toEqual(
+      1,
+    );
+
+    handleBookmarkUpdated.call(feed, event);
+
+    const stateAfter = feed.currentState;
+    expect(stateAfter.activities![0].own_bookmarks).toEqual(
+      stateBefore.activities![0].own_bookmarks,
+    );
+    expect(stateAfter.pinned_activities![0].activity.own_bookmarks).toEqual(
+      stateBefore.pinned_activities![0].activity.own_bookmarks,
+    );
+    expect(stateAfter.activities![0].own_reactions).toEqual(
+      stateBefore.activities![0].own_reactions,
+    );
+    expect(stateAfter.pinned_activities![0].activity.own_reactions).toEqual(
+      stateBefore.pinned_activities![0].activity.own_reactions,
+    );
+    expect(stateAfter.activities![0].bookmark_count).toEqual(2);
+    expect(stateAfter.pinned_activities![0].activity.bookmark_count).toEqual(2);
+  });
+
+  it('does nothing if activity is not found', () => {
+    const event = generateBookmarkUpdatedEvent({
+      bookmark: {
+        activity: {
+          own_reactions: [],
+          bookmark_count: 1,
+        },
+        user: { id: currentUserId },
+      },
+    });
+    const activity = generateActivityResponse({
+      id: 'unrelated-activity-id',
+      bookmark_count: 1,
+      own_bookmarks: [
+        generateBookmarkResponse({
+          activity: { id: 'unrelated-activity-id' },
+          user: { id: currentUserId },
+        }),
+      ],
+      own_reactions: [generateFeedReactionResponse()],
+    });
+    const activityPin = generateActivityPinResponse({
+      activity: { ...activity },
+    });
+    feed.state.partialNext({
+      activities: [activity],
+      pinned_activities: [activityPin],
+    });
+
+    const stateBefore = feed.currentState;
+    handleBookmarkUpdated.call(feed, event);
+    const stateAfter = feed.currentState;
+    expect(stateAfter).toBe(stateBefore);
+  });
+});