X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FReply.pm;h=8226fdc3c755e9cecb7cc66ee2fb4eae1fc23026;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=17b1abb272323b127f832f67d4d8a95a3ec0e5b3;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 17b1abb2..8226fdc3 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,12 +1,14 @@
-# Copyright (C) 2014-2018 all contributors
+# Copyright (C) 2014-2021 all contributors
# License: AGPL-3.0+
+
+# For reply instructions and address generation in WWW UI
package PublicInbox::Reply;
use strict;
use warnings;
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);
sub squote_maybe ($) {
my ($val) = @_;
@@ -34,8 +36,16 @@ sub mailto_arg_link {
my $cc = {}; # everyone else
my $to; # this is the From address by defaultq
my $reply_to_all = 'reply-to-all'; # the only good default :P
+ my $reply_to_cfg = $ibx->{replyto};
+
+ $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*/, $ibx->{replyto} || ':all')) {
+ 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 +76,7 @@ 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);
delete $cc->{$to};
if ($obfs) {
my $arg_to = $to;