Further cleanup

Author: arnautov-anton

packages/feeds-client/index.ts

@@ -11,3 +11,4 @@ export * from './src/common/UserSearchSource';
 export * from './src/common/FeedSearchSource';
 export * from './src/common/Poll';
 export * from './src/utils';
+export * from './src/type-assertions';

packages/feeds-client/src/Feed.ts

@@ -39,6 +39,8 @@ import {
   handleActivityRemovedFromFeed,
   handleActivityReactionDeleted,
   handleActivityReactionAdded,
+  handleFeedUpdated,
+  handleNotificationFeedUpdated,
 } from './event-handlers/feed';
 import { capitalize } from './common/utils';
 import type {
@@ -156,9 +158,7 @@ export class Feed extends FeedApi {
     'feeds.comment.updated': handleCommentUpdated.bind(this),
     'feeds.feed.created': Feed.noop,
     'feeds.feed.deleted': Feed.noop,
-    'feeds.feed.updated': (event) => {
-      this.state.partialNext({ ...event.feed });
-    },
+    'feeds.feed.updated': handleFeedUpdated.bind(this),
     'feeds.feed_group.changed': Feed.noop,
     'feeds.feed_group.deleted': Feed.noop,
     'feeds.follow.created': handleFollowCreated.bind(this),
@@ -170,10 +170,7 @@ export class Feed extends FeedApi {
     'feeds.feed_member.added': handleFeedMemberAdded.bind(this),
     'feeds.feed_member.removed': handleFeedMemberRemoved.bind(this),
     'feeds.feed_member.updated': handleFeedMemberUpdated.bind(this),
-    'feeds.notification_feed.updated': (event) => {
-      console.info('notification feed updated', event);
-      // TODO: handle notification feed updates
-    },
+    'feeds.notification_feed.updated': handleNotificationFeedUpdated.bind(this),
     // the poll events should be removed from here
     'feeds.poll.closed': Feed.noop,
     'feeds.poll.deleted': Feed.noop,

packages/feeds-client/src/event-handlers/feed/activity/activity-reaction-utils.test.ts

@@ -109,6 +109,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
 
@@ -123,6 +124,7 @@ describe('activity-reaction-utils', () => {
         count: 1,
         first_reaction_at: reaction.created_at,
         last_reaction_at: reaction.created_at,
+        sum_scores: 0,
       });
     });
 
@@ -136,6 +138,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
       const event = createMockAddedEvent(reaction, eventActivity);
@@ -150,6 +153,7 @@ describe('activity-reaction-utils', () => {
         count: 1,
         first_reaction_at: reaction.created_at,
         last_reaction_at: reaction.created_at,
+        sum_scores: 0,
       });
     });
   });
@@ -165,6 +169,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
       const event = createMockAddedEvent(reaction, eventActivity);
@@ -196,6 +201,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
       const event = createMockAddedEvent(reaction, eventActivity);
@@ -230,6 +236,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
       const event = createMockAddedEvent(reaction, eventActivity);
@@ -253,6 +260,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
       const event = createMockAddedEvent(reaction, eventActivity);
@@ -274,6 +282,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
       const event = createMockAddedEvent(reaction, eventActivity);
@@ -296,6 +305,7 @@ describe('activity-reaction-utils', () => {
           count: 1,
           first_reaction_at: reaction.created_at,
           last_reaction_at: reaction.created_at,
+          sum_scores: 0,
         },
       };
       const event = createMockAddedEvent(reaction, eventActivity);

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

@@ -0,0 +1,9 @@
+import { Feed } from '../../../Feed';
+import { EventPayload } from '../../../types-internal';
+
+export function handleFeedUpdated(
+  this: Feed,
+  event: EventPayload<'feeds.feed.updated'>,
+) {
+  this.state.partialNext({ ...event.feed });
+}

packages/feeds-client/src/event-handlers/feed/feed/index.ts

@@ -0,0 +1 @@
+export * from './handle-feed-updated';

packages/feeds-client/src/event-handlers/feed/index.ts

@@ -2,4 +2,6 @@ export * from './follow';
 export * from './comment';
 export * from './feed-member';
 export * from './bookmark';
-export * from './activity';
+export * from './activity';
+export * from './feed';
+export * from './notification-feed';

packages/feeds-client/src/event-handlers/feed/notification-feed/handle-notification-feed-updated.ts

@@ -0,0 +1,10 @@
+import type { Feed } from '../../../Feed';
+import type { EventPayload } from '../../../types-internal';
+
+export function handleNotificationFeedUpdated(
+  this: Feed,
+  event: EventPayload<'feeds.notification_feed.updated'>,
+) {
+  console.info('notification feed updated', event);
+  // TODO: handle notification feed updates
+}

packages/feeds-client/src/event-handlers/feed/notification-feed/index.ts

@@ -0,0 +1 @@
+export * from './handle-notification-feed-updated'

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

@@ -1,4 +1,5 @@
-import { FeedResponse, FollowResponse } from './gen/models';
+import { CommentResponse, FeedResponse, FollowResponse } from './gen/models';
+import { CommentParent } from './types';
 
 export const isFollowResponse = (data: object): data is FollowResponse => {
   return 'source_feed' in data && 'target_feed' in data;
@@ -7,3 +8,9 @@ export const isFollowResponse = (data: object): data is FollowResponse => {
 export const isFeedResponse = (data: object): data is FeedResponse => {
   return 'created_by' in data;
 };
+
+export const isCommentResponse = (
+  entity: CommentParent,
+): entity is CommentResponse => {
+  return typeof (entity as CommentResponse)?.object_id === 'string';
+};

packages/feeds-client/src/utils.ts

@@ -1,5 +1,4 @@
-import { CommentParent, StreamFile } from './types';
-import type { CommentResponse } from './gen/models';
+import { StreamFile } from './types';
 
 export const isImageFile = (file: StreamFile) => {
   // photoshop files begin with 'image/'
@@ -17,12 +16,6 @@ export const checkHasAnotherPage = <T extends unknown | undefined>(
   (typeof v === 'undefined' && typeof cursor === 'undefined') ||
   typeof cursor === 'string';
 
-export const isCommentResponse = (
-  entity: CommentParent,
-): entity is CommentResponse => {
-  return typeof (entity as CommentResponse)?.object_id === 'string';
-};
-
 export const Constants = {
   DEFAULT_COMMENT_PAGINATION: 'first',
 } as const;