Conservancy/supporters
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various changes for proper email selection and encoding.

Browse source
This commit is contained in:
Bradley M. Kuhn 2019-12-10 09:36:38 -08:00
parent 2cde8096a9
commit 56e6716248
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/send-t-shirts.plx
View file

@ -7,8 +7,11 @@ use autodie qw(open close);
use DBI; use DBI;
use Encode qw(encode decode); use Encode qw(encode decode);
use Email::MIME::RFC2047::Encoder;
use Email::MIME;
use Supporters; use Supporters;
my $encoder = Email::MIME::RFC2047::Encoder->new();
my $LEDGER_CMD = "/usr/local/bin/ledger"; my $LEDGER_CMD = "/usr/local/bin/ledger";
if (@ARGV != 5 and @ARGV != 6) { if (@ARGV != 5 and @ARGV != 6) {
@ -16,7 +19,7 @@ if (@ARGV != 5 and @ARGV != 6) {
exit 1; exit 1;
} }
my($SUPPORTERS_SQLITE_DB_FILE, $WHO, $HOW, $TEX_FILE, $VERBOSE) = @ARGV; my($SUPPORTERS_SQLITE_DB_FILE, $T_SHIRT_TYPE, $WHO, $HOW, $TEX_FILE, $VERBOSE) = @ARGV;
$VERBOSE = 0 if not defined $VERBOSE; $VERBOSE = 0 if not defined $VERBOSE;
my $dbh = DBI->connect("dbi:SQLite:dbname=$SUPPORTERS_SQLITE_DB_FILE", "", "", my $dbh = DBI->connect("dbi:SQLite:dbname=$SUPPORTERS_SQLITE_DB_FILE", "", "",
@ -75,40 +78,41 @@ foreach my $id (sort keys %idsSent) {
next; next;
} }
next unless $sp->emailOk($id); next unless $sp->emailOk($id);
my @emails; my %emails;
my $preferredEmail = $sp->getPreferredEmailAddress($id); my $email = $sp->getPreferredEmailAddress($id);
if (defined $preferredEmail) { if (defined $email) {
push(@emails, $preferredEmail); $emails{$email} = {};
} else { } else {
my(%emailData) = $sp->getEmailAddresses($id); %emails = $sp->getEmailAddresses($id);
(@emails) = keys %emailData;
} }
my(@emails) = keys(%emails);
my $fullEmailLine = ""; my $fullEmailLine = "";
my $emailTo = join(' ', @emails); my $emailTo = join(' ', @emails);
my $displayName = $sp->getDisplayName($id); my $displayName = $sp->getDisplayName($id);
print "Email to:$emailTo, displayName $displayName\n";
foreach my $email (@emails) { foreach my $email (@emails) {
$fullEmailLine .= ", " if ($fullEmailLine ne ""); $fullEmailLine .= ", " if ($fullEmailLine ne "");
my $line = ""; my $line = "";
if (defined $displayName) { if (defined $displayName) {
$line .= "\"$displayName\" "; $line .= $encoder->encode_phrase($displayName) . " ";
} }
$line .= "<$email>"; $line .= "<$email>";
$fullEmailLine .= Encode::encode("MIME-Header", $line); $fullEmailLine .= $line;
} }
my $fromAddress = 'info@sfconservancy.org'; my $fromAddress = 'supporters@tix.sfconservancy.org';
my $pingNoGet = ""; my $pingNoGet = "";
$pingNoGet = "\nPlease ping us if you do not receive your t-shirt within two weeks in the\nUSA, or three weeks outside of the USA.\n\n" $pingNoGet = "\nPlease ping us if you do not receive your t-shirt within two weeks in the\nUSA, or three weeks outside of the USA.\n\n"
if ($HOW =~ /post/); if ($HOW =~ /post/);
open(SENDMAIL, "|/usr/lib/sendmail -f \"$fromAddress\" -oi -oem -- $emailTo info\@sfconservancy.org") or
open(SENDMAIL, "|/usr/lib/sendmail -f \"$fromAddress\" -oi -oem -- $emailTo $fromAddress") or
die "unable to run sendmail: $!"; die "unable to run sendmail: $!";
print SENDMAIL <<DATA; print SENDMAIL <<DATA;
To: $fullEmailLine To: $fullEmailLine
From: "Software Freedom Conservancy" <$fromAddress> From: "Software Freedom Conservancy" <$fromAddress>
Subject: $sizesSent Conservancy T-Shirt was $HOW Subject: $sizesSent Conservancy T-Shirt was $HOW
[ We apologize if you get a duplicate of this notification. ]
According to our records, the t-shirt of size $sizesSent that you According to our records, the t-shirt of size $sizesSent that you
requested as a Conservancy Supporter was $HOW. requested as a Conservancy Supporter was $HOW.
$pingNoGet $pingNoGet