Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions app/lib/methods/helpers/markMessagesRead.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { Q } from '@nozbe/watermelondb';

import database from '../../database';

interface IMarkMessagesReadParams {
rid: string;
lastOpen: number;
}

const markMessagesRead = async ({ rid, lastOpen }: IMarkMessagesReadParams) => {
const db = database.active;
try {
const messages = await db
.get('messages')
.query([Q.where('rid', rid), Q.where('unread', true), Q.where('ts', Q.lte(lastOpen))])
.fetch();
await db.write(async () => {
await db.batch(
...messages.map(message =>
message.prepareUpdate(m => {
m.unread = false;
})
)
);
});
} catch (e) {
// do nothing
}
};

export default markMessagesRead;
6 changes: 5 additions & 1 deletion app/lib/methods/subscriptions/room.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import sdk from '../../services/sdk';
import { readMessages } from '../readMessages';
import { loadMissedMessages } from '../loadMissedMessages';
import { updateLastOpen } from '../updateLastOpen';
import markMessagesRead from '../helpers/markMessagesRead';

export default class RoomSubscription {
private rid: string;
Expand Down Expand Up @@ -102,7 +103,7 @@ export default class RoomSubscription {
}
};

handleNotifyRoomReceived = protectedFunction((ddpMessage: IDDPMessage) => {
handleNotifyRoomReceived = protectedFunction(async (ddpMessage: IDDPMessage) => {
const [_rid, ev] = ddpMessage.fields.eventName.split('/');
if (this.rid !== _rid) {
return;
Expand Down Expand Up @@ -231,6 +232,9 @@ export default class RoomSubscription {
log(e);
}
});
} else if (ev === 'messagesRead') {
const lastOpen = ddpMessage.fields.args[0]?.until?.$date;
await markMessagesRead({ rid: this.rid, lastOpen });
}
});

Expand Down
4 changes: 4 additions & 0 deletions app/lib/methods/updateMessages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ export default async function updateMessages({
if (newMessage && !newMessage?.md) {
newMessage.md = undefined;
}
if (!m?.unread && newMessage?.unread) {
newMessage.unread = false;
m.unread = false;
}
Object.assign(m, newMessage);

// If image_url didn't change, keep the same attachments, trying to stick to already downloaded media inside att.title_link (starting with file://)
Expand Down
3 changes: 2 additions & 1 deletion app/lib/services/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ class Sdk {
this.subscribe('stream-room-messages', args[0], ...args),
eventUserTyping,
this.subscribe(topic, `${args[0]}/deleteMessage`, ...args),
this.subscribe(topic, `${args[0]}/deleteMessageBulk`, ...args)
this.subscribe(topic, `${args[0]}/deleteMessageBulk`, ...args),
this.subscribe(topic, `${args[0]}/messagesRead`, ...args)
]);
}

Expand Down
Loading