X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FReply.pm;h=091f20bc00f35106afdef4a84df1d88372f61b22;hb=refs%2Fheads%2Fmaster;hp=0cd36fdad542ee53e2cd9d95b3ef60bedc9d74e9;hpb=666844ae42b5b17fd2e9b7ea6cf04727487b5322;p=public-inbox.git
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 0cd36fda..091f20bc 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,21 +1,17 @@
-# Copyright (C) 2014-2017 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
+
+# For reply instructions and address generation in WWW UI
package PublicInbox::Reply;
use strict;
-use warnings;
+use v5.10.1;
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);
+use PublicInbox::Config;
-sub squote_maybe ($) {
- my ($val) = @_;
- if ($val =~ m{([^\w@\./,\%\+\-])}) {
- $val =~ s/(['!])/'\\$1'/g; # '!' for csh
- return "'$val'";
- }
- $val;
-}
+*squote_maybe = \&PublicInbox::Config::squote_maybe;
sub add_addrs {
my ($to, $cc, @addrs) = @_;
@@ -33,8 +29,17 @@ sub mailto_arg_link {
my ($ibx, $hdr) = @_;
my $cc = {}; # everyone else
my $to; # this is the From address by default
+ my $reply_to_all = 'reply-to-all'; # the only good default :P
+ my $reply_to_cfg = $ibx->{replyto};
- foreach my $rt (split(/\s*,\s*/, $ibx->{replyto} || ':all')) {
+ $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*/, $reply_to_cfg)) {
if ($rt eq ':all') {
foreach my $h (@reply_headers) {
my $v = $hdr->header($h);
@@ -43,8 +48,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);
@@ -63,15 +70,16 @@ 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);
+ add_addrs(\$to, $cc, $ibx->{-primary_address}) unless defined($to);
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);
$subj = uri_escape_utf8($subj);
}
my @cc = sort values %$cc;
@@ -79,8 +87,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));
@@ -91,13 +100,17 @@ sub mailto_arg_link {
# I'm not sure if address obfuscation and mailto: links can
# be made compatible; and address obfuscation is misguided,
# anyways.
- return (\@arg, '') if $obfs;
+ return (\@arg, '', $reply_to_all) if $obfs;
+
+ # keep `@' instead of using `%40' for RFC 6068
+ utf8::encode($to);
+ $to =~ s!([^A-Za-z0-9\-\._~\@])!$URI::Escape::escapes{$1}!ge;
# 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;