From 44349079abe652a484aab62e8b35e1ced8f55ac4 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 31 Jul 2020 09:49:36 +1000
Subject: [PATCH] fix delete of open group messages

---
 js/modules/loki_app_dot_net_api.d.ts         |  2 +-
 ts/session/sending/MessageQueue.ts           | 14 +++++++++++---
 ts/session/sending/MessageSender.ts          | 16 +---------------
 ts/test/session/sending/MessageQueue_test.ts |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/js/modules/loki_app_dot_net_api.d.ts b/js/modules/loki_app_dot_net_api.d.ts
index f578c40ab..34947e0af 100644
--- a/js/modules/loki_app_dot_net_api.d.ts
+++ b/js/modules/loki_app_dot_net_api.d.ts
@@ -30,7 +30,7 @@ export interface LokiPublicChannelAPI {
       body?: string;
     },
     timestamp: number
-  ): Promise<boolean>;
+  ): Promise<boolean | number>;
 }
 
 declare class LokiAppDotNetServerAPI implements LokiAppDotNetServerInterface {
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 228d9d8be..68ed00efc 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -61,10 +61,18 @@ export class MessageQueue implements MessageQueueInterface {
       // This is absolutely yucky ... we need to make it not use Promise<boolean>
       try {
         const result = await MessageSender.sendToOpenGroup(message);
-        if (result) {
-          this.events.emit('success', message);
-        } else {
+        // sendToOpenGroup returns false if failed or a number if succeeded
+        if (typeof result === 'boolean') {
           this.events.emit('fail', message, error);
+        } else {
+          const messageEventData = {
+            pubKey: message.group.groupId,
+            timestamp: message.timestamp,
+            serverId: result,
+          };
+          this.events.emit('success', message);
+
+          window.Whisper.events.trigger('publicMessageSent', messageEventData);
         }
       } catch (e) {
         console.warn(
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index d138cba81..035e4e6d8 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -98,7 +98,7 @@ function wrapEnvelope(envelope: SignalService.Envelope): Uint8Array {
  */
 export async function sendToOpenGroup(
   message: OpenGroupMessage
-): Promise<boolean> {
+): Promise<boolean | number> {
   /*
     Note: Retrying wasn't added to this but it can be added in the future if needed.
     The only problem is that `channelAPI.sendMessage` returns true/false and doesn't throw any error so we can never be sure why sending failed.
@@ -125,18 +125,4 @@ export async function sendToOpenGroup(
     },
     timestamp
   );
-
-  // TODO: The below should be handled in whichever class calls this
-  /*
-    const res = await sendToOpenGroup(message);
-    if (!res) {
-      throw new textsecure.PublicChatError('Failed to send public chat message');
-    }
-    const messageEventData = {
-      pubKey,
-      timestamp: messageTimeStamp,
-    };
-    messageEventData.serverId = res;
-    window.Whisper.events.trigger('publicMessageSent', messageEventData);
-  */
 }
diff --git a/ts/test/session/sending/MessageQueue_test.ts b/ts/test/session/sending/MessageQueue_test.ts
index 4e1644d27..c92bb03e2 100644
--- a/ts/test/session/sending/MessageQueue_test.ts
+++ b/ts/test/session/sending/MessageQueue_test.ts
@@ -324,7 +324,7 @@ describe('MessageQueue', () => {
     describe('open groups', async () => {
       let sendToOpenGroupStub: sinon.SinonStub<
         [OpenGroupMessage],
-        Promise<boolean>
+        Promise<boolean | number>
       >;
       beforeEach(() => {
         sendToOpenGroupStub = sandbox