use constant TCHILD => '` ';
sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
-# public functions:
+# public functions: (unstable)
+# TODO: stream this, since threading is expensive but also oh-so-important
sub msg_html {
my ($ctx, $mime, $footer) = @_;
$footer = defined($footer) ? "\n$footer" : '';
headers_to_html_header($hdr, $ctx) .
multipart_text_as_html($mime, '') .
'</pre><hr /><pre>' .
- html_footer($hdr, 1, $ctx, 'R/') .
- $footer .
- '</pre></body></html>';
+ html_footer($hdr, 1, $ctx) .
+ '</pre>' . msg_reply($ctx, $hdr) .
+ '<hr /><pre>'. $footer . '</pre></body></html>';
}
-# /$INBOX/$MESSAGE_ID/R/
+# /$INBOX/$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 ($ctx, $hdr) = @_;
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" .
+ "<hr /><pre\nid=R>".
+ "You may reply publically to <a\nhref=#t>this message</a> via email\n".
+ "using any one of the following methods:\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" .
+ " 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" .
"* 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>';
+ '</pre>';
}
sub in_reply_to {
# scan through all parts, looking for displayable text
msg_iter($mime, sub { index_walk($fh, $mhref, $_[0]) });
- $rv = "\n" . html_footer($hdr, 0, $ctx, "$path$href/R/");
+ $rv = "\n" . html_footer($hdr, 0, $ctx, "$path$href/#R");
if (defined $irt) {
unless (defined $parent_anchor) {
} else {
$irt = '';
}
-
- $irt . qq(<a\nhref="$rhref">reply</a>) . $idx;
+ $rhref ||= '#R';
+ $irt .= qq(<a\nhref="$rhref">reply</a>);
+ $irt .= $idx;
}
sub linkify_ref_nosrch {
use PublicInbox::GitHTTPBackend;
our $INBOX_RE = qr!\A/([\w\.\-]+)!;
our $MID_RE = qr!([^/]+)!;
-our $END_RE = qr!(T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
+our $END_RE = qr!(T/|t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
sub new {
invalid_inbox_mid($self, $ctx, $1, $2) ||
get_attach($ctx, $idx, $fn);
# in case people leave off the trailing slash:
- } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/(T|t|R)\z!o) {
+ } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/(T|t)\z!o) {
my ($inbox, $mid, $suffix) = ($1, $2, $3);
$suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/';
r301($ctx, $inbox, $mid, $suffix);
+ } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/R/?\z!o) {
+ my ($inbox, $mid) = ($1, $2);
+ r301($ctx, $inbox, $mid, '#R');
+
} elsif ($path_info =~ m!$INBOX_RE/$MID_RE/f/?\z!o) {
r301($ctx, $1, $2);
[ PublicInbox::View::msg_html($ctx, $mime, $foot) ] ];
}
-# /$INBOX/$MESSAGE_ID/R/ -> HTML content (fullquotes)
-sub get_reply_html {
- my ($ctx) = @_;
- my $x = mid2blob($ctx) or return r404($ctx);
-
- require PublicInbox::View;
- my $foot = footer($ctx);
- require Email::MIME;
- my $hdr = Email::MIME->new($x)->header_obj;
- [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
- [ PublicInbox::View::msg_reply($ctx, $hdr, $foot)] ];
-}
-
# /$INBOX/$MESSAGE_ID/t/
sub get_thread {
my ($ctx, $flat) = @_;
# legacy, but no redirect for compatibility:
'f/' eq $e and return get_mid_html($ctx);
-
- 'R/' eq $e and return get_reply_html($ctx);
r404($ctx);
}
use Email::MIME;
use PublicInbox::View;
+sub msg_html ($) {
+ my ($mime) = @_;
+
+ PublicInbox::View::msg_html(undef, $mime);
+}
+
# plain text
{
my $body = <<EOF;
body => $body,
)->as_string;
my $mime = Email::MIME->new($s);
- my $html = PublicInbox::View::msg_html(undef, $mime);
+ my $html = msg_html($mime);
# ghetto tests
like($html, qr!<a\nhref="raw"!s, "raw link present");
parts => $parts,
);
- my $html = PublicInbox::View::msg_html(undef, $mime);
+ my $html = msg_html($mime);
like($html, qr/hi\n.*-- Attachment #2.*\nbye\n/s, "multipart split");
}
parts => $parts,
);
- my $html = PublicInbox::View::msg_html(undef, $mime);
+ my $html = msg_html($mime);
like($html, qr!.*Attachment #2: foo\.patch --!,
"parts split with filename");
}
);
my $orig = $mime->body_raw;
- my $html = PublicInbox::View::msg_html(undef, $mime);
+ my $html = msg_html($mime);
like($orig, qr/hi =3D bye=/, "our test used QP correctly");
like($html, qr/\bhi = bye\b/, "HTML output decoded QP");
}