X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FReply.pm;h=17b1abb272323b127f832f67d4d8a95a3ec0e5b3;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=13ae052e32641f08b15c351ac82273d35c377377;hpb=61196e5b0645eb58b415b4c679fc36ecf602ad16;p=public-inbox.git
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 13ae052e..17b1abb2 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2014-2017 all contributors
+# Copyright (C) 2014-2018 all contributors
# License: AGPL-3.0+
package PublicInbox::Reply;
use strict;
use warnings;
use URI::Escape qw/uri_escape_utf8/;
-use PublicInbox::Hval qw/ascii_html/;
+use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
use PublicInbox::Address;
use PublicInbox::MID qw/mid_clean mid_escape/;
@@ -32,7 +32,8 @@ my $reply_headers = join('|', @reply_headers);
sub mailto_arg_link {
my ($ibx, $hdr) = @_;
my $cc = {}; # everyone else
- my $to; # this is the From address by default
+ my $to; # this is the From address by defaultq
+ my $reply_to_all = 'reply-to-all'; # the only good default :P
foreach my $rt (split(/\s*,\s*/, $ibx->{replyto} || ':all')) {
if ($rt eq ':all') {
@@ -43,8 +44,10 @@ sub mailto_arg_link {
add_addrs(\$to, $cc, @addrs);
}
} elsif ($rt eq ':list') {
+ $reply_to_all = 'reply-to-list';
add_addrs(\$to, $cc, $ibx->{-primary_address});
} elsif ($rt =~ /\A(?:$reply_headers)\z/io) {
+ # ugh, this is weird...
my $v = $hdr->header($rt);
if (defined($v) && ($v ne '')) {
my @addrs = PublicInbox::Address::emails($v);
@@ -58,27 +61,48 @@ sub mailto_arg_link {
}
my @arg;
+ my $obfs = $ibx->{obfuscate};
my $subj = $hdr->header('Subject') || '';
$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
my $mid = $hdr->header_raw('Message-ID');
push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid));
my $irt = mid_escape($mid);
delete $cc->{$to};
- push @arg, "--to=$to";
- $to = uri_escape_utf8($to);
- $subj = uri_escape_utf8($subj);
+ if ($obfs) {
+ my $arg_to = $to;
+ obfuscate_addrs($ibx, $arg_to, '$(echo .)');
+ push @arg, "--to=$arg_to";
+ # no $subj for $href below
+ } else {
+ push @arg, "--to=$to";
+ $to = uri_escape_utf8($to);
+ $subj = uri_escape_utf8($subj);
+ }
my @cc = sort values %$cc;
$cc = '';
if (@cc) {
- push(@arg, map { "--cc=$_" } @cc);
- $cc = '&Cc=' . uri_escape_utf8(join(',', @cc));
+ if ($obfs) {
+ push(@arg, map {
+ my $addr = $_;
+ obfuscate_addrs($ibx, $addr, '$(echo .)');
+ "--cc=$addr";
+ } @cc);
+ } else {
+ $cc = '&Cc=' . uri_escape_utf8(join(',', @cc));
+ push(@arg, map { "--cc=$_" } @cc);
+ }
}
+ # I'm not sure if address obfuscation and mailto: links can
+ # be made compatible; and address obfuscation is misguided,
+ # anyways.
+ return (\@arg, '', $reply_to_all) if $obfs;
+
# order matters, Subject is the least important header,
# so it is last in case it's lost/truncated in a copy+paste
my $href = "mailto:$to?In-Reply-To=$irt${cc}&Subject=$subj";
- (\@arg, ascii_html($href));
+ (\@arg, ascii_html($href), $reply_to_all);
}
1;