fix: fix slack message edition and reaction

christophehurpeau · Dec 19, 2022 · 8d4054f · 8d4054f
1 parent c94c102
commit 8d4054f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 27 deletions.
diff --git a/src/events/pr-handlers/reviewRequestRemoved.ts b/src/events/pr-handlers/reviewRequestRemoved.ts
@@ -198,7 +198,7 @@ export default function reviewRequestRemoved(
               const message = sentMessageRequestedReview.message;
               await Promise.all([
                 repoContext.slack.updateMessage(
-                  sentMessageRequestedReview.account,
+                  sentTo.user,
                   sentTo.ts,
                   sentTo.channel,
                   {
@@ -210,7 +210,7 @@ export default function reviewRequestRemoved(
                   },
                 ),
                 repoContext.slack.addReaction(
-                  sentMessageRequestedReview.account,
+                  sentTo.user,
                   sentTo.ts,
                   sentTo.channel,
                   'skull_and_crossbones',

diff --git a/src/events/pr-handlers/reviewRequested.ts b/src/events/pr-handlers/reviewRequested.ts
@@ -117,6 +117,7 @@ export default function reviewRequested(
               message,
               requestedTeam ? requestedTeam.id : undefined,
             );
+
             if (result) {
               await appContext.mongoStores.slackSentMessages.insertOne({
                 type: 'review-requested',

diff --git a/src/events/pr-handlers/reviewSubmitted.ts b/src/events/pr-handlers/reviewSubmitted.ts
@@ -176,37 +176,41 @@ export default function reviewSubmitted(
         repoContext.slack.updateHome(reviewer.login);
 
         const sentMessageRequestedReview =
-          await appContext.mongoStores.slackSentMessages.findOne({
-            'account.id': repoContext.accountEmbed.id,
-            'account.type': repoContext.accountEmbed.type,
-            type: 'review-requested',
-            typeId: `${pullRequest.id}_${reviewer.id}`,
-          });
+          await appContext.mongoStores.slackSentMessages.findOne(
+            {
+              'account.id': repoContext.accountEmbed.id,
+              'account.type': repoContext.accountEmbed.type,
+              type: 'review-requested',
+              typeId: `${pullRequest.id}_${reviewer.id}`,
+            },
+            { created: -1 },
+          );
 
         const emoji = getEmojiFromState(state);
 
         if (sentMessageRequestedReview) {
-          const sentTo = sentMessageRequestedReview.sentTo[0];
           const message = sentMessageRequestedReview.message;
           await Promise.all([
-            repoContext.slack.updateMessage(
-              sentMessageRequestedReview.account,
-              sentTo.ts,
-              sentTo.channel,
-              {
-                ...message,
-                text: message.text
-                  .split('\n')
-                  .map((l) => `~${l}~`)
-                  .join('\n'),
-              },
-            ),
-            repoContext.slack.addReaction(
-              sentMessageRequestedReview.account,
-              sentTo.ts,
-              sentTo.channel,
-              emoji,
-            ),
+            ...sentMessageRequestedReview.sentTo.map((sentTo) => [
+              repoContext.slack.updateMessage(
+                sentTo.user,
+                sentTo.ts,
+                sentTo.channel,
+                {
+                  ...message,
+                  text: message.text
+                    .split('\n')
+                    .map((l) => `~${l}~`)
+                    .join('\n'),
+                },
+              ),
+              repoContext.slack.addReaction(
+                sentTo.user,
+                sentTo.ts,
+                sentTo.channel,
+                emoji,
+              ),
+            ]),
             appContext.mongoStores.slackSentMessages.deleteOne(
               sentMessageRequestedReview,
             ),