From 456df58205d485772495851606b3f2a3b2de31ac Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 Jan 2024 13:02:34 +1100
Subject: [PATCH] chore: refactor messageSender.send to take an object

---
 ts/session/sending/MessageSender.ts           | 20 ++++++++++++-------
 .../utils/job_runners/jobs/GroupSyncJob.ts    | 14 ++++++-------
 .../utils/job_runners/jobs/UserSyncJob.ts     | 14 ++++++-------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 562c71ea4..ab495712a 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -535,13 +535,19 @@ async function encryptMessagesAndWrap(
  * @param destination the pubkey we should deposit those message to
  * @returns the hashes of successful deposit
  */
-async function sendEncryptedDataToSnode(
-  encryptedData: Array<StoreOnNodeData>,
-  destination: GroupPubkeyType | PubkeyType,
-  messagesHashesToDelete: Set<string> | null,
-  revokeParams: RevokeSubaccountParams | null,
-  unrevokeParams: UnrevokeSubaccountParams | null
-): Promise<NotEmptyArrayOfBatchResults | null> {
+async function sendEncryptedDataToSnode({
+  destination,
+  encryptedData,
+  messagesHashesToDelete,
+  revokeParams,
+  unrevokeParams,
+}: {
+  encryptedData: Array<StoreOnNodeData>;
+  destination: GroupPubkeyType | PubkeyType;
+  messagesHashesToDelete: Set<string> | null;
+  revokeParams: RevokeSubaccountParams | null;
+  unrevokeParams: UnrevokeSubaccountParams | null;
+}): Promise<NotEmptyArrayOfBatchResults | null> {
   try {
     const batchResults = await pRetry(
       async () => {
diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts
index 8cd25b94b..8dfc57ca4 100644
--- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts
@@ -143,15 +143,13 @@ async function pushChangesToGroupSwarmIfNeeded({
     data: encryptedData[index],
   }));
 
-  // const
-
-  const result = await MessageSender.sendEncryptedDataToSnode(
-    [...encryptedMessage, ...extraMessagesEncrypted],
-    groupPk,
-    allOldHashes,
+  const result = await MessageSender.sendEncryptedDataToSnode({
+    encryptedData: [...encryptedMessage, ...extraMessagesEncrypted],
+    destination: groupPk,
+    messagesHashesToDelete: allOldHashes,
     revokeParams,
-    unrevokeParams
-  );
+    unrevokeParams,
+  });
 
   const expectedReplyLength =
     messages.length + // each of those messages are sent as a subrequest
diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts
index 627422a4d..57bceefad 100644
--- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts
@@ -96,13 +96,13 @@ async function pushChangesToUserSwarmIfNeeded() {
     };
   });
 
-  const result = await MessageSender.sendEncryptedDataToSnode(
-    msgs,
-    us,
-    changesToPush.allOldHashes,
-    null,
-    null
-  );
+  const result = await MessageSender.sendEncryptedDataToSnode({
+    encryptedData: msgs,
+    destination: us,
+    messagesHashesToDelete: changesToPush.allOldHashes,
+    revokeParams: null,
+    unrevokeParams: null,
+  });
 
   const expectedReplyLength =
     changesToPush.messages.length + (changesToPush.allOldHashes.size ? 1 : 0);