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

9
ts/models/messages.ts
View file

@ -56,6 +56,7 @@ import {
import { migrateLegacySendAttributes } from '../messages/migrateLegacySendAttributes';
import { getOwn } from '../util/getOwn';
import { markRead } from '../services/MessageUpdater';
import { isMessageUnread } from '../util/isMessageUnread';
import {
isDirectConversation,
isGroupV1,
@ -745,10 +746,6 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
}
isUnread(): boolean {
return !!this.get('unread');
}
merge(model: MessageModel): void {
const attributes = model.attributes || model;
this.set(attributes);
@ -847,7 +844,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
return;
}
if (this.get('unread')) {
if (isMessageUnread(this.attributes)) {
this.set(markRead(this.attributes));
}
@ -3175,7 +3172,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
const isFirstRun = false;
await this.modifyTargetMessage(conversation, isFirstRun);
if (this.get('unread')) {
if (isMessageUnread(this.attributes)) {
await conversation.notify(this);
}