Add handle-follow-updated & re-organize handlers

Author: arnautov-anton

packages/feeds-client/package.json

@@ -67,6 +67,7 @@
     "@types/react": "^19.1.8",
     "@vitest/coverage-v8": "3.2.4",
     "dotenv": "^16.4.5",
+    "human-id": "^4.1.1",
     "react": "19.0.0",
     "rimraf": "^6.0.1",
     "rollup": "^4.24.0",

packages/feeds-client/src/Feed.ts

@@ -16,7 +16,6 @@ import {
   BookmarkUpdatedEvent,
   QueryFeedMembersRequest,
   SortParamRequest,
-  FollowResponse,
   ThreadedCommentResponse,
 } from './gen/models';
 import { StateStore } from './common/StateStore';
@@ -38,10 +37,10 @@ import {
   updateBookmarkInActivities,
 } from './state-updates/bookmark-utils';
 import {
+  handleFollowUpdated,
   handleFollowCreated,
   handleFollowDeleted,
-  handleFollowUpdated,
-} from './state-updates/follow-utils';
+} from './event-handlers/feed';
 import { StreamResponse } from './gen-imports';
 import { capitalize } from './common/utils';
 import type {
@@ -52,11 +51,6 @@ import type {
   PagerResponseWithLoadingStates,
 } from './types';
 import { checkHasAnotherPage, Constants, uniqueArrayMerge } from './utils';
-import {
-  getStateUpdateQueueIdForFollow,
-  getStateUpdateQueueIdForUnfollow,
-  shouldUpdateState,
-} from './state-updates/state-update-queue';
 
 export type FeedState = Omit<
   Partial<GetOrCreateFeedResponse & FeedResponse>,
@@ -143,7 +137,7 @@ type EventHandlerByEventType = {
 export class Feed extends FeedApi {
   readonly state: StateStore<FeedState>;
   private static readonly noop = () => {};
-  private readonly stateUpdateQueue: Set<string> = new Set();
+  protected readonly stateUpdateQueue: Set<string> = new Set();
 
   private readonly eventHandlers: EventHandlerByEventType = {
     'feeds.activity.added': (event) => {
@@ -330,18 +324,9 @@ export class Feed extends FeedApi {
     },
     'feeds.feed_group.changed': Feed.noop,
     'feeds.feed_group.deleted': Feed.noop,
-    'feeds.follow.created': (event) => {
-      this.handleFollowCreated(event.follow);
-    },
-    'feeds.follow.deleted': (event) => {
-      this.handleFollowDeleted(event.follow);
-    },
-    'feeds.follow.updated': (_event) => {
-      const result = handleFollowUpdated(this.currentState);
-      if (result.changed) {
-        this.state.next(result.data);
-      }
-    },
+    'feeds.follow.created': handleFollowCreated.bind(this),
+    'feeds.follow.deleted': handleFollowDeleted.bind(this),
+    'feeds.follow.updated': handleFollowUpdated.bind(this),
     'feeds.comment.reaction.added': this.handleCommentReactionEvent.bind(this),
     'feeds.comment.reaction.deleted':
       this.handleCommentReactionEvent.bind(this),
@@ -476,7 +461,7 @@ export class Feed extends FeedApi {
     this.client = client;
   }
 
-  private readonly client: FeedsClient;
+  protected readonly client: FeedsClient;
 
   get fid() {
     return `${this.group}:${this.id}`;
@@ -630,62 +615,6 @@ export class Feed extends FeedApi {
     }
   }
 
-  /**
-   * @internal
-   */
-  handleFollowCreated(follow: FollowResponse) {
-    if (
-      !shouldUpdateState({
-        stateUpdateId: getStateUpdateQueueIdForFollow(follow),
-        stateUpdateQueue: this.stateUpdateQueue,
-        watch: this.currentState.watch,
-      })
-    ) {
-      return;
-    }
-    const connectedUser = this.client.state.getLatestValue().connected_user;
-    const result = handleFollowCreated(
-      follow,
-      this.currentState,
-      this.fid,
-      connectedUser?.id,
-    );
-    if (result.changed) {
-      this.state.next(result.data);
-    }
-  }
-
-  /**
-   * @internal
-   */
-  handleFollowDeleted(
-    follow:
-      | FollowResponse
-      // Backend doesn't return the follow in delete follow response https://getstream.slack.com/archives/C06RK9WCR09/p1753176937507209
-      | { source_feed: { fid: string }; target_feed: { fid: string } },
-  ) {
-    if (
-      !shouldUpdateState({
-        stateUpdateId: getStateUpdateQueueIdForUnfollow(follow),
-        stateUpdateQueue: this.stateUpdateQueue,
-        watch: this.currentState.watch,
-      })
-    ) {
-      return;
-    }
-
-    const connectedUser = this.client.state.getLatestValue().connected_user;
-    const result = handleFollowDeleted(
-      follow,
-      this.currentState,
-      this.fid,
-      connectedUser?.id,
-    );
-    if (result.changed) {
-      this.state.next(result.data);
-    }
-  }
-
   /**
    * @internal
    */
@@ -1112,7 +1041,11 @@ export class Feed extends FeedApi {
       this.state.next((currentState) => ({
         ...currentState,
         members: currentState.members
-          ? uniqueArrayMerge(currentState.members, members, ({ user }) => user.id)
+          ? uniqueArrayMerge(
+              currentState.members,
+              members,
+              ({ user }) => user.id,
+            )
           : members,
         member_pagination: {
           ...currentState.member_pagination,

packages/feeds-client/src/FeedsClient.ts

@@ -11,6 +11,7 @@ import {
   QueryFeedsRequest,
   QueryPollVotesRequest,
   SingleFollowRequest,
+  UpdateFollowRequest,
   UserRequest,
   WSEvent,
 } from './gen/models';
@@ -35,6 +36,11 @@ import {
 } from './common/types';
 import { ModerationClient } from './ModerationClient';
 import { StreamPoll } from './common/Poll';
+import {
+  handleFollowCreated,
+  handleFollowDeleted,
+  handleFollowUpdated,
+} from './event-handlers/feed';
 
 export type FeedsClientState = {
   connected_user: OwnUser | undefined;
@@ -363,6 +369,21 @@ export class FeedsClient extends FeedsApi {
     this.eventDispatcher.dispatch(networkEvent);
   };
 
+  async updateFollow(request: UpdateFollowRequest) {
+    const response = await super.updateFollow(request);
+
+    [response.follow.source_feed.fid, response.follow.target_feed.fid].forEach(
+      (fid) => {
+        const feed = this.activeFeeds[fid];
+        if (feed) {
+          handleFollowUpdated.bind(feed)(response);
+        }
+      },
+    );
+
+    return response;
+  }
+
   // For follow API endpoints we update the state after HTTP response to allow queryFeeds with watch: false
   async follow(request: SingleFollowRequest) {
     const response = await super.follow(request);
@@ -371,7 +392,7 @@ export class FeedsClient extends FeedsApi {
       (fid) => {
         const feed = this.activeFeeds[fid];
         if (feed) {
-          feed.handleFollowCreated(response.follow);
+          handleFollowCreated.bind(feed)(response);
         }
       },
     );
@@ -385,7 +406,7 @@ export class FeedsClient extends FeedsApi {
     response.follows.forEach((follow) => {
       const feed = this.activeFeeds[follow.source_feed.fid];
       if (feed) {
-        feed.handleFollowCreated(follow);
+        handleFollowCreated.bind(feed)({ follow });
       }
     });
 
@@ -398,9 +419,11 @@ export class FeedsClient extends FeedsApi {
     [request.source, request.target].forEach((fid) => {
       const feed = this.activeFeeds[fid];
       if (feed) {
-        feed.handleFollowDeleted({
-          source_feed: { fid: request.source },
-          target_feed: { fid: request.target },
+        handleFollowDeleted.bind(feed)({
+          follow: {
+            source_feed: { fid: request.source },
+            target_feed: { fid: request.target },
+          },
         });
       }
     });