X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=867ed6fab2e33508ed7f8380251e45025441d95b;hb=3cda6050b7c8f73e7fd86f88efc5cd42d0c13f73;hp=4fc8ffc38da8592657561ea89b55880548f4a982;hpb=0d613bfde45bdf3e28d1a247ffc59e6f805dc64a;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 4fc8ffc3..867ed6fa 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -12,9 +12,8 @@ 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 id_compress mid2path/; -use Digest::SHA qw/sha1_hex/; -my $SALT = rand; +use PublicInbox::Linkify; +use PublicInbox::MID qw/mid_clean id_compress mid2path mid_mime/; require POSIX; # TODO: make these constants tunable @@ -35,14 +34,54 @@ sub msg_html { } else { $footer = ''; } - headers_to_html_header($mime, $full_pfx, $ctx) . + my $hdr = $mime->header_obj; + headers_to_html_header($hdr, $full_pfx, $ctx) . multipart_text_as_html($mime, $full_pfx) . '
' .
-		html_footer($mime, 1, $full_pfx, $ctx) .
+		html_footer($hdr, 1, $full_pfx, $ctx) .
 		$footer .
 		'
'; } +# /$LISTNAME/$MESSAGE_ID/R/ +sub msg_reply { + my ($ctx, $hdr, $footer) = @_; + my $s = $hdr->header('Subject'); + $s = '(no subject)' if (!defined $s) || ($s eq ''); + my $f = $hdr->header('From'); + $f = '' unless defined $f; + $s = PublicInbox::Hval->new_oneline($s); + my $mid = $hdr->header_raw('Message-ID'); + $mid = PublicInbox::Hval->new_msgid($mid); + my $t = $s->as_html; + my $se_url = + 'https://kernel.org/pub/software/scm/git/docs/git-send-email.html'; + + my ($arg, $link) = mailto_arg_link($hdr); + push @$arg, '/path/to/YOUR_REPLY'; + + "replying to \"$t\"
" .
+	"replying to message:\n\n" .
+	"Subject: $t\n" .
+	"From: ". ascii_html($f) .
+	"\nDate: " .  ascii_html($hdr->header('Date')) .
+	"\nMessage-ID: <" . $mid->as_html . ">\n\n" .
+	"There are multiple ways to reply:\n\n" .
+	"* Save the following mbox file, import it into your mail client,\n" .
+	"  and reply-to-all from there: mbox\n\n" .
+	"* Reply to all the recipients using the --to, --cc,\n" .
+	"  and --in-reply-to switches of git-send-email(1):\n\n" .
+	"\tgit send-email \\\n\t\t" .
+	join(" \\ \n\t\t", @$arg ). "\n\n" .
+	qq(  $se_url\n\n) .
+	"* If your mail client supports setting the In-Reply-To" .
+	" header\n  via mailto: links, try the " .
+	qq(mailto: link\n) .
+	"\nFor context, the original message or " .
+	qq(thread) .
+	'
' . $footer .  '
'; +} + sub feed_entry { my ($class, $mime, $full_pfx) = @_; @@ -52,12 +91,12 @@ sub feed_entry { } sub in_reply_to { - my ($header_obj) = @_; - my $irt = $header_obj->header('In-Reply-To'); + my ($hdr) = @_; + my $irt = $hdr->header_raw('In-Reply-To'); return mid_clean($irt) if (defined $irt); - my $refs = $header_obj->header('References'); + my $refs = $hdr->header_raw('References'); if ($refs && $refs =~ /<([^>]+)>\s*\z/s) { return $1; } @@ -72,17 +111,17 @@ sub index_entry { my $srch = $ctx->{srch}; my ($prev, $next) = ($midx - 1, $midx + 1); my $part_nr = 0; - my $enc = enc_for($mime->header("Content-Type")); - my $subj = $mime->header('Subject'); - my $header_obj = $mime->header_obj; + my $hdr = $mime->header_obj; + my $enc = enc_for($hdr->header("Content-Type")); + my $subj = $hdr->header('Subject'); - my $mid_raw = mid_clean($header_obj->header('Message-ID')); + my $mid_raw = mid_clean(mid_mime($mime)); my $id = anchor_for($mid_raw); my $seen = $state->{seen}; $seen->{$id} = "#$id"; # save the anchor for children, later my $mid = PublicInbox::Hval->new_msgid($mid_raw); - my $from = PublicInbox::Hval->new_oneline($mime->header('From'))->raw; + my $from = PublicInbox::Hval->new_oneline($hdr->header('From'))->raw; my @from = Email::Address->parse($from); $from = $from[0]->name; @@ -91,7 +130,7 @@ sub index_entry { my $root_anchor = $state->{root_anchor} || ''; my $path = $root_anchor ? '../../' : ''; my $href = $mid->as_href; - my $irt = in_reply_to($header_obj); + my $irt = in_reply_to($hdr); my $parent_anchor = $seen->{anchor_for($irt)} if defined $irt; if ($srch) { @@ -102,7 +141,7 @@ sub index_entry { $subj = "$subj"; } - my $ts = _msg_date($mime); + my $ts = _msg_date($hdr); my $rv = ""; $rv .= "$subj\n"; $rv .= "- $from @ $ts UTC - "; @@ -130,7 +169,7 @@ sub index_entry { my $txt = "${path}$href/raw"; $rv = "\n$more raw "; - $rv .= html_footer($mime, 0, undef, $ctx); + $rv .= html_footer($hdr, 0, undef, $ctx, $mhref); if (defined $irt) { unless (defined $parent_anchor) { @@ -214,26 +253,10 @@ sub index_walk { my ($fh, $part, $enc, $part_nr, $fhref, $more) = @_; my $s = add_text_body($enc, $part, $part_nr, $fhref); - if ($more) { - my $m = 0; - # drop the remainder of git patches, they're usually better - # to review when the full message is viewed - $s =~ s!^---+\n.*\z!!ms and $m = 1; + return if $s eq ''; - # Drop signatures - $s =~ s/^-- \n.*\z//ms and $m = 1; - $$more = "More...\n\n$$more" if $m; - } - - # kill any leading or trailing whitespace lines - $s =~ s/^\s*$//sgm; - $s =~ s/\s+\z//s; + $s .= "\n"; # ensure there's a trailing newline - if ($s ne '') { - # kill per-line trailing whitespace - $s =~ s/[ \t]+$//sgm; - $s .= "\n" unless $s =~ /\n\z/s; - } $fh->write($s); } @@ -260,7 +283,9 @@ sub multipart_text_as_html { # scan through all parts, looking for displayable text $mime->walk_parts(sub { my ($part) = @_; - $rv .= add_text_body($enc, $part, \$part_nr, $full_pfx, 1); + $part = add_text_body($enc, $part, \$part_nr, $full_pfx, 1); + $rv .= $part; + $rv .= "\n" if $part ne ''; }); $mime->body_set(''); $rv; @@ -276,52 +301,20 @@ sub add_filename_line { "$pad " . ascii_html($fn) . " $pad\n"; } -my $LINK_RE = qr!\b((?:ftp|https?|nntp):// - [\@:\w\.-]+/ - ?[\@\w\+\&\?\.\%\;/#=-]*)!x; - -sub linkify_1 { - my ($link_map, $s) = @_; - $s =~ s!$LINK_RE! - my $url = $1; - # salt this, as this could be exploited to show - # links in the HTML which don't show up in the raw mail. - my $key = sha1_hex($url . $SALT); - $link_map->{$key} = $url; - 'PI-LINK-'. $key; - !ge; - $s; -} - -sub linkify_2 { - my ($link_map, $s) = @_; - - # Added "PI-LINK-" prefix to avoid false-positives on git commits - $s =~ s!\bPI-LINK-([a-f0-9]{40})\b! - my $key = $1; - my $url = $link_map->{$key}; - if (defined $url) { - $url = ascii_html($url); - "$url"; - } else { - # false positive or somebody tried to mess with us - $key; - } - !ge; - $s; -} - sub flush_quote { my ($quot, $n, $part_nr, $full_pfx, $final, $do_anchor) = @_; + # n.b.: do not use
since it screws up alignment + # w.r.t. unquoted text. Repliers may rely on pre-formatted + # alignment to point out a certain word in quoted text. if ($full_pfx) { if (!$final && scalar(@$quot) <= MAX_INLINE_QUOTED) { # show quote inline - my %l; - my $rv = join('', map { linkify_1(\%l, $_) } @$quot); + my $l = PublicInbox::Linkify->new; + my $rv = join('', map { $l->linkify_1($_) } @$quot); @$quot = (); $rv = ascii_html($rv); - return linkify_2(\%l, $rv); + return $l->linkify_2($rv); } # show a short snippet of quoted text and link to full version: @@ -346,13 +339,13 @@ sub flush_quote { } else { # show everything in the full version with anchor from # short version (see above) - my %l; - my $rv .= join('', map { linkify_1(\%l, $_) } @$quot); + my $l = PublicInbox::Linkify->new; + my $rv .= join('', map { $l->linkify_1($_) } @$quot); @$quot = (); $rv = ascii_html($rv); - return linkify_2(\%l, $rv) unless $do_anchor; + return $l->linkify_2($rv) unless $do_anchor; my $nr = ++$$n; - "" . linkify_2(\%l, $rv); + "" . $l->linkify_2($rv); } } @@ -391,10 +384,10 @@ sub add_text_body { } # regular line, OK - my %l; - $cur = linkify_1(\%l, $cur); + my $l = PublicInbox::Linkify->new; + $cur = $l->linkify_1($cur); $cur = ascii_html($cur); - $s .= linkify_2(\%l, $cur); + $s .= $l->linkify_2($cur); } else { push @quot, $cur; } @@ -403,21 +396,23 @@ sub add_text_body { $s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1, $do_anchor); } - $s .= "\n" unless $s =~ /\n\z/s; ++$$part_nr; + + $s =~ s/[ \t]+$//sgm; # kill per-line trailing whitespace + $s =~ s/\A\n+//s; # kill leading blank lines + $s =~ s/\s+\z//s; # kill all trailing spaces (final "\n" added if ne '') $s; } sub headers_to_html_header { - my ($mime, $full_pfx, $ctx) = @_; + my ($hdr, $full_pfx, $ctx) = @_; my $srch = $ctx->{srch} if $ctx; my $rv = ""; my @title; - my $header_obj = $mime->header_obj; - my $mid = $header_obj->header('Message-ID'); + my $mid = $hdr->header_raw('Message-ID'); $mid = PublicInbox::Hval->new_msgid($mid); foreach my $h (qw(From To Cc Subject Date)) { - my $v = $header_obj->header($h); + my $v = $hdr->header($h); defined($v) && ($v ne '') or next; $v = PublicInbox::Hval->new_oneline($v); @@ -440,12 +435,12 @@ sub headers_to_html_header { $rv .= "(raw)\n"; my $atom; if ($srch) { - thread_inline(\$rv, $ctx, $mime, $upfx); + thread_inline(\$rv, $ctx, $hdr, $upfx); $atom = qq{!; } else { - $rv .= _parent_headers_nosrch($header_obj); + $rv .= _parent_headers_nosrch($hdr); $atom = ''; } $rv .= "\n"; @@ -455,27 +450,35 @@ sub headers_to_html_header { } sub thread_inline { - my ($dst, $ctx, $cur, $upfx) = @_; + my ($dst, $ctx, $hdr, $upfx) = @_; my $srch = $ctx->{srch}; - my $mid = mid_clean($cur->header('Message-ID')); + my $mid = mid_clean($hdr->header_raw('Message-ID')); my $res = $srch->get_thread($mid); my $nr = $res->{total}; my $expand = "expand " . "/ mbox.gz"; $$dst .= 'Thread: '; - my $parent = in_reply_to($cur); + my $parent = in_reply_to($hdr); if ($nr <= 1) { - $$dst .= "[no followups, yet] ($expand)\n"; + if (defined $parent) { + $$dst .= "($expand)\n "; + $$dst .= ghost_parent("$upfx../", $parent) . "\n"; + } else { + $$dst .= "[no followups, yet] ($expand)\n"; + } $ctx->{next_msg} = undef; $ctx->{parent_msg} = $parent; return; } - $$dst .= "~$nr messages (skip / " . - $expand . ")\n"; + $$dst .= "~$nr messages ($expand"; + if ($nr > MAX_INLINE_QUOTED) { + $$dst .= qq! / [scroll down]!; + } + $$dst .= ")\n"; - my $subj = $srch->subject_path($cur->header('Subject')); + my $subj = $srch->subject_path($hdr->header('Subject')); my $state = { seen => { $subj => 1 }, srch => $srch, @@ -494,10 +497,10 @@ sub thread_inline { } sub _parent_headers_nosrch { - my ($header_obj) = @_; + my ($hdr) = @_; my $rv = ''; - my $irt = in_reply_to($header_obj); + my $irt = in_reply_to($hdr); if (defined $irt) { my $v = PublicInbox::Hval->new_msgid($irt, 1); my $html = $v->as_html; @@ -506,7 +509,7 @@ sub _parent_headers_nosrch { $rv .= "$html>\n"; } - my $refs = $header_obj->header('References'); + my $refs = $hdr->header_raw('References'); if ($refs) { # avoid redundant URLs wasting bandwidth my %seen; @@ -526,13 +529,13 @@ sub _parent_headers_nosrch { $rv; } -sub html_footer { - my ($mime, $standalone, $full_pfx, $ctx) = @_; +sub mailto_arg_link { + my ($hdr) = @_; my %cc; # everyone else my $to; # this is the From address foreach my $h (qw(From To Cc)) { - my $v = $mime->header($h); + my $v = $hdr->header($h); defined($v) && ($v ne '') or next; my @addrs = Email::Address->parse($v); foreach my $recip (@addrs) { @@ -542,26 +545,38 @@ sub html_footer { $to ||= $dst; } } - Email::Address->purge_cache if $standalone; + Email::Address->purge_cache; + my @arg; - my $subj = $mime->header('Subject') || ''; + my $subj = $hdr->header('Subject') || ''; $subj = "Re: $subj" unless $subj =~ /\bRe:/i; - my $mid = $mime->header('Message-ID'); + my $mid = $hdr->header_raw('Message-ID'); + push @arg, "--in-reply-to='" . ascii_html($mid) . "'"; my $irt = uri_escape_utf8($mid); delete $cc{$to}; + push @arg, '--to=' . ascii_html($to); $to = uri_escape_utf8($to); $subj = uri_escape_utf8($subj); - - my $cc = uri_escape_utf8(join(',', sort values %cc)); + my $cc = join(',', sort values %cc); + push @arg, '--cc=' . ascii_html($cc); + $cc = uri_escape_utf8($cc); my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj"; $href =~ s/%20/+/g; + (\@arg, $href); +} + +sub html_footer { + my ($mime, $standalone, $full_pfx, $ctx, $mhref) = @_; + my $srch = $ctx->{srch} if $ctx; my $upfx = $full_pfx ? '../' : '../../'; + my $tpfx = $full_pfx ? '' : '../'; my $idx = $standalone ? " index" : ''; + my $irt = ''; if ($srch && $standalone) { - $idx .= qq{ / follow: Atom feed\n}; + $idx .= qq{ / follow: Atom feed\n}; } if ($idx && $srch) { my $p = $ctx->{parent_msg}; @@ -579,7 +594,6 @@ sub html_footer { $irt .= ' ' x length('next '); } if ($p || $next) { - my $tpfx = $full_pfx ? '' : '../'; $irt .= "thread "; } else { $irt .= ' ' x length('thread '); @@ -588,7 +602,8 @@ sub html_footer { $irt = ''; } - "$irtreply' . $idx; + $mhref = './' unless defined $mhref; + $irt . qq(reply) . $idx; } sub linkify_ref_nosrch { @@ -622,7 +637,7 @@ sub thread_html_head { sub pre_anchor_entry { my ($seen, $mime) = @_; - my $id = anchor_for($mime->header('Message-ID')); + my $id = anchor_for(mid_mime($mime)); $seen->{$id} = "#$id"; # save the anchor for children, later } @@ -675,7 +690,7 @@ sub __thread_entry { # lazy load the full message from mini_mime: $mime = eval { - my $path = mid2path(mid_clean($mime->header('Message-ID'))); + my $path = mid2path(mid_clean(mid_mime($mime))); Email::MIME->new($git->cat_file('HEAD:'.$path)); } or return; @@ -729,8 +744,8 @@ sub load_results { } sub msg_timestamp { - my ($mime) = @_; - my $ts = eval { str2time($mime->header('Date')) }; + my ($hdr) = @_; + my $ts = eval { str2time($hdr->header('Date')) }; defined($ts) ? $ts : 0; } @@ -753,23 +768,22 @@ sub missing_thread { } sub _msg_date { - my ($mime) = @_; - my $ts = $mime->header('X-PI-TS') || msg_timestamp($mime); + my ($hdr) = @_; + my $ts = $hdr->header('X-PI-TS') || msg_timestamp($hdr); fmt_ts($ts); } sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) } sub _inline_header { - my ($dst, $state, $upfx, $mime, $level) = @_; + my ($dst, $state, $upfx, $hdr, $level) = @_; my $dot = $level == 0 ? '' : '` '; my $cur = $state->{cur}; - my $mid = mid_clean($mime->header('Message-ID')); - my $f = $mime->header('X-PI-From'); - my $d = _msg_date($mime); - $f = PublicInbox::Hval->new($f)->as_html; - $d = PublicInbox::Hval->new($d)->as_html; + my $mid = mid_clean($hdr->header_raw('Message-ID')); + my $f = $hdr->header('X-PI-From'); + my $d = _msg_date($hdr); + $f = PublicInbox::Hval->new_oneline($f)->as_html; my $pfx = ' ' . $d . ' ' . indent_for($level); my $attr = $f; $state->{first_level} ||= $level; @@ -796,7 +810,7 @@ sub _inline_header { # Subject is never undef, this mail was loaded from # our Xapian which would've resulted in '' if it were # really missing (and Filter rejects empty subjects) - my $s = $mime->header('Subject'); + my $s = $hdr->header('Subject'); my $h = $state->{srch}->subject_path($s); if ($state->{seen}->{$h}) { $s = undef; @@ -818,11 +832,12 @@ sub inline_dump { my ($dst, $state, $upfx, $node, $level) = @_; return unless $node; if (my $mime = $node->message) { - my $mid = mid_clean($mime->header('Message-ID')); + my $hdr = $mime->header_obj; + my $mid = mid_clean($hdr->header_obj('Message-ID')); if ($mid eq $state->{parent_cmp}) { $state->{parent} = $mid; } - _inline_header($dst, $state, $upfx, $mime, $level); + _inline_header($dst, $state, $upfx, $hdr, $level); } else { my $dot = $level == 0 ? '' : '` '; my $pfx = (' ' x length(' 1970-01-01 13:37 ')). @@ -857,27 +872,21 @@ sub add_topic { if (my $x = $node->message) { $x = $x->header_obj; - my ($topic, $subj); + my $subj; $subj = $x->header('Subject'); $subj = $state->{srch}->subject_normalized($subj); - $topic = $subj; - - # kill "[PATCH v2]" etc. for summarization - unless ($level == 0) { - $topic =~ s/\A\s*\[[^\]]+\]\s*//g; - } - if (++$state->{subjs}->{$topic} == 1) { - push @{$state->{order}}, [ $level, $subj, $topic ]; + if (++$state->{subjs}->{$subj} == 1) { + push @{$state->{order}}, [ $level, $subj ]; } - my $mid = mid_clean($x->header('Message-ID')); + my $mid = mid_clean($x->header_raw('Message-ID')); my $ts = $x->header('X-PI-TS'); - my $exist = $state->{latest}->{$topic}; + my $exist = $state->{latest}->{$subj}; if (!$exist || $exist->[1] < $ts) { - $state->{latest}->{$topic} = [ $mid, $ts ]; + $state->{latest}->{$subj} = [ $mid, $ts ]; } } else { # ghost message, do not bump level @@ -899,10 +908,10 @@ sub dump_topics { my $prev = 0; my $prev_attr = ''; while (defined(my $info = shift @$order)) { - my ($level, $subj, $topic) = @$info; - my $n = delete $subjs->{$topic}; - my ($mid, $ts) = @{delete $latest->{$topic}}; - $mid = PublicInbox::Hval->new($mid)->as_href; + my ($level, $subj) = @$info; + my $n = delete $subjs->{$subj}; + my ($mid, $ts) = @{delete $latest->{$subj}}; + $mid = PublicInbox::Hval->new_msgid($mid)->as_href; $subj = PublicInbox::Hval->new($subj)->as_html; $pfx = indent_for($level); my $nl = $level == $prev ? "\n" : '';