From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/7] search: favor In-Reply-To over last References iff IRT exists
Date: Sat, 10 Dec 2016 03:42:59 +0000 [thread overview]
Message-ID: <20161210034305.2654-2-e@80x24.org> (raw)
In-Reply-To: <20161210034305.2654-1-e@80x24.org>
Some email clients set the References headers backwards, so
trust the In-Reply-To header if (and only if) it exists and
is parseable as direct parent of the current message.
For affected repos, this will require reindexing (via
"public-inbox-index --reindex"), but there will be no
version bump for this bugfix.
---
lib/PublicInbox/SearchIdx.pm | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 4aac028..832d1cb 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -293,10 +293,10 @@ sub link_message {
my $hdr = $mime->header_obj;
my $refs = $hdr->header_raw('References');
my @refs = $refs ? ($refs =~ /<([^>]+)>/g) : ();
- if (my $irt = $hdr->header_raw('In-Reply-To')) {
- # last References should be $irt
- # we will de-dupe later
- push @refs, mid_clean($irt);
+ my $irt = $hdr->header_raw('In-Reply-To');
+ if (defined $irt) {
+ $irt = mid_clean($irt);
+ $irt = undef if $mid eq $irt;
}
my $tid;
@@ -305,6 +305,15 @@ sub link_message {
my @orig_refs = @refs;
@refs = ();
+ if (defined $irt) {
+ # to check MAX_MID_SIZE
+ push @orig_refs, $irt;
+
+ # below, we will ensure IRT (if specified)
+ # is the last References
+ $uniq{$irt} = 1;
+ }
+
# prevent circular references via References: here:
foreach my $ref (@orig_refs) {
if (length($ref) > MAX_MID_SIZE) {
@@ -315,6 +324,11 @@ sub link_message {
push @refs, $ref;
}
}
+
+ # last References should be IRT, but some mail clients do things
+ # out of order, so trust IRT over References iff IRT exists
+ push @refs, $irt if defined $irt;
+
if (@refs) {
$smsg->{references} = '<'.join('> <', @refs).'>';
--
EW
next prev parent reply other threads:[~2016-12-10 3:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-10 3:42 [PATCH 0/7] message threading fixes for WWW UI Eric Wong
2016-12-10 3:42 ` Eric Wong [this message]
2016-12-10 3:43 ` [PATCH 2/7] view: favor SearchMsg for In-Reply-To over Email::MIME Eric Wong
2016-12-10 3:43 ` [PATCH 3/7] thread: fix comment describing its existence Eric Wong
2016-12-10 3:43 ` [PATCH 4/7] view: reduce indentation for skeleton generation Eric Wong
2016-12-10 3:43 ` [PATCH 5/7] view: skip ghosts with no direct children Eric Wong
2016-12-10 3:43 ` [PATCH 6/7] thread: last Reference always wins Eric Wong
2016-12-10 3:43 ` [PATCH 7/7] search: always sort thread results in ascending time order Eric Wong
Reply instructions:
You may reply publicly to this message 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: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161210034305.2654-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).