mid2path: clean MID of angle brackets '<>'

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

diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm
index 02ac7095dd1f39503f75568554b93e510dbad091..1b03fdce72e1333132f0884371754b290ac6ed24 100644 (file)
--- a/lib/PublicInbox/MID.pm
+++ b/lib/PublicInbox/MID.pm
@@ -12,8 +12,9 @@ sub mid_clean {
        my ($mid) = @_;
        defined($mid) or die "no Message-ID";
        # MDA->precheck did more checking for us
-       $mid =~ s/\A\s*<?//;
-       $mid =~ s/>?\s*\z//;
+       if ($mid =~ /<([^>]+)>/) {
+               $mid = $1;
+       }
        $mid;
 }
 
@@ -38,7 +39,7 @@ sub mid2path {
 
        unless (defined $x38) {
                # compatibility with old links (or short Message-IDs :)
-               $mid = sha1_hex($mid);
+               $mid = sha1_hex(mid_clean($mid));
                ($x2, $x38) = ($mid =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/);
        }
        "$x2/$x38";