From a6a666914030628bd0c04bf64021c712a698edc2 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Thu, 13 Aug 2020 13:57:20 -0700
Subject: [PATCH] update text, fix bugs

---
 tools/sendadminsmail | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/sendadminsmail b/tools/sendadminsmail
index 1ad80b9..28bd86b 100755
--- a/tools/sendadminsmail
+++ b/tools/sendadminsmail
@@ -19,30 +19,32 @@ open(IN, "$infile") or die "ERROR: cannot open $infile\n";
 while (<IN>) {
   chomp;
   $list=$_;
-  $admin="${list}-admin@lists.riseup.net";
+  $admin="${list}-admin\@lists.riseup.net";
 
   print "Sending to $admin...\n";
 
   $body= "Hi $admin,
-While recently making some configuration changes to improve server security, we had a bug that caused lists.riseup.net mail deliveries to bounce.
-This bug existed for 13 hours, from
-  2020-08-12 23:00 to 2020-08-13 12:00 UTC
-  2020-08-12 16:00 to 2020-08-13 5:00 US PDT
+
+While recently making some configuration changes to improve server security, we had a bug that caused mail deliveries to lists.riseup.net subscribers to fail.
+This bug existed for 13 hours, from approx
+
+  August 12th 23:00 to August 13th 12:00 UTC
+  August 12th 16:00 to August 13th 05:00 US PDT
 
 Your list,
 
-  ${list}@lists.riseup.net
+  ${list}\@lists.riseup.net
 
 was detected as possibly having list traffic during that time. There is a chance that any message sent to your list was not delivered to subscribers. However, any messages would have been properly archived, so you can check there to see if there are messages that need to be resent.
 
 You may also notice in the admin interface that bounce count for subscribers is high due to this issue. Do not delete any subscribers and on the next successful delivery the bounce numbers will be automatically fixed.
 
-We are sorry this happened and if you have any questions please file a support ticket at https://support.riseup.net
-
-Thanks,
+We are sorry of the problems this have caused. If you have any questions, please file a support ticket at https://support.riseup.net
 
+In Solidarity,
 --
-Riseup
+
+Riseup Collective
 listmaster\@lists.riseup.net
 ";
 
@@ -54,7 +56,7 @@ listmaster\@lists.riseup.net
 sub domail {
   my $email = Email::Simple->create(
     header => [
-      To      => $contact,
+      To      => $admin,
       From    => $from,
       Subject => $subject,
     ],
-- 
GitLab