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::Hval qw/ascii_html/;
+use PublicInbox::Linkify;
+use PublicInbox::MID qw/mid_clean id_compress mid2path mid_mime/;
require POSIX;
# TODO: make these constants tunable
use constant T_ANCHOR => '#u';
use constant INDENT => ' ';
-*ascii_html = *PublicInbox::Hval::ascii_html;
-
my $enc_utf8 = find_encoding('UTF-8');
# public functions:
'</pre></body></html>';
}
+# /$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;
+ my $mid = $hdr->header_raw('Message-ID');
+ $mid = PublicInbox::Hval->new_msgid($mid);
+ my $t = ascii_html($s);
+ 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';
+
+ "<html><head><title>replying to \"$t\"</title></head><body><pre>" .
+ "replying to message:\n\n" .
+ "Subject: <b>$t</b>\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: <a\nhref=../raw>mbox</a>\n\n" .
+ "* Reply to all the recipients using the <b>--to</b>, <b>--cc</b>,\n" .
+ " and <b>--in-reply-to</b> switches of git-send-email(1):\n\n" .
+ "\tgit send-email \\\n\t\t" .
+ join(" \\ \n\t\t", @$arg ). "\n\n" .
+ qq( <a\nhref="$se_url">$se_url</a>\n\n) .
+ "* If your mail client supports setting the <b>In-Reply-To</b>" .
+ " header\n via mailto: links, try the " .
+ qq(<a\nhref="$link">mailto: link</a>\n) .
+ "\nFor context, the original <a\nhref=../>message</a> or " .
+ qq(<a\nhref="../t/#u">thread</a>) .
+ '</pre><hr /><pre>' . $footer . '</pre></body></html>';
+}
+
sub feed_entry {
my ($class, $mime, $full_pfx) = @_;
sub in_reply_to {
my ($hdr) = @_;
- my $irt = $hdr->header('In-Reply-To');
+ my $irt = $hdr->header_raw('In-Reply-To');
return mid_clean($irt) if (defined $irt);
- my $refs = $hdr->header('References');
+ my $refs = $hdr->header_raw('References');
if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
return $1;
}
my $enc = enc_for($hdr->header("Content-Type"));
my $subj = $hdr->header('Subject');
- my $mid_raw = mid_clean($hdr->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($hdr->header('From'))->raw;
+ my $from = $hdr->header('From');
my @from = Email::Address->parse($from);
$from = $from[0]->name;
- $from = PublicInbox::Hval->new_oneline($from)->as_html;
- $subj = PublicInbox::Hval->new_oneline($subj)->as_html;
my $root_anchor = $state->{root_anchor} || '';
my $path = $root_anchor ? '../../' : '';
my $href = $mid->as_href;
my $irt = in_reply_to($hdr);
my $parent_anchor = $seen->{anchor_for($irt)} if defined $irt;
+ $from = ascii_html($from);
+ $subj = ascii_html($subj);
if ($srch) {
my $t = $ctx->{flat} ? 'T' : 't';
$subj = "<a\nhref=\"${path}$href/$t/#u\">$subj</a>";
my $txt = "${path}$href/raw";
$rv = "\n<a\nhref=\"$mhref\">$more</a> <a\nhref=\"$txt\">raw</a> ";
- $rv .= html_footer($hdr, 0, undef, $ctx);
+ $rv .= html_footer($hdr, 0, undef, $ctx, $mhref);
if (defined $irt) {
unless (defined $parent_anchor) {
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;
-
- # Drop signatures
- $s =~ s/^-- \n.*\z//ms and $m = 1;
- $$more = "<b>More...</b>\n\n$$more" if $m;
- }
+ return if $s eq '';
- # 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);
}
# 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;
"$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);
- "<a\nhref=\"$url\">$url</a>";
- } 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) = @_;
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:
} 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;
- "<a\nid=q${part_nr}_$nr></a>" . linkify_2(\%l, $rv);
+ "<a\nid=q${part_nr}_$nr></a>" . $l->linkify_2($rv);
}
}
}
# 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;
}
$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;
}
my $srch = $ctx->{srch} if $ctx;
my $rv = "";
my @title;
- my $mid = $hdr->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 = $hdr->header($h);
defined($v) && ($v ne '') or next;
- $v = PublicInbox::Hval->new_oneline($v);
+ $v = PublicInbox::Hval->new($v);
if ($h eq 'From') {
my @from = Email::Address->parse($v->raw);
sub thread_inline {
my ($dst, $ctx, $hdr, $upfx) = @_;
my $srch = $ctx->{srch};
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $res = $srch->get_thread($mid);
my $nr = $res->{total};
my $expand = "<a\nhref=\"${upfx}t/#u\">expand</a> " .
$rv .= "<a\nhref=\"../$href/\">$html</a>>\n";
}
- my $refs = $hdr->header('References');
+ my $refs = $hdr->header_raw('References');
if ($refs) {
# avoid redundant URLs wasting bandwidth
my %seen;
$rv;
}
-sub html_footer {
- my ($hdr, $standalone, $full_pfx, $ctx) = @_;
+sub mailto_arg_link {
+ my ($hdr) = @_;
my %cc; # everyone else
my $to; # this is the From address
$to ||= $dst;
}
}
- Email::Address->purge_cache if $standalone;
+ Email::Address->purge_cache;
+ my @arg;
my $subj = $hdr->header('Subject') || '';
$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
- my $mid = $hdr->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 ? " <a\nhref=\"$upfx\">index</a>" : '';
+ my $irt = '';
if ($srch && $standalone) {
$idx .= qq{ / follow: <a\nhref="${tpfx}t.atom">Atom feed</a>\n};
my $p = $ctx->{parent_msg};
my $next = $ctx->{next_msg};
if ($p) {
- $p = PublicInbox::Hval->new_oneline($p);
+ $p = PublicInbox::Hval->new_msgid($p);
$p = $p->as_href;
$irt = "<a\nhref=\"$upfx$p/\">parent</a> ";
} else {
$irt = '';
}
- "$irt<a\nhref=\"" . ascii_html($href) . '">reply</a>' . $idx;
+ $mhref = './' unless defined $mhref;
+ $irt . qq(<a\nhref="${mhref}R/">reply</a>) . $idx;
}
sub linkify_ref_nosrch {
my ($cb, $header, $state) = @_;
$$cb = $$cb->([200, ['Content-Type'=> 'text/html; charset=UTF-8']]);
- my $s = PublicInbox::Hval->new_oneline($header->header('Subject'));
- $s = $s->as_html;
+ my $s = ascii_html($header->header('Subject'));
$$cb->write("<html><head><title>$s</title>".
qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
qq!href="../t.atom"\ntype="application/atom+xml"/>! .
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
}
# 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;
my $dot = $level == 0 ? '' : '` ';
my $cur = $state->{cur};
- my $mid = mid_clean($hdr->header('Message-ID'));
- my $f = $hdr->header('X-PI-From');
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
+ my $f = ascii_html($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;
return unless $node;
if (my $mime = $node->message) {
my $hdr = $mime->header_obj;
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
if ($mid eq $state->{parent_cmp}) {
$state->{parent} = $mid;
}
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}->{$subj};