fix: Read receipts are not created on the first time a user reads a r…

…oom (#30610) Co-authored-by: Heitor Tanoue <[email protected]>
RocketChat · Oct 26, 2023 · e39962a · e39962a
1 parent 0ac93c4
commit e39962a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/weak-cameras-pay.md b/.changeset/weak-cameras-pay.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with message read receipts not being created when accessing a room the first time
diff --git a/apps/meteor/server/lib/readMessages.ts b/apps/meteor/server/lib/readMessages.ts
@@ -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');
@@ -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 });
 }