From 1e825fd1e8ab9dee492061a7f824deace06ec14d Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 8 Sep 2022 16:17:38 -0700
Subject: [PATCH] Fix recursion loop in sendStory

---
 ts/jobs/helpers/sendStory.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ts/jobs/helpers/sendStory.ts b/ts/jobs/helpers/sendStory.ts
index f7c91fc42..b6f70a1d6 100644
--- a/ts/jobs/helpers/sendStory.ts
+++ b/ts/jobs/helpers/sendStory.ts
@@ -278,6 +278,8 @@ export async function sendStory(
           isGroupV2(messageConversation.attributes) ||
           Boolean(distributionList?.allowsReplies);
 
+        let inMemorySenderKeyInfo = distributionList?.senderKeyInfo;
+
         const sendTarget = distributionList
           ? {
               getGroupId: () => undefined,
@@ -289,12 +291,14 @@ export async function sendStory(
               idForLogging: () => `dl(${receiverId})`,
               isGroupV2: () => true,
               isValid: () => true,
-              getSenderKeyInfo: () => distributionList.senderKeyInfo,
-              saveSenderKeyInfo: async (senderKeyInfo: SenderKeyInfoType) =>
-                dataInterface.modifyStoryDistribution({
+              getSenderKeyInfo: () => inMemorySenderKeyInfo,
+              saveSenderKeyInfo: async (senderKeyInfo: SenderKeyInfoType) => {
+                inMemorySenderKeyInfo = senderKeyInfo;
+                await dataInterface.modifyStoryDistribution({
                   ...distributionList,
                   senderKeyInfo,
-                }),
+                });
+              },
             }
           : conversation.toSenderKeyTarget();