@stream-io/feeds-client 0.1.11 → 0.2.1

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

@@ -1,76 +1,115 @@
 import type { Feed } from '../../../feed';
 import type {
+  ActivityPinResponse,
   ActivityResponse,
   BookmarkUpdatedEvent,
 } from '../../../gen/models';
-import type { EventPayload, UpdateStateResult } from '../../../types-internal';
+import type { EventPayload } from '../../../types-internal';
+import { updateEntityInArray } from '../../../utils';
 
-import { updateActivityInState } from '../activity';
 import { isSameBookmark } from './handle-bookmark-deleted';
 
-export const updateBookmarkInActivity = (
-  event: BookmarkUpdatedEvent,
-  activity: ActivityResponse,
-  isCurrentUser: boolean,
-): UpdateStateResult<ActivityResponse> => {
-  // Update own_bookmarks if the bookmark is from the current user
-  let ownBookmarks = activity.own_bookmarks || [];
-  if (isCurrentUser) {
-    const bookmarkIndex = ownBookmarks.findIndex((bookmark) =>
+const sharedUpdateActivity = ({
+  currentActivity,
+  event,
+  eventBelongsToCurrentUser,
+}: {
+  currentActivity: ActivityResponse;
+  event: BookmarkUpdatedEvent;
+  eventBelongsToCurrentUser: boolean;
+}): ActivityResponse => {
+  let newOwnBookmarks = currentActivity.own_bookmarks;
+
+  if (eventBelongsToCurrentUser) {
+    const bookmarkIndex = newOwnBookmarks.findIndex((bookmark) =>
       isSameBookmark(bookmark, event.bookmark),
     );
+
     if (bookmarkIndex !== -1) {
-      ownBookmarks = [...ownBookmarks];
-      ownBookmarks[bookmarkIndex] = event.bookmark;
+      newOwnBookmarks = [...newOwnBookmarks];
+      newOwnBookmarks[bookmarkIndex] = event.bookmark;
     }
   }
 
   return {
-    ...activity,
-    own_bookmarks: ownBookmarks,
-    changed: true,
+    ...event.bookmark.activity,
+    own_bookmarks: newOwnBookmarks,
+    own_reactions: currentActivity.own_reactions,
   };
 };
 
 export const updateBookmarkInActivities = (
   event: BookmarkUpdatedEvent,
   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 updateBookmarkInPinnedActivities = (
+  event: BookmarkUpdatedEvent,
+  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 = updateBookmarkInActivity(
-    event,
-    activity,
-    isCurrentUser,
-  );
-  return updateActivityInState(updatedActivity, activities, true);
-};
+      if (newActivity === matchedPinnedActivity.activity) {
+        return matchedPinnedActivity;
+      }
+
+      return {
+        ...matchedPinnedActivity,
+        activity: newActivity,
+      };
+    },
+  });
 
 export function handleBookmarkUpdated(
   this: Feed,
   event: EventPayload<'feeds.bookmark.updated'>,
 ) {
-  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 [result1, result2] = [
+    updateBookmarkInActivities(
+      event,
+      currentActivities,
+      eventBelongsToCurrentUser,
+    ),
+    updateBookmarkInPinnedActivities(
+      event,
+      currentPinnedActivities,
+      eventBelongsToCurrentUser,
+    ),
+  ];
 
-  const result = updateBookmarkInActivities(
-    event,
-    currentActivities,
-    isCurrentUser,
-  );
-  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/follow/handle-follow-created.test.ts

@@ -1,4 +1,8 @@
-import { FeedResponse, FollowResponse, UserResponse } from '../../../gen/models';
+import {
+  FeedResponse,
+  FollowResponse,
+  UserResponse,
+} from '../../../gen/models';
 import { generateFollowResponse } from '../../../test-utils';
 import { updateStateFollowCreated } from './handle-follow-created';
 
@@ -44,7 +48,7 @@ describe('handle-follow-created', () => {
         source_feed: {
           ...mockFeed,
           id: 'feed-x',
-          fid: 'user:feed-x',
+          feed: 'user:feed-x',
           created_by: {
             ...mockUser,
             id: 'user-x',
@@ -54,7 +58,7 @@ describe('handle-follow-created', () => {
         target_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: mockUser,
         },
       };
@@ -86,7 +90,7 @@ describe('handle-follow-created', () => {
         source_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: {
             ...mockUser,
             id: 'other-user',
@@ -95,7 +99,7 @@ describe('handle-follow-created', () => {
         target_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
           follower_count: 1,
         },
@@ -128,13 +132,13 @@ describe('handle-follow-created', () => {
         source_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: { ...mockUser, id: 'user-1' },
         },
         target_feed: {
           ...mockFeed,
           id: 'feed-x',
-          fid: 'user:feed-x',
+          feed: 'user:feed-x',
           created_by: {
             ...mockUser,
             id: 'user-x',
@@ -166,13 +170,13 @@ describe('handle-follow-created', () => {
         source_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: mockUser,
         },
         target_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
       };
@@ -202,7 +206,7 @@ describe('handle-follow-created', () => {
         source_feed: {
           ...mockFeed,
           id: 'existing-feed',
-          fid: 'user:existing-feed',
+          feed: 'user:existing-feed',
           created_by: mockUser,
         },
       };
@@ -212,13 +216,13 @@ describe('handle-follow-created', () => {
         source_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: mockUser,
         },
         target_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
       };

package/src/feed/event-handlers/follow/handle-follow-created.ts

@@ -5,10 +5,7 @@ import type {
   PartializeAllBut,
   UpdateStateResult,
 } from '../../../types-internal';
-import {
-  getStateUpdateQueueId,
-  shouldUpdateState,
-} from '../../../utils';
+import { getStateUpdateQueueId, shouldUpdateState } from '../../../utils';
 
 export const updateStateFollowCreated = (
   follow: FollowResponse,
@@ -24,7 +21,7 @@ export const updateStateFollowCreated = (
   let newState: FeedState = { ...currentState };
 
   // this feed followed someone
-  if (follow.source_feed.fid === currentFeedId) {
+  if (follow.source_feed.feed === currentFeedId) {
     newState = {
       ...newState,
       // Update FeedResponse fields, that has the new follower/following count
@@ -37,7 +34,7 @@ export const updateStateFollowCreated = (
     }
   } else if (
     // someone followed this feed
-    follow.target_feed.fid === currentFeedId
+    follow.target_feed.feed === currentFeedId
   ) {
     const source = follow.source_feed;
 
@@ -84,7 +81,7 @@ export function handleFollowCreated(
   const result = updateStateFollowCreated(
     follow,
     this.currentState,
-    this.fid,
+    this.feed,
     connectedUser?.id,
   );
   if (result.changed) {

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

@@ -1,4 +1,8 @@
-import { FollowResponse, FeedResponse, UserResponse } from '../../../gen/models';
+import {
+  FollowResponse,
+  FeedResponse,
+  UserResponse,
+} from '../../../gen/models';
 import { generateFollowResponse } from '../../../test-utils';
 import { updateStateFollowDeleted } from './handle-follow-deleted';
 
@@ -22,13 +26,13 @@ describe('handle-follow-deleted', () => {
         source_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
         target_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: mockUser,
         },
       };
@@ -59,7 +63,7 @@ describe('handle-follow-deleted', () => {
         source_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: {
             ...mockUser,
             id: 'other-user',
@@ -68,7 +72,7 @@ describe('handle-follow-deleted', () => {
         target_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
       };
@@ -101,13 +105,13 @@ describe('handle-follow-deleted', () => {
         source_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: { ...mockUser, id: 'user-1' },
         },
         target_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
       };
@@ -139,13 +143,13 @@ describe('handle-follow-deleted', () => {
         source_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: { ...mockUser, id: 'other-user' },
         },
         target_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
       };
@@ -176,13 +180,13 @@ describe('handle-follow-deleted', () => {
         source_feed: {
           ...mockFeed,
           id: 'other-feed',
-          fid: 'user:other-feed',
+          feed: 'user:other-feed',
           created_by: mockUser,
         },
         target_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
       };
@@ -214,13 +218,13 @@ describe('handle-follow-deleted', () => {
         source_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
         target_feed: {
           ...mockFeed,
           id: 'target-to-remove',
-          fid: 'user:target-to-remove',
+          feed: 'user:target-to-remove',
           created_by: mockUser,
         },
       };
@@ -230,13 +234,13 @@ describe('handle-follow-deleted', () => {
         source_feed: {
           ...mockFeed,
           id: 'feed-1',
-          fid: 'user:feed-1',
+          feed: 'user:feed-1',
           created_by: mockUser,
         },
         target_feed: {
           ...mockFeed,
           id: 'target-to-keep',
-          fid: 'user:target-to-keep',
+          feed: 'user:target-to-keep',
           created_by: mockUser,
         },
       };

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

@@ -17,7 +17,7 @@ export const updateStateFollowDeleted = (
   let newState: FeedState = { ...currentState };
 
   // this feed unfollowed someone
-  if (follow.source_feed.fid === currentFeedId) {
+  if (follow.source_feed.feed === currentFeedId) {
     newState = {
       ...newState,
       // Update FeedResponse fields, that has the new follower/following count
@@ -27,12 +27,12 @@ export const updateStateFollowDeleted = (
     // Only update if following array already exists
     if (currentState.following !== undefined) {
       newState.following = currentState.following.filter(
-        (followItem) => followItem.target_feed.fid !== follow.target_feed.fid,
+        (followItem) => followItem.target_feed.feed !== follow.target_feed.feed,
       );
     }
   } else if (
     // someone unfollowed this feed
-    follow.target_feed.fid === currentFeedId
+    follow.target_feed.feed === currentFeedId
   ) {
     const source = follow.source_feed;
 
@@ -47,14 +47,14 @@ export const updateStateFollowDeleted = (
       currentState.own_follows !== undefined
     ) {
       newState.own_follows = currentState.own_follows.filter(
-        (followItem) => followItem.source_feed.fid !== follow.source_feed.fid,
+        (followItem) => followItem.source_feed.feed !== follow.source_feed.feed,
       );
     }
 
     // Only update if followers array already exists
     if (currentState.followers !== undefined) {
       newState.followers = currentState.followers.filter(
-        (followItem) => followItem.source_feed.fid !== follow.source_feed.fid,
+        (followItem) => followItem.source_feed.feed !== follow.source_feed.feed,
       );
     }
   }
@@ -85,7 +85,7 @@ export function handleFollowDeleted(
   const result = updateStateFollowDeleted(
     follow,
     this.currentState,
-    this.fid,
+    this.feed,
     connectedUser?.id,
   );
 

package/src/feed/event-handlers/follow/handle-follow-updated.ts

@@ -1,8 +1,5 @@
 import type { Feed, FeedState } from '../../../feed';
-import {
-  getStateUpdateQueueId,
-  shouldUpdateState,
-} from '../../../utils';
+import { getStateUpdateQueueId, shouldUpdateState } from '../../../utils';
 import { EventPayload, PartializeAllBut } from '../../../types-internal';
 
 export function handleFollowUpdated(
@@ -14,7 +11,7 @@ export function handleFollowUpdated(
 ) {
   const follow = eventOrResponse.follow;
   const connectedUserId = this.client.state.getLatestValue().connected_user?.id;
-  const currentFeedId = this.fid;
+  const currentFeedId = this.feed;
 
   if (
     !shouldUpdateState({
@@ -30,7 +27,7 @@ export function handleFollowUpdated(
     let newState: FeedState | undefined;
 
     // this feed followed someone
-    if (follow.source_feed.fid === currentFeedId) {
+    if (follow.source_feed.feed === currentFeedId) {
       newState ??= {
         ...currentState,
         // Update FeedResponse fields, that has the new follower/following count
@@ -39,7 +36,7 @@ export function handleFollowUpdated(
 
       const index =
         currentState.following?.findIndex(
-          (f) => f.target_feed.fid === follow.target_feed.fid,
+          (f) => f.target_feed.feed === follow.target_feed.feed,
         ) ?? -1;
 
       if (index >= 0) {
@@ -48,7 +45,7 @@ export function handleFollowUpdated(
       }
     } else if (
       // someone followed this feed
-      follow.target_feed.fid === currentFeedId
+      follow.target_feed.feed === currentFeedId
     ) {
       const source = follow.source_feed;
 
@@ -63,7 +60,7 @@ export function handleFollowUpdated(
         currentState.own_follows
       ) {
         const index = currentState.own_follows.findIndex(
-          (f) => f.source_feed.fid === follow.source_feed.fid,
+          (f) => f.source_feed.feed === follow.source_feed.feed,
         );
 
         if (index >= 0) {
@@ -74,7 +71,7 @@ export function handleFollowUpdated(
 
       const index =
         currentState.followers?.findIndex(
-          (f) => f.source_feed.fid === follow.source_feed.fid,
+          (f) => f.source_feed.feed === follow.source_feed.feed,
         ) ?? -1;
 
       if (index >= 0) {

package/src/feed/event-handlers/index.ts

@@ -4,4 +4,5 @@ export * from './feed-member';
 export * from './bookmark';
 export * from './activity';
 export * from './feed';
-export * from './notification-feed';
+export * from './notification-feed';
+export * from './watch';

package/src/feed/event-handlers/watch/handle-watch-started.ts

@@ -0,0 +1,5 @@
+import { Feed } from '../../feed';
+
+export function handleWatchStarted(this: Feed) {
+  this.state.partialNext({ watch: true });
+}

package/src/feed/event-handlers/watch/handle-watch-stopped.ts

@@ -0,0 +1,5 @@
+import { Feed } from '../../feed';
+
+export function handleWatchStopped(this: Feed) {
+  this.state.partialNext({ watch: false });
+}

package/src/feed/event-handlers/watch/index.ts

@@ -0,0 +1,2 @@
+export * from './handle-watch-started';
+export * from './handle-watch-stopped';