remove approval if the user changed their mind

prince-chrismc · Dec 29, 2020 · 884003b · 884003b
1 parent 7a3b32d
commit 884003b
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/pending_review/pull_request.go b/pending_review/pull_request.go
@@ -91,19 +91,17 @@ func (s *PullRequestService) GatherRelevantReviews(ctx context.Context, owner st
 			if isC3iTeam {
 				p.HeadCommitBlockers = appendUnique(p.HeadCommitBlockers, reviewerName)
 			}
+
+			p.HeadCommitApprovals = removeUnique(p.HeadCommitApprovals, reviewerName)
 		case APPRVD:
 			p.AtLeastOneApproval = true
 			if onBranchHead {
 				p.HeadCommitApprovals = appendUnique(p.HeadCommitApprovals, reviewerName)
 			}
 
-			if len(p.HeadCommitBlockers) > 0 {
-				p.HeadCommitBlockers = removeUnique(p.HeadCommitBlockers, reviewerName)
-			}
+			p.HeadCommitBlockers = removeUnique(p.HeadCommitBlockers, reviewerName)
 		case DISMISSED:
-			if len(p.HeadCommitBlockers) > 0 {
-				p.HeadCommitBlockers = removeUnique(p.HeadCommitBlockers, reviewerName)
-			}
+			p.HeadCommitBlockers = removeUnique(p.HeadCommitBlockers, reviewerName)
 		default:
 		}
 	}