From 0fbb0cc85209269ed5cedb7f3ac38aa7eb160708 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 18 Oct 2023 13:58:35 +1100
Subject: [PATCH] chore: merge ReceiptMessage and readReceiptMessage into one

---
 ts/models/conversation.ts                     |  2 +-
 .../receipt/ReadReceiptMessage.ts             | 28 ++++++++++++++---
 .../controlMessage/receipt/ReceiptMessage.ts  | 30 -------------------
 3 files changed, 25 insertions(+), 35 deletions(-)
 delete mode 100644 ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 9e710d0ae..abda7cbe7 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -36,7 +36,6 @@ import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/openg
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { getOpenGroupV2FromConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
 import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
-import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
 import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage';
 import { GroupInvitationMessage } from '../session/messages/outgoing/visibleMessage/GroupInvitationMessage';
 import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
@@ -112,6 +111,7 @@ import {
   READ_MESSAGE_STATE,
 } from './conversationAttributes';
 
+import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
 import { PreConditionFailed } from '../session/utils/errors';
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_utils_user_profile';
diff --git a/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts b/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts
index 511a66117..3ca1c848c 100644
--- a/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts
@@ -1,8 +1,28 @@
+import { ContentMessage } from '../..';
 import { SignalService } from '../../../../../protobuf';
-import { ReceiptMessage } from './ReceiptMessage';
+import { MessageParams } from '../../Message';
 
-export class ReadReceiptMessage extends ReceiptMessage {
-  public getReceiptType(): SignalService.ReceiptMessage.Type {
-    return SignalService.ReceiptMessage.Type.READ;
+interface ReadReceiptMessageParams extends MessageParams {
+  timestamps: Array<number>;
+}
+export class ReadReceiptMessage extends ContentMessage {
+  public readonly timestamps: Array<number>;
+
+  constructor({ timestamp, identifier, timestamps }: ReadReceiptMessageParams) {
+    super({ timestamp, identifier });
+    this.timestamps = timestamps;
+  }
+
+  public contentProto(): SignalService.Content {
+    return new SignalService.Content({
+      receiptMessage: this.receiptProto(),
+    });
+  }
+
+  protected receiptProto(): SignalService.ReceiptMessage {
+    return new SignalService.ReceiptMessage({
+      type: SignalService.ReceiptMessage.Type.READ,
+      timestamp: this.timestamps,
+    });
   }
 }
diff --git a/ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts b/ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts
deleted file mode 100644
index 5beebca22..000000000
--- a/ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { SignalService } from '../../../../../protobuf';
-import { MessageParams } from '../../Message';
-import { ContentMessage } from '../..';
-
-interface ReceiptMessageParams extends MessageParams {
-  timestamps: Array<number>;
-}
-export abstract class ReceiptMessage extends ContentMessage {
-  public readonly timestamps: Array<number>;
-
-  constructor({ timestamp, identifier, timestamps }: ReceiptMessageParams) {
-    super({ timestamp, identifier });
-    this.timestamps = timestamps;
-  }
-
-  public abstract getReceiptType(): SignalService.ReceiptMessage.Type;
-
-  public contentProto(): SignalService.Content {
-    return new SignalService.Content({
-      receiptMessage: this.receiptProto(),
-    });
-  }
-
-  protected receiptProto(): SignalService.ReceiptMessage {
-    return new SignalService.ReceiptMessage({
-      type: this.getReceiptType(),
-      timestamp: this.timestamps,
-    });
-  }
-}