Privatize watch handlers

Author: arnautov-anton

packages/feeds-client/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';

packages/feeds-client/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 });
+}

packages/feeds-client/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 });
+}

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

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

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

@@ -316,24 +316,6 @@ export class Feed extends FeedApi {
     }
   }
 
-  /**
-   * @internal
-   */
-  handleWatchStopped() {
-    this.state.partialNext({
-      watch: false,
-    });
-  }
-
-  /**
-   * @internal
-   */
-  handleWatchStarted() {
-    this.state.partialNext({
-      watch: true,
-    });
-  }
-
   /**
    * Returns index of the provided comment object.
    */

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

@@ -40,6 +40,8 @@ import {
   handleFollowCreated,
   handleFollowDeleted,
   handleFollowUpdated,
+  handleWatchStarted,
+  handleWatchStopped,
 } from './feed';
 
 export type FeedsClientState = {
@@ -107,7 +109,7 @@ export class FeedsClient extends FeedsApi {
             }
           } else {
             for (const activeFeed of Object.values(this.activeFeeds)) {
-              activeFeed.handleWatchStopped();
+              handleWatchStopped.bind(activeFeed)();
             }
           }
           break;
@@ -436,7 +438,7 @@ export class FeedsClient extends FeedsApi {
     const feed =
       this.activeFeeds[`${request.feed_group_id}:${request.feed_id}`];
     if (feed) {
-      feed.handleWatchStopped();
+      handleWatchStopped.bind(feed)();
     }
 
     return response;
@@ -452,7 +454,7 @@ export class FeedsClient extends FeedsApi {
     if (this.activeFeeds[fid]) {
       const feed = this.activeFeeds[fid];
       if (watch && !feed.currentState.watch) {
-        feed.handleWatchStarted();
+        handleWatchStarted.bind(feed)();
       }
       return feed;
     } else {