about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2018-01-29 11:49:56 +0000
committerEric Wong <e@80x24.org>2018-01-29 12:50:09 +0000
commita5302bf56fc9ea87e35803f193f58f2d157ac75f (patch)
tree04e3f2755b6b72710a3819143764ae1a8aa7d2c4 /lib/PublicInbox
parent5a2891dc8a0270af2e5cca0964bb862556b61d20 (diff)
downloadpublic-inbox-a5302bf56fc9ea87e35803f193f58f2d157ac75f.tar.gz
This makes the wording less confusing when showing archives
for lists where the convention is reply-to-list.
I still hate reply-to-list, but it's still better than no
archives or list at all.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/Reply.pm9
-rw-r--r--lib/PublicInbox/View.pm9
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 0cd36fda..07288aab 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -32,7 +32,8 @@ 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 default
+        my $to; # this is the From address by defaultq
+        my $reply_to_all = 'reply-to-all'; # the only good default :P
 
         foreach my $rt (split(/\s*,\s*/, $ibx->{replyto} || ':all')) {
                 if ($rt eq ':all') {
@@ -43,8 +44,10 @@ sub mailto_arg_link {
                                 add_addrs(\$to, $cc, @addrs);
                         }
                 } elsif ($rt eq ':list') {
+                        $reply_to_all = 'reply-to-list';
                         add_addrs(\$to, $cc, $ibx->{-primary_address});
                 } elsif ($rt =~ /\A(?:$reply_headers)\z/io) {
+                        # ugh, this is weird...
                         my $v = $hdr->header($rt);
                         if (defined($v) && ($v ne '')) {
                                 my @addrs = PublicInbox::Address::emails($v);
@@ -91,13 +94,13 @@ sub mailto_arg_link {
         # I'm not sure if address obfuscation and mailto: links can
         # be made compatible; and address obfuscation is misguided,
         # anyways.
-        return (\@arg, '') if $obfs;
+        return (\@arg, '', $reply_to_all) if $obfs;
 
         # 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";
 
-        (\@arg, ascii_html($href));
+        (\@arg, ascii_html($href), $reply_to_all);
 }
 
 1;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 81e83d97..70e38a6e 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -61,7 +61,8 @@ sub msg_reply {
                 $info = qq(\n  List information: <a\nhref="$url">$url</a>\n);
         }
 
-        my ($arg, $link) = PublicInbox::Reply::mailto_arg_link($ibx, $hdr);
+        my ($arg, $link, $reply_to_all) =
+                        PublicInbox::Reply::mailto_arg_link($ibx, $hdr);
 
         # mailto: link only works if address obfuscation is disabled
         if ($link) {
@@ -83,15 +84,15 @@ href=#t>this message</a> via plain-text email
 using any one of the following methods:
 
 * Save the following mbox file, import it into your mail client,
-  and reply-to-all from there: <a
+  and $reply_to_all from there: <a
 href=raw>mbox</a>
 
   Avoid top-posting and favor interleaved quoting:
   <a
 href="$p_url">$p_url</a>
 $info
-* Reply to all the recipients using the <b>--to</b>, <b>--cc</b>,
-  and <b>--in-reply-to</b> switches of git-send-email(1):
+* Reply using the <b>--to</b>, <b>--cc</b>, and <b>--in-reply-to</b>
+  switches of git-send-email(1):
 
   git send-email$arg