Skip to content

chore: prevent multiple listener.once updateSubscription #35908

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
ggazzo merged 3 commits into from
Apr 30, 2025
Merged

chore: prevent multiple listener.once updateSubscription #35908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
651fbee
prevent multiple once
ggazzo Apr 29, 2025
5f633bf
..
ggazzo Apr 29, 2025
5eea8cf
Merge branch 'develop' into fix/leak-ev
kodiakhq[bot] Apr 30, 2025
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
6 changes: 4 additions & 2 deletions apps/meteor/client/lib/chats/readStateManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ export class ReadStateManager extends Emitter {
return this.firstUnreadRecordId;
};

public subscribeToMessages() {
return RoomHistoryManager.on('loaded-messages', () => this.updateFirstUnreadRecordId());
}

public updateSubscription(subscription?: ISubscription) {
if (!subscription) {
return;
Expand Down Expand Up @@ -88,8 +92,6 @@ export class ReadStateManager extends Emitter {
);

this.setFirstUnreadRecordId(firstUnreadRecord?._id);

RoomHistoryManager.once('loaded-messages', () => this.updateFirstUnreadRecordId());
}

private setFirstUnreadRecordId(firstUnreadRecordId: string | undefined) {
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jest.mock('../../../../../app/ui/client/lib/ChatMessages', () => {
release: jest.fn(),
readStateManager: {
updateSubscription: updateSubscriptionMock,
subscribeToMessages: jest.fn(),
},
};
}),
Expand Down
6 changes: 6 additions & 0 deletions apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ export function useChatMessagesInstance({
return [instance, () => instance.release()];
}, [rid, tmid, uid, encrypted, e2eRoomState]);

useEffect(() => {
if (subscription?.rid) {
return chatMessages?.readStateManager.subscribeToMessages();
}
}, [subscription?.rid, chatMessages?.readStateManager]);

useEffect(() => {
if (subscription) {
chatMessages?.readStateManager.updateSubscription(subscription);
Expand Down
Loading