1 files changed, 11 insertions, 15 deletions

diff --git a/extensions/Push/lib/Connector/Phabricator.pm b/extensions/Push/lib/Connector/Phabricator.pm
index d72009708..2571c6d37 100644
--- a/extensions/Push/lib/Connector/Phabricator.pm
+++ b/extensions/Push/lib/Connector/Phabricator.pm
@@ -16,17 +16,16 @@ use base 'Bugzilla::Extension::Push::Connector::Base';
 use Bugzilla::Bug;
 use Bugzilla::Constants;
 use Bugzilla::Error;
-use Bugzilla::Extension::PhabBugz::Util qw(add_comment_to_revision
-  create_private_revision_policy edit_revision_policy get_bug_role_phids
-  get_revisions_by_ids intersect make_revision_public make_revision_private);
-use Bugzilla::Extension::Push::Constants;
-use Bugzilla::Extension::Push::Util qw(is_public);
 use Bugzilla::User;
-use List::Util qw(any);
 
-use constant PHAB_CONTENT_TYPE       => 'text/x-phabricator-request';
-use constant PHAB_ATTACHMENT_PATTERN => qr/^phabricator-D(\d+)/;
-use constant PHAB_BMO_USER_EMAIL     => 'phab-bot@bmo.tld';
+use Bugzilla::Extension::PhabBugz::Constants;
+use Bugzilla::Extension::PhabBugz::Util qw(
+  add_comment_to_revision create_private_revision_policy
+  edit_revision_policy get_bug_role_phids get_revisions_by_ids
+  intersect is_attachment_phab_revision make_revision_public
+  make_revision_private);
+use Bugzilla::Extension::Push::Constants;
+use Bugzilla::Extension::Push::Util qw(is_public);
 
 sub options {
     return (
@@ -91,7 +90,7 @@ sub send {
             : 'One revision was' )
           . ' made private due to unknown Bugzilla groups.';
 
-        my $user = Bugzilla::User->new( { name => PHAB_BMO_USER_EMAIL } );
+        my $user = Bugzilla::User->new( { name => PHAB_AUTOMATION_USER } );
         $user->{groups} = [ Bugzilla::Group->get_all ];
         $user->{bless_groups} = [ Bugzilla::Group->get_all ];
         Bugzilla->set_user($user);
@@ -131,11 +130,8 @@ sub _get_attachment_revisions() {
 
     my @revisions;
 
-    my @attachments = grep {
-             $_->isobsolete == 0
-          && $_->contenttype eq PHAB_CONTENT_TYPE
-          && $_->attacher->login eq PHAB_BMO_USER_EMAIL
-    } @{ $bug->attachments() };
+    my @attachments =
+      grep { is_attachment_phab_revision($_) } @{ $bug->attachments() };
 
     if (@attachments) {
         my @revision_ids;