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

Replace MessageModel#isUnread with isMessageUnread utility

Browse source
This commit is contained in:
Evan Hahn 2021-07-29 09:29:07 -05:00 • committed by GitHub
parent 0acefaa656
commit 8cadc40975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/state/ducks/conversations.ts
View file

@ -47,6 +47,7 @@ import {
getGroupSizeRecommendedLimit,
getGroupSizeHardLimit,
} from '../../groups/limits';
import { isMessageUnread } from '../../util/isMessageUnread';
import { toggleSelectedContactForGroupAddition } from '../../groups/toggleSelectedContactForGroupAddition';
import { GroupNameCollisionsWithIdsByTitle } from '../../util/groupMemberNameCollisions';
import { ContactSpoofingType } from '../../util/contactSpoofing';
@ -2241,7 +2242,7 @@ export function reducer(
const oldestId = newMessageIds.find(messageId => {
const message = lookup[messageId];
return Boolean(message.unread);
return message && isMessageUnread(message);
});
if (oldestId) {
@ -2257,7 +2258,7 @@ export function reducer(
const newUnread: number = newMessageIds.reduce((sum, messageId) => {
const message = lookup[messageId];
return sum + (message && message.unread ? 1 : 0);
return sum + (message && isMessageUnread(message) ? 1 : 0);
}, 0);
totalUnread = (totalUnread || 0) + newUnread;
}