From 63ff77842f1a5b3a3198b15f5ed158d74d890847 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 6 Oct 2017 22:33:43 -0400 Subject: [PATCH 1/2] Fixes maintainer detection for review auto-tagging (#31307) * Fixes maintainer detection for review auto-tagging * User not author * oranges was right --- tools/WebhookProcessor/github_webhook_processor.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index ede37e4428..debb5cc7dd 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -99,11 +99,8 @@ switch (strtolower($_SERVER['HTTP_X_GITHUB_EVENT'])) { case 'pull_request_review': if($payload['action'] == 'submitted'){ $lower_state = strtolower($payload['review']['state']); - if(($lower_state == 'approved' || $lower_state == 'changes_requested') && is_maintainer($payload, $payload['review']['user']['login'])){ - $lower_association = strtolower($payload['review']['author_association']); - if($lower_association == 'member' || $lower_association == 'contributor' || $lower_association == 'owner') - remove_ready_for_review($payload); - } + if(($lower_state == 'approved' || $lower_state == 'changes_requested') && is_maintainer($payload, $payload['review']['user']['login'])) + remove_ready_for_review($payload); } break; default: @@ -286,9 +283,8 @@ function check_ready_for_review($payload, $labels = null){ $reviews_ids_with_changes_requested = array(); $dismissed_an_approved_review = false; - foreach($reviews as $R){ - $lower_association = strtolower($R['author_association']); - if($lower_association == 'member' || $lower_association == 'contributor' || $lower_association == 'owner'){ + foreach($reviews as $R) + if(is_maintainer($R['user']['login'])){ $lower_state = strtolower($R['state']); if($lower_state == 'changes_requested') $reviews_ids_with_changes_requested[] = $R['id']; @@ -297,7 +293,6 @@ function check_ready_for_review($payload, $labels = null){ $dismissed_an_approved_review = true; } } - } if(!$dismissed_an_approved_review && count($reviews_ids_with_changes_requested) == 0){ if($has_label_already)