Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/Script/Inactive.pm b/perllib/FixMyStreet/Script/Inactive.pm
index 8dd524ce1..6b3372a2b 100644
--- a/perllib/FixMyStreet/Script/Inactive.pm
+++ b/perllib/FixMyStreet/Script/Inactive.pm
@@ -158,8 +158,14 @@ sub delete_reports {
 sub anonymize_users {
     my $self = shift;
 
+    my $body_users = FixMyStreet::DB->resultset("Body")->search({
+        comment_user_id => { '!=' => undef },
+    }, {
+        columns => 'comment_user_id',
+    });
     my $users = FixMyStreet::DB->resultset("User")->search({
         last_active => { '<', interval($self->anonymize) },
+        id => { -not_in => $body_users->as_query },
         email => { -not_like => 'removed-%@' . FixMyStreet->config('EMAIL_DOMAIN') },
     });
 
@@ -179,6 +185,7 @@ sub email_inactive_users {
     });
     while (my $user = $users->next) {
         next if $user->get_extra_metadata('inactive_email_sent');
+        next unless $user->email && $user->email_verified;
 
         say "Emailing user #" . $user->id if $self->verbose;
         next if $self->dry_run;