From 5412a569e233b82c8f971e07c57c73d2ef3f6733 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 27 May 2020 21:01:10 +0100
Subject: Mark user as active when sent an email alert.

---
 perllib/FixMyStreet/Script/Alerts.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'perllib/FixMyStreet/Script/Alerts.pm')

diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index cb1f022fa..d07728092 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -307,6 +307,10 @@ sub _send_aggregated_alert_email(%) {
     # Ignore phone-only users
     return unless $data{alert_user}->email_verified;
 
+    # Mark user as active as they're being sent an alert
+    $data{alert_user}->set_last_active;
+    $data{alert_user}->update;
+
     my $email = $data{alert_user}->email;
     my ($domain) = $email =~ m{ @ (.*) \z }x;
     return if $data{schema}->resultset('Abuse')->search( {
-- 
cgit v1.2.3


From b34ce0e405e10ee9f413a78c9c097351695ac29e Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 2 Jul 2020 17:13:26 +0100
Subject: Allow cobrand to provide custom domain for VERP addresses

---
 perllib/FixMyStreet/Script/Alerts.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/Script/Alerts.pm')

diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index d07728092..03373a8cc 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -327,7 +327,7 @@ sub _send_aggregated_alert_email(%) {
     } );
     $data{unsubscribe_url} = $cobrand->base_url( $data{cobrand_data} ) . '/A/' . $token->token;
 
-    my $sender = FixMyStreet::Email::unique_verp_id('alert', $data{alert_id});
+    my $sender = FixMyStreet::Email::unique_verp_id([ 'alert', $data{alert_id} ], $cobrand->call_hook('verp_email_domain'));
     my $result = FixMyStreet::Email::send_cron(
         $data{schema},
         "$data{template}.txt",
-- 
cgit v1.2.3


From 245f12237ad2c796667d5d4736483474c1b481ce Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 11 Aug 2020 09:18:12 +0100
Subject: Enable HTML in update alert emails.

---
 perllib/FixMyStreet/Script/Alerts.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'perllib/FixMyStreet/Script/Alerts.pm')

diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index 03373a8cc..fa90ede48 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -41,6 +41,7 @@ sub send() {
                    $item_table.photo as item_photo,
                    $item_table.problem_state as item_problem_state,
                    $item_table.cobrand as item_cobrand,
+                   $item_table.extra as item_extra,
                    $head_table.*
             from alert, $item_table, $head_table
                 where alert.parameter::integer = $head_table.id
-- 
cgit v1.2.3