Message Send Log to enable comprehensive resend

ts/shims/textsecure.ts

@@ -1,19 +1,19 @@
 // Copyright 2019-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
+import { handleMessageSend } from '../util/handleMessageSend';
+import { getSendOptions } from '../util/getSendOptions';
+
 export async function sendStickerPackSync(
   packId: string,
   packKey: string,
   installed: boolean
 ): Promise<void> {
   const { ConversationController, textsecure, log } = window;
-  const ourNumber = textsecure.storage.user.getNumber();
-  const { wrap, sendOptions } = await ConversationController.prepareForSend(
-    ourNumber,
-    {
-      syncMessage: true,
-    }
-  );
+  const ourConversation = ConversationController.getOurConversationOrThrow();
+  const sendOptions = await getSendOptions(ourConversation.attributes, {
+    syncMessage: true,
+  });
 
   if (!textsecure.messaging) {
     log.error(
@@ -23,7 +23,14 @@ export async function sendStickerPackSync(
     return;
   }
 
-  wrap(
+  if (window.ConversationController.areWePrimaryDevice()) {
+    window.log.warn(
+      'shims/sendStickerPackSync: We are primary device; not sending sync'
+    );
+    return;
+  }
+
+  handleMessageSend(
     textsecure.messaging.sendStickerPackSync(
       [
         {
@@ -33,7 +40,8 @@ export async function sendStickerPackSync(
         },
       ],
       sendOptions
-    )
+    ),
+    { messageIds: [], sendType: 'otherSync' }
   ).catch(error => {
     log.error(
       'shim: Error calling sendStickerPackSync:',