fix: make sure PRs are reviewed before merged unless the config allow…

…s it and it is the owner
christophehurpeau · Jan 29, 2023 · e95363a · e95363a
1 parent 445dcf8
commit e95363a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/events/pr-handlers/actions/utils/steps/codeReviewStep.ts b/src/events/pr-handlers/actions/utils/steps/codeReviewStep.ts
@@ -24,9 +24,12 @@ export function calcCodeReviewStep<GroupNames extends string>({
   const hasChangesRequested = repoContext.hasChangesRequestedReview(labels);
   const hasApproves = repoContext.hasApprovesReview(labels);
   const needsReviewGroupNames = repoContext.getNeedsReviewGroupNames(labels);
-  const isMissingApprobation = repoContext.config.requiresReviewRequest
-    ? !repoContext.hasApprovesReview(labels)
-    : false;
+  const isMissingApprobation =
+    repoContext.config.requiresReviewRequest ||
+    pullRequest.user?.type === 'Bot' ||
+    pullRequest.user?.id !== repoContext.accountEmbed.id
+      ? !repoContext.hasApprovesReview(labels)
+      : false;
 
   return {
     state: (() => {

diff --git a/src/events/pr-handlers/opened.ts b/src/events/pr-handlers/opened.ts
@@ -47,7 +47,10 @@ export default function opened(app: Probot, appContext: AppContext): void {
             {
               reviewGroup: 'dev',
               add:
-                (repoContext.config.requiresReviewRequest || isFromBot) &&
+                (repoContext.config.requiresReviewRequest ||
+                  isFromBot ||
+                  pullRequest.user.id !==
+                    context.payload.repository.owner.id) &&
                 !pullRequest.draft
                   ? ['needsReview']
                   : [],