Post-merge changes

Author: arnautov-anton

packages/feeds-client/src/feed/event-handlers/follow/handle-follow-deleted.ts

@@ -6,13 +6,10 @@ import type {
   UpdateStateResult,
 } from '../../../types-internal';
 
-import { isFeedResponse } from '../../../utils';
 import { getStateUpdateQueueId, shouldUpdateState } from '../../../utils';
 
 export const updateStateFollowDeleted = (
-  follow:
-    | FollowResponse
-    | { source_feed: { fid: string }; target_feed: { fid: string } },
+  follow: FollowResponse,
   currentState: FeedState,
   currentFeedId: string,
   connectedUserId?: string,
@@ -46,7 +43,6 @@ export const updateStateFollowDeleted = (
     };
 
     if (
-      isFeedResponse(source) &&
       source.created_by.id === connectedUserId &&
       currentState.own_follows !== undefined
     ) {
@@ -68,11 +64,10 @@ export const updateStateFollowDeleted = (
 
 export function handleFollowDeleted(
   this: Feed,
-  eventOrResponse:
-    | PartializeAllBut<EventPayload<'feeds.follow.deleted'>, 'follow'>
-    | {
-        follow: { source_feed: { fid: string }; target_feed: { fid: string } };
-      },
+  eventOrResponse: PartializeAllBut<
+    EventPayload<'feeds.follow.deleted'>,
+    'follow'
+  >,
 ) {
   const follow = eventOrResponse.follow;
 

packages/feeds-client/src/feeds-client.ts

@@ -419,7 +419,7 @@ export class FeedsClient extends FeedsApi {
     [request.source, request.target].forEach((fid) => {
       const feed = this.activeFeeds[fid];
       if (feed) {
-        handleFollowDeleted.bind(this)(response.follow);
+        handleFollowDeleted.bind(feed)(response);
       }
     });
 

packages/feeds-client/src/utils/type-assertions.ts

@@ -1,15 +1,11 @@
-import { CommentResponse, FeedResponse, FollowResponse } from '../gen/models';
+import { CommentResponse, FollowResponse } from '../gen/models';
 import { StreamFile } from '../types';
 import { CommentParent } from '../types';
 
 export const isFollowResponse = (data: object): data is FollowResponse => {
   return 'source_feed' in data && 'target_feed' in data;
 };
 
-export const isFeedResponse = (data: object): data is FeedResponse => {
-  return 'created_by' in data;
-};
-
 export const isCommentResponse = (
   entity: CommentParent,
 ): entity is CommentResponse => {