From 7d9f970b2cf5db46f00ca43e74a3c937a2b2f5fe Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 27 Jan 2022 16:08:42 +1100
Subject: [PATCH] remove decrypted_at field from saving message models as
 unused

---
 ts/models/messageType.ts                | 2 --
 ts/receiver/queuedJob.ts                | 1 -
 ts/session/utils/AttachmentsDownload.ts | 2 +-
 ts/types/Message.ts                     | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts
index 86b99e03a..609df5990 100644
--- a/ts/models/messageType.ts
+++ b/ts/models/messageType.ts
@@ -19,7 +19,6 @@ export interface MessageAttributes {
   body?: string;
   expirationStartTimestamp: number;
   read_by: Array<string>;
-  decrypted_at: number;
   expires_at?: number;
   type: MessageModelType;
   group_update?: MessageGroupUpdate;
@@ -135,7 +134,6 @@ export interface MessageAttributesOptionals {
   body?: string;
   expirationStartTimestamp?: number;
   read_by?: Array<string>;
-  decrypted_at?: number;
   expires_at?: number;
   type: MessageModelType;
   group_update?: MessageGroupUpdate;
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 873b33a62..eee1fbcec 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -233,7 +233,6 @@ async function handleRegularMessage(
     attachments: rawDataMessage.attachments,
     body: rawDataMessage.body,
     conversationId: conversation.id,
-    decrypted_at: now,
     messageHash,
     errors: [],
   });
diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts
index 0122b5fd4..240949fe9 100644
--- a/ts/session/utils/AttachmentsDownload.ts
+++ b/ts/session/utils/AttachmentsDownload.ts
@@ -244,7 +244,7 @@ async function _runJob(job: any) {
 
     logger.error(
       `_runJob: Failed to download attachment type ${type} for message ${found?.idForLogging()}, attempt ${currentAttempt}:`,
-      error && error.stack ? error.stack : error
+      error && error.message ? error.message : error
     );
 
     const failedJob = {
diff --git a/ts/types/Message.ts b/ts/types/Message.ts
index a22bac537..1c0edf933 100644
--- a/ts/types/Message.ts
+++ b/ts/types/Message.ts
@@ -13,7 +13,6 @@ export type IncomingMessage = Readonly<
 
     // Optional
     body?: string;
-    decrypted_at?: number;
     errors?: Array<any>;
     expireTimer?: number;
     flags?: number;