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

Update timers whenever we mark messages read

Browse source
This commit is contained in:
Scott Nonnenberg 2021-07-19 13:45:18 -07:00 • committed by GitHub
parent cd35a29638
commit 7761d83055
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 70 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

49
ts/models/conversations.ts
View file

@ -1601,9 +1601,7 @@ export class ConversationModel extends window.Backbone
const registered = window.MessageController.register(m.id, m);
const shouldSave = await registered.queueAttachmentDownloads();
if (shouldSave) {
await window.Signal.Data.saveMessage(registered.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(registered.attributes);
}
})
);
@ -2414,9 +2412,7 @@ export class ConversationModel extends window.Backbone
// this type does not fully implement the interface it is expected to
} as unknown) as typeof window.Whisper.MessageAttributesType;
const id = await window.Signal.Data.saveMessage(message, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(message);
const model = window.MessageController.register(
id,
new window.Whisper.Message({
@ -2454,9 +2450,7 @@ export class ConversationModel extends window.Backbone
// this type does not fully implement the interface it is expected to
} as unknown) as typeof window.Whisper.MessageAttributesType;
const id = await window.Signal.Data.saveMessage(message, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(message);
const model = window.MessageController.register(
id,
new window.Whisper.Message({
@ -2492,9 +2486,7 @@ export class ConversationModel extends window.Backbone
// this type does not fully implement the interface it is expected to
} as unknown) as typeof window.Whisper.MessageAttributesType;
const id = await window.Signal.Data.saveMessage(message, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(message);
const model = window.MessageController.register(
id,
new window.Whisper.Message({
@ -2552,9 +2544,7 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as typeof window.Whisper.MessageAttributesType;
const id = await window.Signal.Data.saveMessage(message, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(message);
const model = window.MessageController.register(
id,
new window.Whisper.Message({
@ -2613,9 +2603,7 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as typeof window.Whisper.MessageAttributesType;
const id = await window.Signal.Data.saveMessage(message, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(message);
const model = window.MessageController.register(
id,
new window.Whisper.Message({
@ -2666,9 +2654,7 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as typeof window.Whisper.MessageAttributesType;
const id = await window.Signal.Data.saveMessage(message, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(message);
const model = window.MessageController.register(
id,
new window.Whisper.Message({
@ -2702,9 +2688,7 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as typeof window.Whisper.MessageAttributesType;
const id = await window.Signal.Data.saveMessage(message, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(message);
const model = window.MessageController.register(
id,
new window.Whisper.Message({
@ -3579,7 +3563,6 @@ export class ConversationModel extends window.Backbone
const messageId = message.id;
await window.Signal.Data.saveMessage(message.attributes, {
forceSave: true,
Message: window.Whisper.Message,
});
const draftProperties = dontClearDraft
@ -4082,9 +4065,7 @@ export class ConversationModel extends window.Backbone
if (isDirectConversation(this.attributes)) {
model.set({ destination: this.getSendTarget() });
}
const id = await window.Signal.Data.saveMessage(model.attributes, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(model.attributes);
model.set({ id });
@ -4182,9 +4163,7 @@ export class ConversationModel extends window.Backbone
if (isDirectConversation(this.attributes)) {
model.set({ destination: this.id });
}
const id = await window.Signal.Data.saveMessage(model.attributes, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(model.attributes);
model.set({ id });
@ -4212,9 +4191,7 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as MessageAttributesType);
const id = await window.Signal.Data.saveMessage(model.attributes, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(model.attributes);
model.set({ id });
const message = window.MessageController.register(model.id, model);
@ -4257,9 +4234,7 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as MessageAttributesType);
const id = await window.Signal.Data.saveMessage(model.attributes, {
Message: window.Whisper.Message,
});
const id = await window.Signal.Data.saveMessage(model.attributes);
model.set({ id });
const message = window.MessageController.register(model.id, model);

47
ts/models/messages.ts
View file

@ -147,8 +147,6 @@ export function isQuoteAMatch(
}
export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
static updateTimers: () => void;
static getLongMessageAttachment: (
attachment: typeof window.WhatIsThis
) => typeof window.WhatIsThis;
@ -985,9 +983,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
this.getConversation()?.debouncedUpdateLastMessage?.();
if (shouldPersist) {
await window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(this.attributes);
}
await window.Signal.Data.deleteSentProtoByMessageId(this.id);
@ -1167,9 +1163,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
if (!skipSave && !this.doNotSave) {
await window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(this.attributes);
}
}
@ -1242,9 +1236,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
if (!recipients.length) {
window.log.warn('retrySend: Nobody to send to!');
return window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
return window.Signal.Data.saveMessage(this.attributes);
}
const attachmentsWithData = await Promise.all(
@ -1553,9 +1545,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
});
if (!this.doNotSave) {
await window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(this.attributes);
}
if (updateLeftPane) {
@ -1756,9 +1746,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
// We don't save because we're about to save below.
this.saveErrors(errors, { skipSave: true });
} finally {
await window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(this.attributes);
if (updateLeftPane) {
updateLeftPane();
@ -1815,9 +1803,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
return result;
}
await window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(this.attributes);
return result;
});
};
@ -2360,9 +2346,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
originalMessage.attributes
);
originalMessage.set(upgradedMessage);
await window.Signal.Data.saveMessage(upgradedMessage, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(upgradedMessage);
}
} catch (error) {
window.log.error(
@ -2496,9 +2480,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
unidentifiedDeliveries
),
});
await window.Signal.Data.saveMessage(toUpdate.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(toUpdate.attributes);
confirm();
return;
@ -3186,9 +3168,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
window.log.info(
`modifyTargetMessage/${this.idForLogging()}: Changes in second run; saving.`
);
await window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(this.attributes);
}
}
@ -3294,9 +3274,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
);
if (shouldPersist) {
await window.Signal.Data.saveMessage(this.attributes, {
Message: window.Whisper.Message,
});
await window.Signal.Data.saveMessage(this.attributes);
}
return oldReaction;
@ -3390,11 +3368,6 @@ window.Whisper.Message.getLongMessageAttachment = ({
};
};
window.Whisper.Message.updateTimers = () => {
window.Whisper.ExpiringMessagesListener.update();
window.Whisper.TapToViewMessagesListener.update();
};
window.Whisper.MessageCollection = window.Backbone.Collection.extend({
model: window.Whisper.Message,
comparator(left: Readonly<MessageModel>, right: Readonly<MessageModel>) {