summaryrefslogtreecommitdiffstats
path: root/extensions/ContributorEngagement
diff options
context:
space:
mode:
authorPerl Tidy <perltidy@bugzilla.org>2018-12-05 21:38:52 +0100
committerDylan William Hardison <dylan@hardison.net>2018-12-05 23:49:08 +0100
commit8ec8da0491ad89604700b3e29a227966f6d84ba1 (patch)
tree9d270f173330ca19700e0ba9f2ee931300646de1 /extensions/ContributorEngagement
parenta7bb5a65b71644d9efce5fed783ed545b9336548 (diff)
downloadbugzilla-8ec8da0491ad89604700b3e29a227966f6d84ba1.tar.gz
bugzilla-8ec8da0491ad89604700b3e29a227966f6d84ba1.tar.xz
no bug - reformat all the code using the new perltidy rules
Diffstat (limited to 'extensions/ContributorEngagement')
-rw-r--r--extensions/ContributorEngagement/Config.pm6
-rw-r--r--extensions/ContributorEngagement/Extension.pm147
-rw-r--r--extensions/ContributorEngagement/lib/Constants.pm15
3 files changed, 84 insertions, 84 deletions
diff --git a/extensions/ContributorEngagement/Config.pm b/extensions/ContributorEngagement/Config.pm
index d48de3bc6..5f46efdb0 100644
--- a/extensions/ContributorEngagement/Config.pm
+++ b/extensions/ContributorEngagement/Config.pm
@@ -13,10 +13,8 @@ use warnings;
use constant NAME => 'ContributorEngagement';
-use constant REQUIRED_MODULES => [
-];
+use constant REQUIRED_MODULES => [];
-use constant OPTIONAL_MODULES => [
-];
+use constant OPTIONAL_MODULES => [];
__PACKAGE__->NAME;
diff --git a/extensions/ContributorEngagement/Extension.pm b/extensions/ContributorEngagement/Extension.pm
index 35eba24ab..ae5c1b809 100644
--- a/extensions/ContributorEngagement/Extension.pm
+++ b/extensions/ContributorEngagement/Extension.pm
@@ -23,105 +23,110 @@ use Bugzilla::Extension::ContributorEngagement::Constants;
our $VERSION = '2.0';
BEGIN {
- *Bugzilla::User::first_patch_reviewed_id = \&_first_patch_reviewed_id;
+ *Bugzilla::User::first_patch_reviewed_id = \&_first_patch_reviewed_id;
}
sub _first_patch_reviewed_id { return $_[0]->{'first_patch_reviewed_id'}; }
sub install_update_db {
- my ($self) = @_;
- my $dbh = Bugzilla->dbh;
-
- if ($dbh->bz_column_info('profiles', 'first_patch_approved_id')) {
- $dbh->bz_drop_column('profiles', 'first_patch_approved_id');
- }
- if (!$dbh->bz_column_info('profiles', 'first_patch_reviewed_id')) {
- $dbh->bz_add_column('profiles', 'first_patch_reviewed_id', { TYPE => 'INT3' });
- _populate_first_reviewed_ids();
- }
+ my ($self) = @_;
+ my $dbh = Bugzilla->dbh;
+
+ if ($dbh->bz_column_info('profiles', 'first_patch_approved_id')) {
+ $dbh->bz_drop_column('profiles', 'first_patch_approved_id');
+ }
+ if (!$dbh->bz_column_info('profiles', 'first_patch_reviewed_id')) {
+ $dbh->bz_add_column('profiles', 'first_patch_reviewed_id', {TYPE => 'INT3'});
+ _populate_first_reviewed_ids();
+ }
}
sub _populate_first_reviewed_ids {
- my $dbh = Bugzilla->dbh;
+ my $dbh = Bugzilla->dbh;
- my $sth = $dbh->prepare('UPDATE profiles SET first_patch_reviewed_id = ? WHERE userid = ?');
- my $ra = $dbh->selectall_arrayref("SELECT attachments.submitter_id,
+ my $sth = $dbh->prepare(
+ 'UPDATE profiles SET first_patch_reviewed_id = ? WHERE userid = ?');
+ my $ra = $dbh->selectall_arrayref(
+ "SELECT attachments.submitter_id,
attachments.attach_id
FROM attachments
INNER JOIN flags ON attachments.attach_id = flags.attach_id
INNER JOIN flagtypes ON flags.type_id = flagtypes.id
WHERE flagtypes.name LIKE 'review%' AND flags.status = '+'
- ORDER BY flags.modification_date");
- my $count = 1;
- my $total = scalar @$ra;
- my %user_seen;
- foreach my $ra_row (@$ra) {
- my ($user_id, $attach_id) = @$ra_row;
- indicate_progress({ current => $count++, total => $total, every => 25 });
- next if $user_seen{$user_id};
- $sth->execute($attach_id, $user_id);
- $user_seen{$user_id} = 1;
- }
-
- print "done\n";
+ ORDER BY flags.modification_date"
+ );
+ my $count = 1;
+ my $total = scalar @$ra;
+ my %user_seen;
+ foreach my $ra_row (@$ra) {
+ my ($user_id, $attach_id) = @$ra_row;
+ indicate_progress({current => $count++, total => $total, every => 25});
+ next if $user_seen{$user_id};
+ $sth->execute($attach_id, $user_id);
+ $user_seen{$user_id} = 1;
+ }
+
+ print "done\n";
}
sub object_columns {
- my ($self, $args) = @_;
- my ($class, $columns) = @$args{qw(class columns)};
- if ($class->isa('Bugzilla::User')) {
- my $dbh = Bugzilla->dbh;
- if ($dbh->bz_column_info($class->DB_TABLE, 'first_patch_reviewed_id')) {
- push @$columns, 'first_patch_reviewed_id';
- }
+ my ($self, $args) = @_;
+ my ($class, $columns) = @$args{qw(class columns)};
+ if ($class->isa('Bugzilla::User')) {
+ my $dbh = Bugzilla->dbh;
+ if ($dbh->bz_column_info($class->DB_TABLE, 'first_patch_reviewed_id')) {
+ push @$columns, 'first_patch_reviewed_id';
}
+ }
}
sub flag_end_of_update {
- my ($self, $args) = @_;
- my ($object, $timestamp, $new_flags) = @$args{qw(object timestamp new_flags)};
-
- if ($object->isa('Bugzilla::Attachment')
- && @$new_flags
- && !$object->attacher->first_patch_reviewed_id
- && grep($_ eq $object->bug->product, ENABLED_PRODUCTS))
- {
- my $attachment = $object;
-
- foreach my $orig_change (@$new_flags) {
- my $change = $orig_change;
- $change =~ s/^[^:]+://; # get rid of setter
- $change =~ s/\([^\)]+\)$//; # get rid of requestee
- my ($name, $value) = $change =~ /^(.+)(.)$/;
-
- # Only interested in review flags set to +
- next unless $name =~ /^review/ && $value eq '+';
-
- _send_mail($attachment, $timestamp);
-
- Bugzilla->dbh->do("UPDATE profiles SET first_patch_reviewed_id = ? WHERE userid = ?",
- undef, $attachment->id, $attachment->attacher->id);
- Bugzilla->memcached->clear({ table => 'profiles', id => $attachment->attacher->id });
- last;
- }
+ my ($self, $args) = @_;
+ my ($object, $timestamp, $new_flags) = @$args{qw(object timestamp new_flags)};
+
+ if ( $object->isa('Bugzilla::Attachment')
+ && @$new_flags
+ && !$object->attacher->first_patch_reviewed_id
+ && grep($_ eq $object->bug->product, ENABLED_PRODUCTS))
+ {
+ my $attachment = $object;
+
+ foreach my $orig_change (@$new_flags) {
+ my $change = $orig_change;
+ $change =~ s/^[^:]+://; # get rid of setter
+ $change =~ s/\([^\)]+\)$//; # get rid of requestee
+ my ($name, $value) = $change =~ /^(.+)(.)$/;
+
+ # Only interested in review flags set to +
+ next unless $name =~ /^review/ && $value eq '+';
+
+ _send_mail($attachment, $timestamp);
+
+ Bugzilla->dbh->do(
+ "UPDATE profiles SET first_patch_reviewed_id = ? WHERE userid = ?",
+ undef, $attachment->id, $attachment->attacher->id);
+ Bugzilla->memcached->clear(
+ {table => 'profiles', id => $attachment->attacher->id});
+ last;
}
+ }
}
sub _send_mail {
- my ($attachment, $timestamp) = @_;
+ my ($attachment, $timestamp) = @_;
- my $vars = {
- date => format_time($timestamp, '%a, %d %b %Y %T %z', 'UTC'),
- attachment => $attachment,
- from_user => EMAIL_FROM,
- };
+ my $vars = {
+ date => format_time($timestamp, '%a, %d %b %Y %T %z', 'UTC'),
+ attachment => $attachment,
+ from_user => EMAIL_FROM,
+ };
- my $msg;
- my $template = Bugzilla->template_inner($attachment->attacher->setting('lang'));
- $template->process("contributor/email.txt.tmpl", $vars, \$msg)
- || ThrowTemplateError($template->error());
+ my $msg;
+ my $template = Bugzilla->template_inner($attachment->attacher->setting('lang'));
+ $template->process("contributor/email.txt.tmpl", $vars, \$msg)
+ || ThrowTemplateError($template->error());
- MessageToMTA($msg);
+ MessageToMTA($msg);
}
__PACKAGE__->NAME;
diff --git a/extensions/ContributorEngagement/lib/Constants.pm b/extensions/ContributorEngagement/lib/Constants.pm
index dd379adcd..030a463a4 100644
--- a/extensions/ContributorEngagement/lib/Constants.pm
+++ b/extensions/ContributorEngagement/lib/Constants.pm
@@ -14,20 +14,17 @@ use warnings;
use base qw(Exporter);
our @EXPORT = qw(
- EMAIL_FROM
- ENABLED_PRODUCTS
+ EMAIL_FROM
+ ENABLED_PRODUCTS
);
use constant EMAIL_FROM => 'bugzilla-daemon@mozilla.org';
use constant ENABLED_PRODUCTS => (
- "Cloud Services",
- "Core",
- "Firefox for Android",
- "Firefox for Metro",
- "Firefox",
- "Testing",
- "Toolkit",
+ "Cloud Services", "Core",
+ "Firefox for Android", "Firefox for Metro",
+ "Firefox", "Testing",
+ "Toolkit",
);
1;