about summary refs log tree commit homepage
path: root/lib/PublicInbox/Reply.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2022-06-09 17:53:53 +0000
committerEric Wong <e@80x24.org>2022-06-09 22:29:05 +0000
commit930d2dc63e04c652e3b64cc7f3b3a7d377637065 (patch)
tree889d5adbbee07c5ecae20f50572fb2038c70a4c6 /lib/PublicInbox/Reply.pm
parent68b53c88891129928183c30fd416bb8bc82a87e7 (diff)
downloadpublic-inbox-930d2dc63e04c652e3b64cc7f3b3a7d377637065.tar.gz
It's probably not a perfect match for RFC 6068 atm, but perfect
is the enemy of good.

Reported-by: Moritz Poldrack <moritz@poldrack.dev>
Link: https://public-inbox.org/meta/CKJSWGSZFKMX.3VUSIYE955Z9X@Archetype/
Diffstat (limited to 'lib/PublicInbox/Reply.pm')
-rw-r--r--lib/PublicInbox/Reply.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index d96fadfc..592dfb62 100644
--- 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";