mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Receive support for editing messages

Browse source
This commit is contained in:
Josh Perez 2023-03-27 19:48:57 -04:00 • committed by GitHub
parent 2781e621ad
commit 36e21c0134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 2053 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ts/util/markConversationRead.ts
View file

@ -34,18 +34,23 @@ export async function markConversationRead(
): Promise<boolean> {
const { id: conversationId } = conversationAttrs;
const [unreadMessages, unreadReactions] = await Promise.all([
window.Signal.Data.getUnreadByConversationAndMarkRead({
conversationId,
newestUnreadAt,
readAt: options.readAt,
includeStoryReplies: !isGroup(conversationAttrs),
}),
window.Signal.Data.getUnreadReactionsAndMarkRead({
conversationId,
newestUnreadAt,
}),
]);
const [unreadMessages, unreadEditedMessages, unreadReactions] =
await Promise.all([
window.Signal.Data.getUnreadByConversationAndMarkRead({
conversationId,
newestUnreadAt,
readAt: options.readAt,
includeStoryReplies: !isGroup(conversationAttrs),
}),
window.Signal.Data.getUnreadEditedMessagesAndMarkRead({
fromId: conversationId,
newestUnreadAt,
}),
window.Signal.Data.getUnreadReactionsAndMarkRead({
conversationId,
newestUnreadAt,
}),
]);
log.info('markConversationRead', {
conversationId: getConversationIdForLogging(conversationAttrs),
@ -55,7 +60,11 @@ export async function markConversationRead(
unreadReactions: unreadReactions.length,
});
if (!unreadMessages.length && !unreadReactions.length) {
if (
!unreadMessages.length &&
!unreadEditedMessages.length &&
!unreadReactions.length
) {
return false;
}
@ -83,7 +92,9 @@ export async function markConversationRead(
});
});
const allReadMessagesSync = unreadMessages.map(messageSyncData => {
const allUnreadMessages = [...unreadMessages, ...unreadEditedMessages];
const allReadMessagesSync = allUnreadMessages.map(messageSyncData => {
const message = window.MessageController.getById(messageSyncData.id);
// we update the in-memory MessageModel with the fresh database call data
if (message) {