Bug 1984452 - When processing the list of reviewers to assign to a new revision, PhabBugz needs to skip a reviewer if they are the author of the revision

Author: dklawren

extensions/PhabBugz/lib/Util.pm

@@ -392,7 +392,8 @@ PROJECT: foreach my $project (@review_projects) {
     if (scalar @project_members == 1) {
       my $lone_reviewer = $project_members[0];
 
-      if ( $lone_reviewer->bugzilla_user->can_see_bug($revision->bug->id)
+      if ( $lone_reviewer->phid ne $revision->author->phid
+        && $lone_reviewer->bugzilla_user->can_see_bug($revision->bug->id)
         && $lone_reviewer->bugzilla_user->settings->{block_reviews}->{value} ne 'on')
       {
         INFO('Single project member found: ' . $lone_reviewer->name);
@@ -406,6 +407,7 @@ PROJECT: foreach my $project (@review_projects) {
     if (@stack_reviewers) {
       foreach my $member (@project_members) {
         next if none { $_->id == $member->id } @stack_reviewers;
+        next if $member->phid eq $revision->author->phid;
         INFO('Found a previous stack reviewer: ' . $member->name);
         set_new_reviewer($revision, $project, $member, $is_blocking, \@review_users);
         next PROJECT;
@@ -426,16 +428,6 @@ PROJECT: foreach my $project (@review_projects) {
       }
     }
 
-    # If we still have not found a reviewer and there is no member that was the
-    # last reviewer, then just pick the first member in the list
-    if (!$last_reviewer_phid) {
-      INFO('Last reviewer not found so picking first member: '
-          . $project_members[0]->name);
-      set_new_reviewer($revision, $project, $project_members[0], $is_blocking,
-        \@review_users);
-      next;
-    }
-
     # Loop through all members and pick the next one in line after last selected
     foreach my $member (@project_members) {
       INFO('Considering candidate reviewer: ' . $member->name);
@@ -449,7 +441,8 @@ PROJECT: foreach my $project (@review_projects) {
       # Here we look to see if they can see the bug, and they are not set to away
       # (not accepting reviews). If both are positive, we have found our reviewer
       # and exit the loop.
-      if ( $member->bugzilla_user->can_see_bug($revision->bug->id)
+      if ($member->phid ne $revision->author->phid
+        && $member->bugzilla_user->can_see_bug($revision->bug->id)
         && $member->bugzilla_user->settings->{block_reviews}->{value} ne 'on')
       {
         INFO('Promoting member to reviewer: ' . $member->name);