X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FReply.pm;h=091f20bc00f35106afdef4a84df1d88372f61b22;hb=refs%2Fheads%2Fmaster;hp=79dd46a729dd82be103647b0cf842443b3e4fc97;hpb=74c0a24d49855321883f23decd687a1a866df24e;p=public-inbox.git
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 79dd46a7..091f20bc 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2014-2021 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 mid_href);
use PublicInbox::Address;
@@ -28,7 +28,7 @@ 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};
@@ -68,10 +68,10 @@ sub mailto_arg_link {
my $obfs = $ibx->{obfuscate};
my $subj = $hdr->header('Subject') || '';
$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
- my $subj_raw = $subj;
my $mid = $hdr->header_raw('Message-ID');
push @arg, '--in-reply-to='.squote_maybe(mid_clean($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;
@@ -80,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,13 +97,15 @@ sub mailto_arg_link {
}
}
- push @arg, "--subject=".squote_maybe($subj_raw);
-
# 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;
+ # 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";