truncate Message-IDs and References consistently

[public-inbox.git] / lib / PublicInbox / MID.pm

diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm
index 422902f53bed43ab31fff3d93e817adf3d94f441..c82e84013ec0d68730423ab4b691074c5b690dc5 100644 (file)
--- a/lib/PublicInbox/MID.pm
+++ b/lib/PublicInbox/MID.pm
@@ -50,7 +50,8 @@ sub mid2path {
        "$x2/$x38";
 }
 
-sub mid_mime ($) { $_[0]->header_obj->header_raw('Message-ID') }
+# Only for v1 code paths:
+sub mid_mime ($) { mids($_[0]->header_obj)->[0] }
 
 sub mids ($) {
        my ($hdr) = @_;
@@ -64,12 +65,6 @@ sub mids ($) {
                        push(@mids, $v);
                }
        }
-       foreach my $i (0..$#mids) {
-               next if length($mids[$i]) <= MAX_MID_SIZE;
-               warn "Message-ID: <$mids[$i]> too long, truncating\n";
-               $mids[$i] = substr($mids[$i], 0, MAX_MID_SIZE);
-       }
-
        uniq_mids(\@mids);
 }
 
@@ -91,10 +86,14 @@ sub uniq_mids ($) {
        my ($mids) = @_;
        my @ret;
        my %seen;
-       foreach (@$mids) {
-               next if $seen{$_};
-               push @ret, $_;
-               $seen{$_} = 1;
+       foreach my $mid (@$mids) {
+               if (length($mid) > MAX_MID_SIZE) {
+                       warn "Message-ID: <$mid> too long, truncating\n";
+                       $mid = substr($mid, 0, MAX_MID_SIZE);
+               }
+               next if $seen{$mid};
+               push @ret, $mid;
+               $seen{$mid} = 1;
        }
        \@ret;
 }