From ff1c554e8a8d5b3fe765b724723fc49824422418 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 15 Sep 2020 09:40:50 +1000 Subject: [PATCH] make MediumGroupChatMessage share impl with ClosedGroupChatMessage --- .../data/mediumgroup/MediumGroupChatMessage.ts | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupChatMessage.ts b/ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupChatMessage.ts index 1d5021c16..5cbeb8625 100644 --- a/ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupChatMessage.ts +++ b/ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupChatMessage.ts @@ -1,7 +1,6 @@ -import { SignalService } from '../../../../../../protobuf'; import { ChatMessage } from '../ChatMessage'; import { PubKey } from '../../../../../types'; -import { MediumGroupMessage } from './MediumGroupMessage'; +import { ClosedGroupChatMessage } from '../group/ClosedGroupChatMessage'; interface MediumGroupChatMessageParams { identifier?: string; @@ -9,21 +8,12 @@ interface MediumGroupChatMessageParams { chatMessage: ChatMessage; } -export class MediumGroupChatMessage extends MediumGroupMessage { - private readonly chatMessage: ChatMessage; - +export class MediumGroupChatMessage extends ClosedGroupChatMessage { constructor(params: MediumGroupChatMessageParams) { super({ - timestamp: params.chatMessage.timestamp, identifier: params.identifier ?? params.chatMessage.identifier, groupId: params.groupId, + chatMessage: params.chatMessage, }); - this.chatMessage = params.chatMessage; - } - - public dataProto(): SignalService.DataMessage { - const messageProto = this.chatMessage.dataProto(); - - return messageProto; } }