view: do not escape first `@' in mailto: URLs

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

diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index d96fadfc8b3bfc8eec1c8400218a88fa4280f77b..592dfb624f7a7091af7cdf4bd935d09624488d74 100644 (file)
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2014-2021 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 mid_href);
 use PublicInbox::Address;
@@ -81,7 +81,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;
@@ -106,6 +105,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";