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

Log when message lacks sent_at or timestamp on send

Browse source
This commit is contained in:
Evan Hahn 2021-10-13 13:50:58 -05:00 • committed by GitHub
parent 99934ced90
commit 95b761b62e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ts/jobs/normalMessageSendJobQueue.ts
View file

@ -225,7 +225,7 @@ export class NormalMessageSendJobQueue extends JobQueue<NormalMessageSendJobData
profileKey,
quote,
sticker,
} = await getMessageSendData({ conversation, message });
} = await getMessageSendData({ conversation, log, message });
let messageSendPromise: Promise<unknown>;
@ -453,9 +453,11 @@ function getMessageRecipients({
async function getMessageSendData({
conversation,
log,
message,
}: Readonly<{
conversation: ConversationModel;
log: LoggerType;
message: MessageModel;
}>): Promise<{
attachments: Array<AttachmentType>;
@ -469,8 +471,20 @@ async function getMessageSendData({
quote: WhatIsThis;
sticker: WhatIsThis;
}> {
const messageTimestamp =
message.get('sent_at') || message.get('timestamp') || Date.now();
let messageTimestamp: number;
const sentAt = message.get('sent_at');
const timestamp = message.get('timestamp');
if (sentAt) {
messageTimestamp = sentAt;
} else if (timestamp) {
log.error('message lacked sent_at. Falling back to timestamp');
messageTimestamp = timestamp;
} else {
log.error(
'message lacked sent_at and timestamp. Falling back to current time'
);
messageTimestamp = Date.now();
}
const [
attachmentsWithData,