Skip to content

Commit

Permalink
Log when message lacks sent_at or timestamp on send
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanHahn-Signal committed Oct 13, 2021
1 parent 99934ce commit 95b761b
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions ts/jobs/normalMessageSendJobQueue.ts
Expand Up @@ -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>;

Expand Down Expand Up @@ -453,9 +453,11 @@ function getMessageRecipients({

async function getMessageSendData({
conversation,
log,
message,
}: Readonly<{
conversation: ConversationModel;
log: LoggerType;
message: MessageModel;
}>): Promise<{
attachments: Array<AttachmentType>;
Expand All @@ -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,
Expand Down

0 comments on commit 95b761b

Please sign in to comment.