Skip to content

fix: privatize watch handlers #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arnautov-anton merged 1 commit into from
Aug 4, 2025
Merged

fix: privatize watch handlers #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/feeds-client/src/feed/event-handlers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
5 changes: 5 additions & 0 deletions packages/feeds-client/src/feed/event-handlers/watch/handle-watch-started.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Feed } from '../../feed';

export function handleWatchStarted(this: Feed) {
this.state.partialNext({ watch: true });
}
5 changes: 5 additions & 0 deletions packages/feeds-client/src/feed/event-handlers/watch/handle-watch-stopped.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Feed } from '../../feed';

export function handleWatchStopped(this: Feed) {
this.state.partialNext({ watch: false });
}
2 changes: 2 additions & 0 deletions packages/feeds-client/src/feed/event-handlers/watch/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './handle-watch-started';
export * from './handle-watch-stopped';
18 changes: 0 additions & 18 deletions packages/feeds-client/src/feed/feed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
8 changes: 5 additions & 3 deletions packages/feeds-client/src/feeds-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import {
handleFollowCreated,
handleFollowDeleted,
handleFollowUpdated,
handleWatchStarted,
handleWatchStopped,
} from './feed';

export type FeedsClientState = {
Expand Down Expand Up @@ -107,7 +109,7 @@ export class FeedsClient extends FeedsApi {
}
} else {
for (const activeFeed of Object.values(this.activeFeeds)) {
activeFeed.handleWatchStopped();
handleWatchStopped.bind(activeFeed)();
Copy link
Contributor

@isekovanic isekovanic Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume we always need to bind these now, right ?

Copy link
Contributor Author

@arnautov-anton arnautov-anton Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can do fn.call(instance) instead too.

}
}
break;
Expand Down Expand Up @@ -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;
Expand All @@ -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 {
Expand Down