Merge branch 'mojo-poc'

2 files changed, 18 insertions, 6 deletions

diff --git a/extensions/PhabBugz/lib/User.pm b/extensions/PhabBugz/lib/User.pm
index 1bf1a842d..da573be37 100644
--- a/extensions/PhabBugz/lib/User.pm
+++ b/extensions/PhabBugz/lib/User.pm
@@ -135,9 +135,9 @@ sub match {
     my $phab_users = [];
     my $result;
     do {
-        $result = request( 'user.search', $data );
-        if ( exists $result->{result}{data} && @{ $result->{result}{data} } ) {
-            foreach my $user ( @{ $result->{result}{data} } ) {
+        $result = request( 'user.search', $data )->{result};
+        if ( exists $result->{data} && @{ $result->{data} } ) {
+            foreach my $user ( @{ $result->{data} } ) {
                 push @$phab_users, $class->new($user);
             }
         }
diff --git a/extensions/PhabBugz/lib/Util.pm b/extensions/PhabBugz/lib/Util.pm
index 091475718..5ad8a5207 100644
--- a/extensions/PhabBugz/lib/Util.pm
+++ b/extensions/PhabBugz/lib/Util.pm
@@ -267,15 +267,27 @@ sub get_needs_review {
             },
             constraints => {
                 reviewerPHIDs => [$phab_user->phid],
-                statuses      => [qw( needs-review )],
+                statuses      => ["open()"],
             },
-            order       => 'newest',
+            order => 'newest',
         }
     );
     ThrowCodeError('phabricator_api_error', { reason => 'Malformed Response' })
         unless exists $diffs->{result}{data};
 
-    return $diffs->{result}{data};
+    my @revisions;
+    foreach my $revision ( @{ $diffs->{result}{data} } ) {
+        foreach my $reviewer ( @{ $revision->{attachments}->{reviewers}->{reviewers} } ) {
+            if (   $reviewer->{reviewerPHID} eq $phab_user->phid
+                && $reviewer->{status} =~ /^(?:added|blocking)$/ )
+            {
+                push @revisions, $revision;
+                last;
+            }
+        }
+    }
+
+    return \@revisions;
 }
 
 1;