Skip to content
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

fix: Read receipts are not created on the first time a user reads a room #30610

Merged
merged 16 commits into from
Oct 17, 2023
Merged

fix: Read receipts are not created on the first time a user reads a room #30610

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
968de5a
Fix read receipts not being created on the first time a user reads a …
matheusbsilva137 Oct 9, 2023
56c9ca6
add tests
heitortanoue Oct 9, 2023
dfb9eaf
Merge branch 'fix/receipts-not-created-first-read' of https://github.…
heitortanoue Oct 9, 2023
31584ca
Merge branch 'develop' into fix/receipts-not-created-first-read
matheusbsilva137 Oct 10, 2023
7257ce2
Mark as read only messages sent after subscription's creation
matheusbsilva137 Oct 10, 2023
6db185b
Fix lint
matheusbsilva137 Oct 10, 2023
800d7cb
Remove unrelated change
matheusbsilva137 Oct 10, 2023
fa36418
Create changesets
matheusbsilva137 Oct 10, 2023
596a560
Merge branch 'develop' into fix/receipts-not-created-first-read
matheusbsilva137 Oct 10, 2023
230e653
Remove new tests (to be added in new PR later)
matheusbsilva137 Oct 10, 2023
dde591c
Use older timestamp so that more messages are marked as read
matheusbsilva137 Oct 13, 2023
fed478c
Merge branch 'develop' into fix/receipts-not-created-first-read
matheusbsilva137 Oct 13, 2023
b5997c8
Merge branch 'develop' into fix/receipts-not-created-first-read
kodiakhq[bot] Oct 13, 2023
303fdf3
Merge branch 'develop' into fix/receipts-not-created-first-read
scuciatto Oct 16, 2023
cdfa875
Merge branch 'develop' into fix/receipts-not-created-first-read
scuciatto Oct 16, 2023
9f0852a
Merge branch 'develop' into fix/receipts-not-created-first-read
scuciatto Oct 17, 2023
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
5 changes: 5 additions & 0 deletions .changeset/weak-cameras-pay.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed issue with message read receipts not being created when accessing a room the first time
5 changes: 3 additions & 2 deletions apps/meteor/server/lib/readMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { callbacks } from '../../lib/callbacks';
export async function readMessages(rid: IRoom['_id'], uid: IUser['_id'], readThreads: boolean): Promise<void> {
await callbacks.run('beforeReadMessages', rid, uid);

const projection = { ls: 1, tunread: 1, alert: 1 };
const projection = { ls: 1, tunread: 1, alert: 1, ts: 1 };
const sub = await Subscriptions.findOneByRoomIdAndUserId(rid, uid, { projection });
if (!sub) {
throw new Error('error-invalid-subscription');
Expand All @@ -19,5 +19,6 @@ export async function readMessages(rid: IRoom['_id'], uid: IUser['_id'], readThr

await NotificationQueue.clearQueueByUserId(uid);

callbacks.runAsync('afterReadMessages', rid, { uid, lastSeen: sub.ls });
const lastSeen = sub.ls || sub.ts;
callbacks.runAsync('afterReadMessages', rid, { uid, lastSeen });
}
Loading