From 2a2f8ebf551c30fcdcc471761de04bc6952eacc7 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Thu, 6 Jan 2022 13:05:19 -0800
Subject: [PATCH] Use serverTimestamp for delivery receipts

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 ts/textsecure/MessageReceiver.ts       | 1 +
 ts/textsecure/messageReceiverEvents.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index d2db9293c..256223b1c 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -1277,6 +1277,7 @@ export default class MessageReceiver
       new DeliveryEvent(
         {
           timestamp: envelope.timestamp,
+          envelopeTimestamp: envelope.serverTimestamp,
           source: envelope.source,
           sourceUuid: envelope.sourceUuid,
           sourceDevice: envelope.sourceDevice,
diff --git a/ts/textsecure/messageReceiverEvents.ts b/ts/textsecure/messageReceiverEvents.ts
index ea90d6839..86b673102 100644
--- a/ts/textsecure/messageReceiverEvents.ts
+++ b/ts/textsecure/messageReceiverEvents.ts
@@ -127,7 +127,7 @@ export class ConfirmableEvent extends Event {
 
 export type DeliveryEventData = Readonly<{
   timestamp: number;
-  envelopeTimestamp?: number;
+  envelopeTimestamp: number;
   source?: string;
   sourceUuid?: string;
   sourceDevice?: number;