diff options
author | Eric Wong <e@80x24.org> | 2019-10-24 00:12:41 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-10-28 10:49:16 +0000 |
commit | 24794840fbd2363a51e4c02de1474987b605a56c (patch) | |
tree | 0479050deebb125899632aa5825dca5de4a9caeb /lib/PublicInbox/View.pm | |
parent | e67dc3e9fc73029332a632d022002d3ce80c1306 (diff) | |
download | public-inbox-24794840fbd2363a51e4c02de1474987b605a56c.tar.gz |
Since we index X-Alt-Message-ID (because we need to placate some NNTP clients), we now display it as well, since that Message-ID could be the X-Alt-Message-ID that the reader is actually interested in.
Diffstat (limited to 'lib/PublicInbox/View.pm')
-rw-r--r-- | lib/PublicInbox/View.pm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 00bf38a9..39b04174 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -10,7 +10,7 @@ use bytes (); # only for bytes::length use PublicInbox::MsgTime qw(msg_datestamp); use PublicInbox::Hval qw/ascii_html obfuscate_addrs/; use PublicInbox::Linkify; -use PublicInbox::MID qw/id_compress mid_escape mids references/; +use PublicInbox::MID qw/id_compress mid_escape mids mids_for_index references/; use PublicInbox::MsgIter; use PublicInbox::Address; use PublicInbox::WwwStream; @@ -629,7 +629,7 @@ sub _msg_html_prepare { my $over = $ctx->{-inbox}->over; my $obfs_ibx = $ctx->{-obfs_ibx}; my $rv = ''; - my $mids = mids($hdr); + my $mids = mids_for_index($hdr); if ($nr == 0) { if ($more) { $rv .= @@ -691,9 +691,13 @@ sub _msg_html_prepare { $rv .= "Message-ID: <$mhtml> "; $rv .= "(<a\nhref=\"raw\">raw</a>)\n"; } else { + # X-Alt-Message-ID can happen if a message is injected from + # public-inbox-nntpd because of multiple Message-ID headers. my $lnk = PublicInbox::Linkify->new; my $s = ''; - $s .= "Message-ID: $_\n" for ($hdr->header_raw('Message-ID')); + for my $h (qw(Message-ID X-Alt-Message-ID)) { + $s .= "$h: $_\n" for ($hdr->header_raw($h)); + } $lnk->linkify_mids('..', \$s, 1); $rv .= $s; } |