Merge tag 'v2.0.4' into fiksgatami-dev

1 files changed, 6 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm
index 7d81c9dc5..ea84e3966 100644
--- a/perllib/FixMyStreet/Email.pm
+++ b/perllib/FixMyStreet/Email.pm
@@ -17,7 +17,7 @@ use mySociety::Random qw(random_bytes);
 use Utils::Email;
 use FixMyStreet;
 use FixMyStreet::DB;
-use FixMyStreet::EmailSend;
+use FixMyStreet::Email::Sender;
 
 sub test_dmarc {
     my $email = shift;
@@ -77,6 +77,10 @@ sub _render_template {
     return $var;
 }
 
+sub unique_verp_id {
+    sprintf('fms-%s@%s', generate_verp_token(@_), FixMyStreet->config('EMAIL_DOMAIN'));
+}
+
 sub _unique_id {
     sprintf('fms-%s-%s@%s',
         time(), unpack('h*', random_bytes(5, 1)),
@@ -183,7 +187,7 @@ sub send_cron {
         print $email->as_string;
         return 1; # Failure
     } else {
-        my $result = FixMyStreet::EmailSend->new({ env_from => $env_from })->send($email);
+        my $result = FixMyStreet::Email::Sender->try_to_send($email, { from => $env_from });
         return $result ? 0 : 1;
     }
 }