extract redundant Message-ID handling code

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index bc4c7ac70cfd90831c625ba8fb1189ab6bdb5614..c2dbb7ed42fd9d1048fd3491e6c2fbf705e4447f 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -3,11 +3,12 @@
 package PublicInbox::View;
 use strict;
 use warnings;
-use PublicInbox::Hval;
 use URI::Escape qw/uri_escape_utf8/;
 use Encode qw/find_encoding/;
 use Encode::MIME::Header;
 use Email::MIME::ContentType qw/parse_content_type/;
+use PublicInbox::Hval;
+use PublicInbox::MID qw/mid_clean mid_compressed/;
 require POSIX;
 
 # TODO: make these constants tunable
@@ -18,7 +19,6 @@ use constant PRE_WRAP => "<pre\nstyle=\"white-space:pre-wrap\">";
 *ascii_html = *PublicInbox::Hval::ascii_html;
 
 my $enc_utf8 = find_encoding('UTF-8');
-my $enc_mime = find_encoding('MIME-Header');
 
 # public functions:
 sub msg_html {
@@ -68,14 +68,7 @@ sub index_entry {
        my $pfx = ('  ' x $level);
 
        my $ts = $mime->header('X-PI-Date');
-       my $time = '%H:%M UTC';
-       my $fmt = $time;
-       if ($now > ($ts + (365 * 24 * 60 * 60))) {
-               # doesn't have to be exactly 1 year
-               $fmt = '%Y/%m/%d ' . $time;
-       } elsif ($now > ($ts + (24 * 60 * 60))) {
-               $fmt = '%m/%d ' . $time;
-       }
+       my $fmt = '%Y-%m-%d %H:%M UTC';
        $ts = POSIX::strftime($fmt, gmtime($ts));
 
        $rv .= "$pfx<b\nid=\"$id\">$subj</b>\n$pfx";
@@ -105,7 +98,7 @@ sub index_entry {
                # account for filter bugs...
                return if defined $ct && $ct =~ m!\btext/[xh]+tml\b!i;
 
-               my $enc = enc_for($ct) || $enc_msg || $enc_utf8;
+               my $enc = enc_for($ct, $enc_msg);
 
                if ($part_nr > 0) {
                        my $fn = $part->filename;
@@ -157,8 +150,9 @@ sub index_entry {
 # only private functions below.
 
 sub enc_for {
-       my ($ct) = @_;
-       defined $ct or return $enc_utf8;
+       my ($ct, $default) = @_;
+       $default ||= $enc_utf8;
+       defined $ct or return $default;
        my $ct_parsed = parse_content_type($ct);
        if ($ct_parsed) {
                if (my $charset = $ct_parsed->{attributes}->{charset}) {
@@ -166,7 +160,7 @@ sub enc_for {
                        return $enc if $enc;
                }
        }
-       $enc_utf8;
+       $default;
 }
 
 sub multipart_text_as_html {
@@ -184,7 +178,7 @@ sub multipart_text_as_html {
                # account for filter bugs...
                return if defined $ct && $ct =~ m!\btext/[xh]+tml\b!i;
 
-               my $enc = enc_for($ct) || $enc_msg || $enc_utf8;
+               my $enc = enc_for($ct, $enc_msg);
 
                if ($part_nr > 0) {
                        my $fn = $part->filename;
@@ -356,7 +350,7 @@ sub html_footer {
        $to = uri_escape_utf8($to);
        $subj = uri_escape_utf8($subj);
 
-       my $cc = uri_escape_utf8(join(',', values %cc));
+       my $cc = uri_escape_utf8(join(',', sort values %cc));
        my $href = "mailto:$to?In-Reply-To=$irp&Cc=${cc}&Subject=$subj";
 
        my $idx = $standalone ? " <a\nhref=\"../\">index</a>" : '';
@@ -373,12 +367,9 @@ sub linkify_refs {
        } @_);
 }
 
-require Digest::SHA;
 sub anchor_for {
        my ($msgid) = @_;
-       $msgid =~ s/\A\s*<?//;
-       $msgid =~ s/>?\s*\z//;
-       'm' . Digest::SHA::sha1_hex($msgid);
+       'm' . mid_compressed(mid_clean($msgid));
 }
 
 1;