update copyrights for 2021

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

diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 07288aab3c4fd21f34df3f28cb416144242cecb3..8226fdc3c755e9cecb7cc66ee2fb4eae1fc23026 100644 (file)
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,12 +1,14 @@
-# Copyright (C) 2014-2017 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 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 mid_href);
 use PublicInbox::Address;
-use PublicInbox::MID qw/mid_clean mid_escape/;
+use PublicInbox::MID qw(mid_clean);
 
 sub squote_maybe ($) {
        my ($val) = @_;
@@ -34,8 +36,16 @@ sub mailto_arg_link {
        my $cc = {}; # everyone else
        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);
@@ -66,12 +76,13 @@ sub mailto_arg_link {
        $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);
+       my $irt = mid_href($mid);
        delete $cc->{$to};
        if ($obfs) {
                my $arg_to = $to;
-               $arg_to =~ s/\./\$(echo .)/;
+               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);
@@ -82,8 +93,9 @@ sub mailto_arg_link {
        if (@cc) {
                if ($obfs) {
                        push(@arg, map {
-                               s/\./\$(echo .)/;
-                               "--cc=$_";
+                               my $addr = $_;
+                               obfuscate_addrs($ibx, $addr, '$(echo .)');
+                               "--cc=$addr";
                        } @cc);
                } else {
                        $cc = '&Cc=' . uri_escape_utf8(join(',', @cc));