} 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) .
'</pre><hr /><pre>' .
- html_footer($mime, 1, $full_pfx, $ctx) .
+ html_footer($hdr, 1, $full_pfx, $ctx) .
$footer .
'</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;
+ $s = PublicInbox::Hval->new_oneline($s);
+ my $mid = $hdr->header('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';
+
+ "<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 ($header_obj) = @_;
- my $irt = $header_obj->header('In-Reply-To');
+ my ($hdr) = @_;
+ my $irt = $hdr->header('In-Reply-To');
return mid_clean($irt) if (defined $irt);
- my $refs = $header_obj->header('References');
+ my $refs = $hdr->header('References');
if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
return $1;
}
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($hdr->header('Message-ID'));
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;
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) {
$subj = "<u\nid=u>$subj</u>";
}
- my $ts = _msg_date($mime);
+ my $ts = _msg_date($hdr);
my $rv = "<pre\nid=s$midx>";
$rv .= "<b\nid=$id>$subj</b>\n";
$rv .= "- $from @ $ts UTC - ";
my $txt = "${path}$href/raw";
$rv = "\n<a\nhref=\"$mhref\">$more</a> <a\nhref=\"$txt\">raw</a> ";
- $rv .= html_footer($mime, 0, undef, $ctx);
+ $rv .= html_footer($hdr, 0, undef, $ctx, $mhref);
if (defined $irt) {
unless (defined $parent_anchor) {
}
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('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);
$rv .= "(<a\nhref=\"${upfx}raw\">raw</a>)\n";
my $atom;
if ($srch) {
- thread_inline(\$rv, $ctx, $mime, $upfx);
+ thread_inline(\$rv, $ctx, $hdr, $upfx);
$atom = qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
qq!href="${upfx}t.atom"\ntype="application/atom+xml"/>!;
} else {
- $rv .= _parent_headers_nosrch($header_obj);
+ $rv .= _parent_headers_nosrch($hdr);
$atom = '';
}
$rv .= "\n";
}
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('Message-ID'));
my $res = $srch->get_thread($mid);
my $nr = $res->{total};
my $expand = "<a\nhref=\"${upfx}t/#u\">expand</a> " .
"/ <a\nhref=\"${upfx}t.mbox.gz\">mbox.gz</a>";
$$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 (<a\nhref=\"#b\">skip</a> / " .
- $expand . ")\n";
+ $$dst .= "~$nr messages ($expand";
+ if ($nr > MAX_INLINE_QUOTED) {
+ $$dst .= qq! / <a\nhref="#b">[scroll down]</a>!;
+ }
+ $$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,
}
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;
$rv .= "<a\nhref=\"../$href/\">$html</a>>\n";
}
- my $refs = $header_obj->header('References');
+ my $refs = $hdr->header('References');
if ($refs) {
# avoid redundant URLs wasting bandwidth
my %seen;
$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) {
$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('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};
$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 {
}
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;
}
}
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);
+ my $mid = mid_clean($hdr->header('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;
# 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;
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('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 ')).
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 $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
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}};
+ 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);