X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FReply.pm;h=091f20bc00f35106afdef4a84df1d88372f61b22;hp=0f6dd83bc3f5e3db9716cdce58f93d701dcdfd1f;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hpb=b0e5062d43a96372801713ef78a78d6a1bc852bc

diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 0f6dd83b..091f20bc 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,23 +1,17 @@
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 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 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) = @_;
@@ -34,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};
 
@@ -76,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;
@@ -85,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;
@@ -108,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";