@stream-io/feeds-client 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/feeds-client",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "packageManager": "yarn@3.2.4",
   "main": "./dist/index.node.js",
   "exports": {

package/src/feed/event-handlers/activity/activity-reaction-utils.test.ts

@@ -5,73 +5,45 @@ import {
   ActivityResponse,
   FeedsReactionResponse,
 } from '../../../gen/models';
+import { addReactionToActivities, removeReactionFromActivities } from './';
 import {
-  addReactionToActivity,
-  removeReactionFromActivity,
-  addReactionToActivities,
-  removeReactionFromActivities,
-} from './';
-
-const createMockActivity = (id: string): ActivityResponse => ({
-  id,
-  type: 'test',
-  created_at: new Date(),
-  updated_at: new Date(),
-  visibility: 'public',
-  bookmark_count: 0,
-  comment_count: 0,
-  share_count: 0,
-  attachments: [],
-  comments: [],
-  feeds: [],
-  filter_tags: [],
-  interest_tags: [],
-  latest_reactions: [],
-  mentioned_users: [],
-  own_bookmarks: [],
-  own_reactions: [],
-  custom: {},
-  reaction_groups: {},
-  search_data: {},
-  popularity: 0,
-  score: 0,
-  reaction_count: 0,
-  user: {
-    id: 'user1',
-    created_at: new Date(),
-    updated_at: new Date(),
-    banned: false,
-    language: 'en',
-    online: false,
-    role: 'user',
-    blocked_user_ids: [],
-    teams: [],
-    custom: {},
-  },
-});
+  generateActivityResponse,
+  generateFeedReactionResponse,
+} from '../../../test-utils';
 
-const createMockReaction = (
-  type: string,
-  userId: string,
-  activityId: string,
-): FeedsReactionResponse => ({
-  type,
-  user: {
-    id: userId,
-    created_at: new Date(),
-    updated_at: new Date(),
-    banned: false,
-    language: 'en',
-    online: false,
-    role: 'user',
-    blocked_user_ids: [],
-    teams: [],
-    custom: {},
-  },
-  activity_id: activityId,
-  created_at: new Date(),
-  updated_at: new Date(),
-});
+const addReactionToActivity = (
+  event: ActivityReactionAddedEvent,
+  activity: ActivityResponse,
+  eventBelongsToCurrentUser: boolean,
+) => {
+  const result = addReactionToActivities(
+    event,
+    [activity],
+    eventBelongsToCurrentUser,
+  );
+
+  return {
+    changed: result.changed,
+    ...result.entities![0],
+  };
+};
+
+const removeReactionFromActivity = (
+  event: ActivityReactionAddedEvent,
+  activity: ActivityResponse,
+  eventBelongsToCurrentUser: boolean,
+) => {
+  const result = removeReactionFromActivities(
+    event,
+    [activity],
+    eventBelongsToCurrentUser,
+  );
+
+  return {
+    changed: result.changed,
+    ...result.entities![0],
+  };
+};
 
 const createMockAddedEvent = (
   reaction: FeedsReactionResponse,
@@ -100,8 +72,12 @@ const createMockDeletedEvent = (
 describe('activity-reaction-utils', () => {
   describe('addReactionToActivity', () => {
     it('should add reaction to own_reactions when from current user', () => {
-      const activity = createMockActivity('activity1');
-      const reaction = createMockReaction('like', 'user1', 'activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.latest_reactions = [reaction];
       eventActivity.reaction_groups = {
@@ -129,8 +105,12 @@ describe('activity-reaction-utils', () => {
     });
 
     it('should not add reaction to own_reactions when not from current user', () => {
-      const activity = createMockActivity('activity1');
-      const reaction = createMockReaction('like', 'user2', 'activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user2' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.latest_reactions = [reaction];
       eventActivity.reaction_groups = {
@@ -160,8 +140,12 @@ describe('activity-reaction-utils', () => {
 
   describe('removeReactionFromActivity', () => {
     it('should remove reaction from own_reactions when from current user', () => {
-      const activity = createMockActivity('activity1');
-      const reaction = createMockReaction('like', 'user1', 'activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.latest_reactions = [reaction];
       eventActivity.reaction_groups = {
@@ -192,8 +176,12 @@ describe('activity-reaction-utils', () => {
     });
 
     it('should not remove reaction from own_reactions when not from current user', () => {
-      const activity = createMockActivity('activity1');
-      const reaction = createMockReaction('like', 'user1', 'activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.latest_reactions = [reaction];
       eventActivity.reaction_groups = {
@@ -226,9 +214,13 @@ describe('activity-reaction-utils', () => {
 
   describe('addReactionToActivities', () => {
     it('should add reaction to activity in activities array', () => {
-      const activity = createMockActivity('activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
       const activities = [activity];
-      const reaction = createMockReaction('like', 'user1', 'activity1');
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.latest_reactions = [reaction];
       eventActivity.reaction_groups = {
@@ -244,16 +236,20 @@ describe('activity-reaction-utils', () => {
       const result = addReactionToActivities(event, activities, true);
 
       expect(result.changed).toBe(true);
-      expect(result.activities).toHaveLength(1);
-      expect(result.activities[0].own_reactions).toHaveLength(1);
-      expect(result.activities[0].own_reactions[0]).toEqual(reaction);
+      expect(result.entities!).toHaveLength(1);
+      expect(result.entities![0].own_reactions).toHaveLength(1);
+      expect(result.entities![0].own_reactions[0]).toEqual(reaction);
     });
 
     it('should return unchanged state if activity not found', () => {
-      const activity = createMockActivity('activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
       const activities = [activity];
-      const reaction = createMockReaction('like', 'user1', 'activity2');
-      const eventActivity = createMockActivity('activity2');
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity2',
+      });
+      const eventActivity = generateActivityResponse({ id: 'activity2' });
       eventActivity.latest_reactions = [reaction];
       eventActivity.reaction_groups = {
         [reaction.type]: {
@@ -268,12 +264,16 @@ describe('activity-reaction-utils', () => {
       const result = addReactionToActivities(event, activities, true);
 
       expect(result.changed).toBe(false);
-      expect(result.activities).toBe(activities);
+      expect(result.entities).toBe(activities);
     });
 
     it('should handle undefined activities', () => {
-      const activity = createMockActivity('activity1');
-      const reaction = createMockReaction('like', 'user1', 'activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.own_reactions = [reaction];
       eventActivity.latest_reactions = [reaction];
@@ -290,14 +290,18 @@ describe('activity-reaction-utils', () => {
       const result = addReactionToActivities(event, undefined, true);
 
       expect(result.changed).toBe(false);
-      expect(result.activities).toEqual([]);
+      expect(result.entities).toBeUndefined();
     });
   });
 
   describe('removeReactionFromActivities', () => {
     it('should remove reaction from activity in activities array', () => {
-      const activity = createMockActivity('activity1');
-      const reaction = createMockReaction('like', 'user1', 'activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.latest_reactions = [reaction];
       eventActivity.reaction_groups = {
@@ -323,15 +327,19 @@ describe('activity-reaction-utils', () => {
       );
 
       expect(result.changed).toBe(true);
-      expect(result.activities).toHaveLength(1);
-      expect(result.activities[0].own_reactions).toHaveLength(0);
+      expect(result.entities).toHaveLength(1);
+      expect(result.entities![0].own_reactions).toHaveLength(0);
     });
 
     it('should return unchanged state if activity not found', () => {
-      const activity = createMockActivity('activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
       const activities = [activity];
-      const reaction = createMockReaction('like', 'user1', 'activity2');
-      const eventActivity = createMockActivity('activity2');
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity2',
+      });
+      const eventActivity = generateActivityResponse({ id: 'activity2' });
       eventActivity.latest_reactions = [];
       eventActivity.reaction_groups = {};
       const event = createMockDeletedEvent(reaction, eventActivity);
@@ -339,12 +347,16 @@ describe('activity-reaction-utils', () => {
       const result = removeReactionFromActivities(event, activities, true);
 
       expect(result.changed).toBe(false);
-      expect(result.activities).toBe(activities);
+      expect(result.entities).toBe(activities);
     });
 
     it('should handle undefined activities', () => {
-      const activity = createMockActivity('activity1');
-      const reaction = createMockReaction('like', 'user1', 'activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
+      const reaction = generateFeedReactionResponse({
+        type: 'like',
+        user: { id: 'user1' },
+        activity_id: 'activity1',
+      });
       const eventActivity = { ...activity };
       eventActivity.latest_reactions = [];
       eventActivity.reaction_groups = {};
@@ -353,7 +365,7 @@ describe('activity-reaction-utils', () => {
       const result = removeReactionFromActivities(event, undefined, true);
 
       expect(result.changed).toBe(false);
-      expect(result.activities).toEqual([]);
+      expect(result.entities).toBeUndefined();
     });
   });
 });

package/src/feed/event-handlers/activity/activity-utils.test.ts

@@ -1,55 +1,19 @@
 import { describe, it, expect } from 'vitest';
-import { ActivityResponse, FeedsReactionResponse } from '../../../gen/models';
+import { ActivityResponse } from '../../../gen/models';
 import {
   addActivitiesToState,
   updateActivityInState,
   removeActivityFromState,
 } from './';
-
-const createMockActivity = (id: string, text?: string): ActivityResponse =>
-  ({
-    id,
-    type: 'test',
-    created_at: new Date(),
-    updated_at: new Date(),
-    visibility: 'public',
-    bookmark_count: 0,
-    comment_count: 0,
-    share_count: 0,
-    attachments: [],
-    comments: [],
-    feeds: [],
-    filter_tags: [],
-    interest_tags: [],
-    latest_reactions: [],
-    mentioned_users: [],
-    own_bookmarks: [],
-    own_reactions: [],
-    custom: {},
-    reaction_groups: {},
-    search_data: {},
-    text: text,
-    popularity: 0,
-    score: 0,
-    reaction_count: 0,
-    user: {
-      id: 'user1',
-      created_at: new Date(),
-      updated_at: new Date(),
-      banned: false,
-      language: 'en',
-      online: false,
-      role: 'user',
-      blocked_user_ids: [],
-      teams: [],
-      custom: {},
-    },
-  }) as ActivityResponse;
+import {
+  generateActivityResponse,
+  generateFeedReactionResponse,
+} from '../../../test-utils';
 
 describe('activity-utils', () => {
   describe('addActivitiesToState', () => {
-    const activity1 = createMockActivity('activity1');
-    const activity2 = createMockActivity('activity2');
+    const activity1 = generateActivityResponse({ id: 'activity1' });
+    const activity2 = generateActivityResponse({ id: 'activity2' });
 
     it('should add activities to empty state', () => {
       const result = addActivitiesToState([activity1], undefined, 'start');
@@ -101,7 +65,7 @@ describe('activity-utils', () => {
     });
 
     it('should handle multiple new activities correctly', () => {
-      const activity3 = createMockActivity('activity3');
+      const activity3 = generateActivityResponse({ id: 'activity3' });
 
       const existingActivities = [activity1];
       const result = addActivitiesToState(
@@ -120,109 +84,107 @@ describe('activity-utils', () => {
 
   describe('updateActivityInState', () => {
     it('should update an activity in the state', () => {
-      const originalActivity = createMockActivity('activity1', 'original text');
-      const updatedActivity = createMockActivity('activity1', 'updated text');
+      const originalActivity = generateActivityResponse({
+        id: 'activity1',
+        text: 'original text',
+      });
+      const updatedActivity = { ...originalActivity, text: 'updated text' };
       const originalActivities = [originalActivity];
 
-      const result = updateActivityInState(updatedActivity, originalActivities);
+      const result = updateActivityInState(
+        {
+          activity: updatedActivity,
+          created_at: new Date(),
+          fid: '',
+          type: '',
+          custom: {},
+        },
+        originalActivities,
+      );
 
       expect(result.changed).toBe(true);
-      expect(result.activities).toHaveLength(1);
-      expect(result.activities[0].id).toBe('activity1');
-      expect(result.activities[0].text).toBe('updated text');
+      expect(result.entities).toHaveLength(1);
+      expect(result.entities![0].id).toBe('activity1');
+      expect(result.entities![0].text).toBe('updated text');
 
       // Make sure we create a new array
-      expect(originalActivities === result.activities).toBe(false);
+      expect(originalActivities === result.entities).toBe(false);
     });
 
-    it('should preserve reaction data when updating an activity', () => {
-      const originalActivity = createMockActivity('activity1', 'original text');
-      // Mock the reaction structure with proper types
-      originalActivity.own_reactions = [
-        {
-          type: 'like',
-          user: {
-            id: 'user1',
-            created_at: new Date(),
-            updated_at: new Date(),
-            banned: false,
-            language: 'en',
-            online: false,
-            role: 'user',
-            blocked_user_ids: [],
-            teams: [],
-            custom: {},
-          },
-          activity_id: 'activity1',
-          created_at: new Date(),
-          updated_at: new Date(),
+    it('should preserve reaction data (own_reaction) when updating an activity', () => {
+      const r = generateFeedReactionResponse({
+        activity_id: 'activity1',
+        user: {
+          id: 'user1',
         },
-      ];
-      originalActivity.latest_reactions = {} as FeedsReactionResponse[];
-      (originalActivity.latest_reactions as any).like = [
+      });
+      const originalActivity = generateActivityResponse({
+        id: 'activity1',
+        text: 'original text',
+        own_reactions: [r],
+        latest_reactions: [r],
+      });
+
+      const updatedActivity = generateActivityResponse({
+        id: 'activity1',
+        text: 'updated text',
+        own_reactions: [],
+        latest_reactions: [
+          r,
+          generateFeedReactionResponse({
+            activity_id: 'activity1',
+            user: { id: 'user2' },
+          }),
+        ],
+      });
+
+      const result = updateActivityInState(
         {
-          type: 'like',
-          user: {
-            id: 'user1',
-            created_at: new Date(),
-            updated_at: new Date(),
-            banned: false,
-            language: 'en',
-            online: false,
-            role: 'user',
-            blocked_user_ids: [],
-            teams: [],
-            custom: {},
-          },
-          activity_id: 'activity1',
+          activity: updatedActivity,
           created_at: new Date(),
-          updated_at: new Date(),
-        },
-      ];
-      originalActivity.reaction_groups = {
-        like: {
-          sum_scores: 0,
-          count: 1,
-          first_reaction_at: new Date(),
-          last_reaction_at: new Date(),
+          fid: '',
+          type: '',
+          custom: {},
         },
-      };
-
-      const updatedActivity = createMockActivity('activity1', 'updated text');
-      // Reactions are not included in the updated activity from server
-
-      const result = updateActivityInState(updatedActivity, [originalActivity]);
+        [originalActivity],
+      );
 
       expect(result.changed).toBe(true);
-      expect(result.activities[0].text).toBe('updated text');
+      expect(result.entities![0].text).toBe('updated text');
       // Check that reactions were preserved
-      expect(result.activities[0].own_reactions).toEqual(
+      expect(result.entities![0].own_reactions).toEqual(
         originalActivity.own_reactions,
       );
-      expect(result.activities[0].latest_reactions).toEqual(
-        originalActivity.latest_reactions,
-      );
-      expect(result.activities[0].reaction_groups).toEqual(
-        originalActivity.reaction_groups,
-      );
     });
 
     it('should return unchanged state if activity not found', () => {
-      const existingActivity = createMockActivity('activity1');
-      const updatedActivity = createMockActivity('activity2', 'some text');
+      const existingActivity = generateActivityResponse({ id: 'activity1' });
+      const updatedActivity = generateActivityResponse({
+        id: 'activity2',
+        text: 'some text',
+      });
 
-      const result = updateActivityInState(updatedActivity, [existingActivity]);
+      const result = updateActivityInState(
+        {
+          activity: updatedActivity,
+          created_at: new Date(),
+          fid: '',
+          type: '',
+          custom: {},
+        },
+        [existingActivity],
+      );
 
       expect(result.changed).toBe(false);
-      expect(result.activities).toHaveLength(1);
-      expect(result.activities[0].id).toBe('activity1');
+      expect(result.entities).toHaveLength(1);
+      expect(result.entities![0].id).toBe('activity1');
     });
   });
 
   describe('removeActivityFromState', () => {
     it('should remove an activity from the state', () => {
-      const activity1 = createMockActivity('activity1');
-      const activity2 = createMockActivity('activity2');
+      const activity1 = generateActivityResponse({ id: 'activity1' });
+      const activity2 = generateActivityResponse({ id: 'activity2' });
       const activities = [activity1, activity2];
 
       const result = removeActivityFromState(activity1, activities);
@@ -235,8 +197,8 @@ describe('activity-utils', () => {
     });
 
     it('should return unchanged state if activity not found', () => {
-      const activity1 = createMockActivity('activity1');
-      const activity2 = createMockActivity('activity2');
+      const activity1 = generateActivityResponse({ id: 'activity1' });
+      const activity2 = generateActivityResponse({ id: 'activity2' });
       const activities = [activity1];
 
       const result = removeActivityFromState(activity2, activities);
@@ -247,7 +209,7 @@ describe('activity-utils', () => {
     });
 
     it('should handle empty activities array', () => {
-      const activity = createMockActivity('activity1');
+      const activity = generateActivityResponse({ id: 'activity1' });
       const activities: ActivityResponse[] = [];
 
       const result = removeActivityFromState(activity, activities);

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

@@ -1,14 +1,20 @@
 import type { Feed } from '../../../feed';
-import type { ActivityResponse } from '../../../gen/models';
+import type {
+  ActivityPinResponse,
+  ActivityResponse,
+} from '../../../gen/models';
 import type { EventPayload } from '../../../types-internal';
 
 export const removeActivityFromState = (
   activityResponse: ActivityResponse,
-  activities: ActivityResponse[],
+  activities: ActivityResponse[] | undefined,
 ) => {
-  const index = activities.findIndex((a) => a.id === activityResponse.id);
+  const index =
+    activities?.findIndex((activity) => activity.id === activityResponse.id) ??
+    -1;
+
   if (index !== -1) {
-    const newActivities = [...activities];
+    const newActivities = [...activities!];
     newActivities.splice(index, 1);
     return { changed: true, activities: newActivities };
   } else {
@@ -16,15 +22,42 @@ export const removeActivityFromState = (
   }
 };
 
+export const removePinnedActivityFromState = (
+  activityResponse: ActivityResponse,
+  pinnedActivities: ActivityPinResponse[] | undefined,
+) => {
+  const index =
+    pinnedActivities?.findIndex(
+      (pinnedActivity) => pinnedActivity.activity.id === activityResponse.id,
+    ) ?? -1;
+
+  if (index !== -1) {
+    const newActivities = [...pinnedActivities!];
+    newActivities.splice(index, 1);
+    return { changed: true, activities: newActivities };
+  } else {
+    return { changed: false, pinned_activities: pinnedActivities };
+  }
+};
+
 export function handleActivityDeleted(
   this: Feed,
   event: EventPayload<'feeds.activity.deleted'>,
 ) {
-  const currentActivities = this.currentState.activities;
-  if (currentActivities) {
-    const result = removeActivityFromState(event.activity, currentActivities);
-    if (result.changed) {
-      this.state.partialNext({ activities: result.activities });
-    }
+  const {
+    activities: currentActivities,
+    pinned_activities: currentPinnedActivities,
+  } = this.currentState;
+
+  const [result1, result2] = [
+    removeActivityFromState(event.activity, currentActivities),
+    removePinnedActivityFromState(event.activity, currentPinnedActivities),
+  ];
+
+  if (result1.changed || result2.changed) {
+    this.state.partialNext({
+      activities: result1.activities,
+      pinned_activities: result2.pinned_activities,
+    });
   }
 }