about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-03-29 09:57:45 +0000
committerEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-03-29 09:59:55 +0000
commit9aaf9cf73f7b126ad3d2726adf7c764630626d67 (patch)
treea34658235bfc1559404004d7cbb0d2c693fd600d
parent6efc0df8d3e00da0257b131e96f74d18fce290ab (diff)
downloadpublic-inbox-9aaf9cf73f7b126ad3d2726adf7c764630626d67.tar.gz
The original Message-ID is still the most important when
discussing with other recipients who do not rely on a message
flowing through public-inbox.  So whatever Message-ID we use
to deduplicate internally will be secondary and less important.

All of our front-end v2 code is order-independent, so we won't
let the message count against us, that way.
-rw-r--r--lib/PublicInbox/Import.pm8
-rw-r--r--lib/PublicInbox/V2Writable.pm2
-rw-r--r--t/psgi_v2.t9
-rw-r--r--t/v2writable.t8
4 files changed, 14 insertions, 13 deletions
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 6824faca..e07eddab 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -297,12 +297,12 @@ sub drop_unwanted_headers ($) {
 }
 
 # used by V2Writable, too
-sub prepend_mid ($$) {
+sub append_mid ($$) {
         my ($hdr, $mid0) = @_;
         # @cur is likely empty if we need to call this sub, but it could
         # have random unparseable crap which we'll preserve, too.
-        my @cur = $hdr->header_raw('Message-Id');
-        $hdr->header_set('Message-Id', "<$mid0>", @cur);
+        my @cur = $hdr->header_raw('Message-ID');
+        $hdr->header_set('Message-ID', @cur, "<$mid0>");
 }
 
 sub v1_mid0 ($) {
@@ -312,7 +312,7 @@ sub v1_mid0 ($) {
 
         if (!scalar(@$mids)) { # spam often has no Message-Id
                 my $mid0 = digest2mid(content_digest($mime));
-                prepend_mid($hdr, $mid0);
+                append_mid($hdr, $mid0);
                 return $mid0;
         }
         $mids->[0];
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 01ec98ac..9b280c68 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -173,7 +173,7 @@ sub num_for_harder {
                         $num = $self->{skel}->{mm}->mid_insert($$mid0);
                 }
         }
-        PublicInbox::Import::prepend_mid($hdr, $$mid0);
+        PublicInbox::Import::append_mid($hdr, $$mid0);
         $num;
 }
 
diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 9964b477..11b2c794 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -7,6 +7,7 @@ use File::Temp qw/tempdir/;
 use PublicInbox::MIME;
 use PublicInbox::Config;
 use PublicInbox::WWW;
+use PublicInbox::MID qw(mids);
 my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
                 URI::Escape Plack::Builder);
 foreach my $mod (@mods) {
@@ -46,8 +47,8 @@ local $SIG{__WARN__} = sub { push @warn, @_ };
 $mime->header_set(Date => 'Fri, 02 Oct 1993 00:01:00 +0000');
 ok($im->add($mime), 'added duplicate-but-different message');
 is(scalar(@warn), 1, 'got one warning');
-my @mids = $mime->header_obj->header_raw('Message-Id');
-$new_mid = PublicInbox::MID::mid_clean($mids[0]);
+my $mids = mids($mime->header_obj);
+$new_mid = $mids->[1];
 $im->done;
 
 my $cfgpfx = "publicinbox.v2test";
@@ -93,8 +94,8 @@ is(scalar(@warn), 2, 'got another warning');
 like($warn[0], qr/mismatched/, 'warned about mismatched messages');
 is($warn[0], $warn[1], 'both warnings are the same');
 
-@mids = $mime->header_obj->header_raw('Message-Id');
-my $third = PublicInbox::MID::mid_clean($mids[0]);
+$mids = mids($mime->header_obj);
+my $third = $mids->[-1];
 $im->done;
 
 test_psgi(sub { $www->call(@_) }, sub {
diff --git a/t/v2writable.t b/t/v2writable.t
index 6cabf0d5..c48f060e 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -79,8 +79,8 @@ if ('ensure git configs are correct') {
         ok($im->add($mime), 'reused mid ok');
         like(join(' ', @warn), qr/reused/, 'warned about reused MID');
         my @mids = $mime->header_obj->header_raw('Message-Id');
-        is($mids[1], '<a-mid@b>', 'original mid not changed');
-        like($mids[0], $sane_mid, 'new MID added');
+        is($mids[0], '<a-mid@b>', 'original mid not changed');
+        like($mids[1], $sane_mid, 'new MID added');
         is(scalar(@mids), 2, 'only one new MID added');
 
         @warn = ();
@@ -95,8 +95,8 @@ if ('ensure git configs are correct') {
         ok($im->add($mime), 'random MID made');
         like(join(' ', @warn), qr/using random/, 'warned about using random');
         @mids = $mime->header_obj->header_raw('Message-Id');
-        is($mids[1], '<a-mid@b>', 'original mid not changed');
-        like($mids[0], $sane_mid, 'new MID added');
+        is($mids[0], '<a-mid@b>', 'original mid not changed');
+        like($mids[1], $sane_mid, 'new MID added');
         is(scalar(@mids), 2, 'only one new MID added');
 
         @warn = ();