aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/DB
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet/DB')
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/AlertType.pm6
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm1
2 files changed, 7 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
index f2b86725d..a2784950a 100644
--- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
@@ -156,6 +156,7 @@ sub email_alerts ($) {
while (my $alert = $query->next) {
my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($alert->cobrand)->new();
next unless $cobrand->email_host;
+ next if $alert->is_from_abuser;
my $longitude = $alert->parameter;
my $latitude = $alert->parameter2;
@@ -212,6 +213,11 @@ sub _send_aggregated_alert_email(%) {
$data{alert_email} = $user->email;
}
+ my ($domain) = $data{alert_email} =~ m{ @ (.*) \z }x;
+ return if FixMyStreet::App->model('DB::Abuse')->search( {
+ email => [ $data{alert_email}, $domain ]
+ } )->first;
+
my $token = FixMyStreet::App->model("DB::Token")->new_result( {
scope => 'alert',
data => {
diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
index 8d811180e..c85ecbf3a 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
@@ -50,6 +50,7 @@ sub send_questionnaires_period {
# Not all cobrands send questionnaires
next unless $cobrand->send_questionnaires;
+ next if $row->is_from_abuser;
# Cobranded and non-cobranded messages can share a database. In this case, the conf file
# should specify a vhost to send the reports for each cobrand, so that they don't get sent