feed: reuse view class to display message

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 125fcd622bc15cfe389fcb6898cbb0f49c5b7961..4ac28346c81ef52c8971f0f263466a9d56918f46 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -3,23 +3,31 @@
 package PublicInbox::View;
 use strict;
 use warnings;
-use CGI qw/escapeHTML escape/;
+use URI::Escape qw/uri_escape/;
+use CGI qw/escapeHTML/;
 use Encode qw/decode encode/;
 use Encode::MIME::Header;
 
 # only one public function:
 sub as_html {
-       my ($class, $mime) = @_;
+       my ($class, $mime, $full_pfx) = @_;
 
        headers_to_html_header($mime) .
-               multipart_text_as_html($mime) .
+               multipart_text_as_html($mime, $full_pfx) .
                "</pre>\n";
 }
 
+sub as_feed_entry {
+       my ($class, $mime, $full_pfx) = @_;
+
+       "<pre>" . multipart_text_as_html($mime, $full_pfx) . "</pre>";
+}
+
+
 # only private functions below.
 
 sub multipart_text_as_html {
-       my ($mime) = @_;
+       my ($mime, $full_pfx) = @_;
        my $rv = "";
        my $part_nr = 0;
 
@@ -28,23 +36,20 @@ sub multipart_text_as_html {
                my ($part) = @_;
                return if $part->subparts; # walk_parts already recurses
 
-               my $part_type = $part->content_type;
-               if ($part_type =~ m!\btext/[a-z0-9\+\._-]+\b!i) {
-                       my $fn = $part->filename;
+               my $fn = $part->filename;
 
-                       if ($part_nr > 0) {
-                               defined($fn) or $fn = "part #$part_nr";
-                               $rv .= add_filename_line($fn);
-                       }
+               if ($part_nr > 0) {
+                       defined($fn) or $fn = "part #" . ($part_nr + 1);
+                       $rv .= add_filename_line($fn);
+               }
 
-                       # n.b. $part->body should already be decoded if text
-                       $rv .= escapeHTML($part->body);
-                       $rv .= "\n" unless $rv =~ /\n\z/s;
+               if (defined $full_pfx) {
+                       $rv .= add_text_body_short($part, $part_nr,
+                                               $full_pfx);
                } else {
-                       $rv .= "-- part #$part_nr ";
-                       $rv .= escapeHTML($part_type);
-                       $rv .= " skipped\n";
+                       $rv .= add_text_body_full($part, $part_nr);
                }
+               $rv .= "\n" unless $rv =~ /\n\z/s;
                ++$part_nr;
        });
        $rv;
@@ -60,6 +65,58 @@ sub add_filename_line {
        "$pad " . escapeHTML($fn) . " $pad\n";
 }
 
+sub add_text_body_short {
+       my ($part, $part_nr, $full_pfx) = @_;
+       my $n = 0;
+       my $s = escapeHTML($part->body);
+       $s =~ s!^((?:(?:&gt;[^\n]+)\n)+)!
+               my $cur = $1;
+               my @lines = split(/\n/, $cur);
+               if (@lines > 1) {
+                       # show a short snippet of quoted text
+                       $cur = join(' ', @lines);
+                       $cur =~ s/&gt; ?//g;
+
+                       my @sum = split(/\s+/, $cur);
+                       $cur = '';
+                       do {
+                               $cur .= shift(@sum) . ' ';
+                       } while (@sum && length($cur) < 68);
+                       $cur=~ s/ \z/ .../;
+                       "&gt; &lt;<a href=${full_pfx}#q${part_nr}_" . $n++ .
+                               ">$cur<\/a>&gt;";
+               } else {
+                       $cur;
+               }
+       !emg;
+       $s;
+}
+
+sub add_text_body_full {
+       my ($part, $part_nr) = @_;
+       my $n = 0;
+       my $s = escapeHTML($part->body);
+       $s =~ s!^((?:(?:&gt;[^\n]+)\n)+)!
+               my $cur = $1;
+               my @lines = split(/\n/, $cur);
+               if (@lines > 1) {
+                       "<a name=q${part_nr}_" . $n++ . ">$cur</a>";
+               } else {
+                       $cur;
+               }
+       !emg;
+       $s;
+}
+
+sub trim_message_id {
+       my ($mid) = @_;
+       $mid =~ tr/<>//d;
+       my $html = escapeHTML($mid);
+       my $href = escapeHTML(uri_escape($mid));
+
+       ($html, $href);
+}
+
 sub headers_to_html_header {
        my ($simple) = @_;
 
@@ -79,15 +136,18 @@ sub headers_to_html_header {
                }
        }
 
-       foreach my $h (qw(Message-ID In-Reply-To)) {
-               my $v = $simple->header($h);
-               defined $v or next;
-               $v =~ tr/<>//d;
-               my $html = escapeHTML($v);
-               my $href = escapeHTML(escape($v));
-               $rv .= "$h: <a href=\"$href\">$html</a>\n";
+       my $mid = $simple->header('Message-ID');
+       if (defined $mid) {
+               my ($html, $href) = trim_message_id($mid);
+               $rv .= "Message-ID: <a href=$href.html>$html</a> ";
+               $rv .= "(<a href=$href.txt>raw message</a>)\n";
        }
 
+       my $irp = $simple->header('In-Reply-To');
+       if (defined $irp) {
+               my ($html, $href) = trim_message_id($irp);
+               $rv .= "In-Reply-To: <a href=$href.html>$html</a>\n";
+       }
        $rv .= "\n";
 
        return ("<html><head><title>".