Skip to content

[FIX] Read Receipts were not working properly with subscriptions without ls #15656

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
rodrigok merged 1 commit into from
Oct 24, 2019
Merged

[FIX] Read Receipts were not working properly with subscriptions without ls #15656

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: 3 additions & 0 deletions app/models/server/models/Subscriptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,9 @@ export class Subscriptions extends Base {
getMinimumLastSeenByRoomId(rid) {
return this.db.findOne({
rid,
ls: {
$exists: true,
},
}, {
sort: {
ls: 1,
Expand Down
6 changes: 5 additions & 1 deletion imports/message-read-receipt/server/lib/ReadReceipt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ const debounceByRoomId = function(fn) {
const updateMessages = debounceByRoomId(Meteor.bindEnvironment(({ _id, lm }) => {
// @TODO maybe store firstSubscription in room object so we don't need to call the above update method
const firstSubscription = Subscriptions.getMinimumLastSeenByRoomId(_id);
if (!firstSubscription) {
return;
}

Messages.setAsRead(_id, firstSubscription.ls);

if (lm <= firstSubscription.ls) {
Expand Down Expand Up @@ -53,7 +57,7 @@ export const ReadReceipt = {

// this will usually happens if the message sender is the only one on the room
const firstSubscription = Subscriptions.getMinimumLastSeenByRoomId(roomId);
if (message.unread && message.ts < firstSubscription.ls) {
if (firstSubscription && message.unread && message.ts < firstSubscription.ls) {
Messages.setAsReadById(message._id, firstSubscription.ls);
}

Expand Down