run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / Reply.pm

diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 5bbe8f4e7878ea17df34b43fc19f6edd9682769c..0517057ac1da126b97974ef73abb650352869590 100644 (file)
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,10 +1,12 @@
-# Copyright (C) 2014-2017 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# For reply instructions and address generation in WWW UI
 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/;
 
@@ -26,15 +28,24 @@ sub add_addrs {
        }
 }
 
-my @reply_headers = qw(From To Cc);
+my @reply_headers = qw(From To Cc Reply-To);
 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
+       my $reply_to_cfg = $ibx->{replyto};
+
+       $reply_to_cfg ||= ':all';
+       if ($reply_to_cfg =~ /\A:none=(.*)/) {
+               my $msg = $1;
+               $msg = 'replies disabled' if $msg eq '';
+               return \$msg;
+       }
 
-       foreach my $rt (split(/\s*,\s*/, $ibx->{replyto} || ':all')) {
+       foreach my $rt (split(/\s*,\s*/, $reply_to_cfg)) {
                if ($rt eq ':all') {
                        foreach my $h (@reply_headers) {
                                my $v = $hdr->header($h);
@@ -43,8 +54,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 +71,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;