diff --git a/ts/textsecure/processDataMessage.ts b/ts/textsecure/processDataMessage.ts index f772a83e06..721c08fe47 100644 --- a/ts/textsecure/processDataMessage.ts +++ b/ts/textsecure/processDataMessage.ts @@ -27,6 +27,7 @@ import type { import { WarnOnlyError } from './Errors'; import { GiftBadgeStates } from '../components/conversation/Message'; import { APPLICATION_OCTET_STREAM, stringToMIMEType } from '../types/MIME'; +import { SECOND } from '../util/durations'; const FLAGS = Proto.DataMessage.Flags; export const ATTACHMENT_MAX = 32; @@ -242,7 +243,6 @@ export function processDelete( } export function processGiftBadge( - timestamp: number, giftBadge: Proto.DataMessage.IGiftBadge | null | undefined ): ProcessedGiftBadge | undefined { if ( @@ -258,7 +258,7 @@ export function processGiftBadge( ); return { - expiration: timestamp + Number(receipt.getReceiptExpirationTime()), + expiration: Number(receipt.getReceiptExpirationTime()) * SECOND, id: undefined, level: Number(receipt.getReceiptLevel()), receiptCredentialPresentation: Bytes.toBase64( @@ -317,7 +317,7 @@ export async function processDataMessage( bodyRanges: message.bodyRanges ?? [], groupCallUpdate: dropNull(message.groupCallUpdate), storyContext: dropNull(message.storyContext), - giftBadge: processGiftBadge(timestamp, message.giftBadge), + giftBadge: processGiftBadge(message.giftBadge), }; const isEndSession = Boolean(result.flags & FLAGS.END_SESSION);