feat: use his/her instead of duplicated name for slack notifications …

…with sender
christophehurpeau · Jul 1, 2024 · bc142d4 · bc142d4
1 parent c6dc9ec
commit bc142d4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/events/pr-handlers/closed.ts b/src/events/pr-handlers/closed.ts
@@ -126,11 +126,10 @@ export default function closed(app: Probot, appContext: AppContext): void {
       const createMessage = (
         createOwnerPartOptions: CreateOwnerPartOptions,
       ): string => {
-        const ownerPart = slackUtils.createOwnerPart(
-          repoContext,
-          pullRequest,
-          createOwnerPartOptions,
-        );
+        const ownerPart = slackUtils.createOwnerPart(repoContext, pullRequest, {
+          ...createOwnerPartOptions,
+          isSender: context.payload.sender.login === owner.login,
+        });
 
         return `${
           (pullRequest as any).merged

diff --git a/src/events/pr-handlers/reopened.ts b/src/events/pr-handlers/reopened.ts
@@ -104,11 +104,10 @@ export default function reopened(app: Probot, appContext: AppContext): void {
       const createMessage = (
         createOwnerPartOptions: CreateOwnerPartOptions,
       ): string => {
-        const ownerPart = slackUtils.createOwnerPart(
-          repoContext,
-          pullRequest,
-          createOwnerPartOptions,
-        );
+        const ownerPart = slackUtils.createOwnerPart(repoContext, pullRequest, {
+          ...createOwnerPartOptions,
+          isSender: context.payload.sender.login === owner.login,
+        });
 
         return `:recycle: ${senderMention} reopened ${ownerPart} ${prLink}\n> ${pullRequest.title}`;
       };

diff --git a/src/slack/utils.ts b/src/slack/utils.ts
@@ -65,14 +65,16 @@ export const createCommitLink = (
 export interface CreateOwnerPartOptions {
   isOwner?: boolean;
   isAssigned?: boolean;
+  isSender?: boolean;
 }
 
 export const createOwnerPart = (
   repoContext: RepoContext,
   pullRequest: PullRequestWithDecentData,
-  { isOwner, isAssigned }: CreateOwnerPartOptions,
+  { isOwner, isAssigned, isSender }: CreateOwnerPartOptions,
 ): string => {
   if (isOwner) return "your PR";
+  if (isSender) return "his/her PR";
 
   const owner = pullRequest.user;
   const ownerMention = !owner