v2: generate better Message-IDs for duplicates

While hunting duplicates, I noticed a leading '-' in some
Message-IDs as a result of RFC4648 encoding.  While '-' seems
allowed by RFC5322 and URL-friendly (RFC4648), they are uncommon
and make using Message-IDs as arguments for command-line tools
more difficult.  So prefix them with a datestamp to at least
give readers some sense of the age.  And shorten the "localhost"
hostname to "z" to save space.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 66f8a8a3..0dcdedae 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -174,19 +174,19 @@ sub num_for_harder {
 
         my $hdr = $mime->header_obj;
         my $dig = content_digest($mime);
-        $$mid0 = PublicInbox::Import::digest2mid($dig);
+        $$mid0 = PublicInbox::Import::digest2mid($dig, $hdr);
         my $num = $self->{mm}->mid_insert($$mid0);
         unless (defined $num) {
                 # it's hard to spoof the last Received: header
                 my @recvd = $hdr->header_raw('Received');
                 $dig->add("Received: $_") foreach (@recvd);
-                $$mid0 = PublicInbox::Import::digest2mid($dig);
+                $$mid0 = PublicInbox::Import::digest2mid($dig, $hdr);
                 $num = $self->{mm}->mid_insert($$mid0);
 
                 # fall back to a random Message-ID and give up determinism:
                 until (defined($num)) {
                         $dig->add(rand);
-                        $$mid0 = PublicInbox::Import::digest2mid($dig);
+                        $$mid0 = PublicInbox::Import::digest2mid($dig, $hdr);
                         warn "using random Message-ID <$$mid0> as fallback\n";
                         $num = $self->{mm}->mid_insert($$mid0);
                 }