X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FReply.pm;h=091f20bc00f35106afdef4a84df1d88372f61b22;hp=17b1abb272323b127f832f67d4d8a95a3ec0e5b3;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 17b1abb2..091f20bc 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,21 +1,17 @@
-# Copyright (C) 2014-2018 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 obfuscate_addrs/;
+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) = @_;
@@ -32,10 +28,18 @@ 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 defaultq
+ 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);
@@ -66,7 +70,8 @@ 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;
@@ -75,7 +80,6 @@ sub mailto_arg_link {
# 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;
@@ -98,6 +102,10 @@ sub mailto_arg_link {
# anyways.
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";