Bug 1965553 - Uplift approval set in bugzilla without relman approval

Author: dklawren

extensions/PhabBugz/lib/Feed.pm

@@ -651,7 +651,7 @@ sub process_revision_change {
     # set the approval flags. This ensures that users who create revisions will
     # set the flag to `?`, and only approvals from `mozilla-next-drivers` group
     # members will set the flag to `+` or `-`.
-    set_attachment_approval_flags($attachment, $revision, $changer);
+    set_attachment_approval_flags($attachment, $revision, $changer, $is_new);
   }
 
   $attachment->update($timestamp);

extensions/PhabBugz/lib/Util.pm

@@ -69,10 +69,18 @@ sub set_attachment_approval_flags {
   # Find the current review status of the revision changer
   my $status          = undef;
   my $reviewer_status = undef;
-  foreach my $reviewer (@{$revision->reviews}) {
-    if ($reviewer->{user}->id == $phab_user->id) {
-      $reviewer_status = $reviewer->{status};
-      $status          = $revision_status_flag_map->{$reviewer_status};
+
+  if ($is_new) {
+    $reviewer_status = $revision->status;
+    $status          = $revision_status_flag_map->{$reviewer_status};
+  }
+  else {
+    foreach my $reviewer (@{$revision->reviews}) {
+      if ($reviewer->{user}->id == $phab_user->id) {
+        $reviewer_status = $reviewer->{status};
+        $status          = $revision_status_flag_map->{$reviewer_status};
+        last;
+      }
     }
   }