replying to \"$t\"

here to allow users to specify their own + # we use a here to allow users to specify their own # color for quoted text $rv = $l->linkify_2(ascii_html($rv)); $$s .= qq() . $rv . '' } -sub add_text_body { - my ($enc_msg, $part, $part_nr) = @_; - return '' if $part->subparts; +sub attach_link ($$$$) { + my ($upfx, $ct, $p, $fn) = @_; + my ($part, $depth, @idx) = @$p; + my $nl = $idx[-1] > 1 ? "\n" : ''; + my $idx = join('.', @idx); + my $size = bytes::length($part->body); + $ct ||= 'text/plain'; + $ct =~ s/;.*//; # no attributes + $ct = ascii_html($ct); + my $desc = $part->header('Content-Description'); + $desc = $fn unless defined $desc; + $desc = '' unless defined $desc; + my $sfn; + if (defined $fn && $fn =~ /\A[[:alnum:]][\w\.-]+[[:alnum:]]\z/) { + $sfn = $fn; + } elsif ($ct eq 'text/plain') { + $sfn = 'a.txt'; + } else { + $sfn = 'a.bin'; + } + my @ret = qq($nl[-- Attachment #$idx: ); + my $ts = "Type: $ct, Size: $size bytes"; + push(@ret, ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]"); + join('', @ret, "\n"); +} +sub add_text_body { + my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ] + my ($part, $depth, @idx) = @$p; my $ct = $part->content_type; - # account for filter bugs... + my $fn = $part->filename; + if (defined $ct && $ct =~ m!\btext/x?html\b!i) { - $part->body_set(''); - return ''; + return attach_link($upfx, $ct, $p, $fn); } - my $enc = enc_for($ct, $enc_msg); - my $s = $part->body; - $part->body_set(''); - $s = $enc->decode($s); + + my $s = eval { $part->body_str }; + + # badly-encoded message? tell the world about it! + return attach_link($upfx, $ct, $p, $fn) if $@; + my @lines = split(/^/m, $s); $s = ''; - - if ($$part_nr > 0) { - my $fn = $part->filename; - defined($fn) or $fn = "part #" . ($$part_nr + 1); - $s .= add_filename_line($enc, $fn); + if (defined($fn) || $depth > 0) { + $s .= attach_link($upfx, $ct, $p, $fn); + $s .= "\n"; } - my @quot; my $l = PublicInbox::Linkify->new; while (defined(my $cur = shift @lines)) { if ($cur !~ /^>/) { # show the previously buffered quote inline - flush_quote(\$s, $l, \@quot, $$part_nr) if @quot; + flush_quote(\$s, $l, \@quot) if @quot; # regular line, OK $cur = $l->linkify_1($cur); @@ -321,27 +320,26 @@ sub add_text_body { } } - flush_quote(\$s, $l, \@quot, $$part_nr) if @quot; - ++$$part_nr; - + my $end = "\n"; + if (@quot) { + $end = ''; + flush_quote(\$s, $l, \@quot); + } $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; + $s =~ s/\s+\z//s; # kill all trailing spaces + $s .= $end; } -sub headers_to_html_header { +sub _msg_html_prepare { my ($hdr, $ctx) = @_; my $srch = $ctx->{srch} if $ctx; my $atom = ''; - my $rv = ''; - my $upfx = ''; + my $rv = ""; # anchor for body start if ($srch) { - $atom = qq{!; + $ctx->{-upfx} = '../'; } - my @title; my $mid = $hdr->header_raw('Message-ID'); $mid = PublicInbox::Hval->new_msgid($mid); @@ -351,8 +349,8 @@ sub headers_to_html_header { $v = PublicInbox::Hval->new($v); if ($h eq 'From') { - my @from = Email::Address->parse($v->raw); - $title[1] = ascii_html($from[0]->name); + my @n = PublicInbox::Address::names($v->raw); + $title[1] = ascii_html(join(', ', @n)); } elsif ($h eq 'Subject') { $title[0] = $v->as_html; if ($srch) { @@ -361,18 +359,17 @@ sub headers_to_html_header { next; } } - $rv .= "$h: " . $v->as_html . "\n"; + $v = $v->as_html; + $v =~ s/(\@[^,]+,) /$1\n\t/g if ($h eq 'Cc' || $h eq 'To'); + $rv .= "$h: $v\n"; } + $title[0] ||= '(no subject)'; + $ctx->{-title_html} = join(' - ', @title); $rv .= 'Message-ID: <' . $mid->as_html . '> '; - $rv .= "(raw)\n"; + $rv .= "(raw)\n"; $rv .= _parent_headers($hdr, $srch); $rv .= "\n"; - - ("". join(' - ', @title) . "$atom". - PublicInbox::Hval::STYLE . - "" . # anchor for body start - $rv); } sub thread_skel { @@ -408,10 +405,10 @@ sub thread_skel { cur => $mid, prev_attr => '', prev_level => 0, + upfx => "$tpfx../", + dst => $dst, }; - for (thread_results(load_results($sres))->rootset) { - skel_dump($dst, $state, $tpfx, $_, 0); - } + walk_thread(thread_results(load_results($sres)), $state, *skel_dump); $ctx->{next_msg} = $state->{next_msg}; $ctx->{parent_msg} = $parent; } @@ -447,12 +444,21 @@ sub _parent_headers { } if (@refs) { - $rv .= 'References: '. join(' ', @refs) . "\n"; + $rv .= 'References: '. join("\n\t", @refs) . "\n"; } } $rv; } +sub squote_maybe ($) { + my ($val) = @_; + if ($val =~ m{([^\w@\./,\%\+\-])}) { + $val =~ s/(['!])/'\\$1'/g; # '!' for csh + return "'$val'"; + } + $val; +} + sub mailto_arg_link { my ($hdr) = @_; my %cc; # everyone else @@ -461,21 +467,19 @@ sub mailto_arg_link { foreach my $h (qw(From To Cc)) { my $v = $hdr->header($h); defined($v) && ($v ne '') or next; - my @addrs = Email::Address->parse($v); - foreach my $recip (@addrs) { - my $address = $recip->address; + my @addrs = PublicInbox::Address::emails($v); + foreach my $address (@addrs) { my $dst = lc($address); $cc{$dst} ||= $address; $to ||= $dst; } } - Email::Address->purge_cache; my @arg; my $subj = $hdr->header('Subject') || ''; $subj = "Re: $subj" unless $subj =~ /\bRe:/i; my $mid = $hdr->header_raw('Message-ID'); - push @arg, "--in-reply-to='" . ascii_html($mid) . "'"; + push @arg, '--in-reply-to='.ascii_html(squote_maybe(mid_clean($mid))); my $irt = uri_escape_utf8($mid); delete $cc{$to}; push @arg, '--to=' . ascii_html($to); @@ -487,7 +491,7 @@ sub mailto_arg_link { my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj"; $href =~ s/%20/+/g; - (\@arg, $href); + (\@arg, ascii_html($href)); } sub html_footer { @@ -506,7 +510,7 @@ sub html_footer { if ($p) { $p = PublicInbox::Hval->new_msgid($p); $p = $p->as_href; - $irt = "parent "; + $irt = "parent "; } else { $irt = ' ' x length('parent '); } @@ -519,8 +523,9 @@ sub html_footer { } else { $irt = ''; } - - $irt . qq(reply) . $idx; + $rhref ||= '#R'; + $irt .= qq(reply); + $irt .= $idx; } sub linkify_ref_nosrch { @@ -532,31 +537,7 @@ sub linkify_ref_nosrch { sub anchor_for { my ($msgid) = @_; - my $id = $msgid; - if ($id !~ /\A[a-f0-9]{40}\z/) { - $id = id_compress(mid_clean($id), 1); - } - 'm' . $id; -} - -sub thread_html_head { - my ($hdr, $state) = @_; - my $res = delete $state->{res} or die "BUG: no Plack callback in {res}"; - my $fh = $res->([200, ['Content-Type'=> 'text/html; charset=UTF-8']]); - $state->{fh} = $fh; - - my $s = ascii_html($hdr->header('Subject')); - $fh->write("$s". - qq{! . - PublicInbox::Hval::STYLE . - ""); -} - -sub pre_anchor_entry { - my ($seen, $mime) = @_; - my $id = anchor_for(mid_mime($mime)); - $seen->{$id} = "#$id"; # save the anchor for children, later + 'm' . id_compress($msgid, 1); } sub ghost_parent { @@ -570,87 +551,11 @@ sub ghost_parent { qq{[parent not found: <$html>]}; } -sub thread_adj_level { - my ($state, $level) = @_; - - my $max = $state->{cur_level}; - if ($level <= 0) { - return '' if $max == 0; # flat output - - # reset existing lists - my $x = $max > 1 ? ('' x ($max - 1)) : ''; - $state->{fh}->write($x . ''); - $state->{cur_level} = 0; - return ''; - } - if ($level == $max) { # continue existing list - $state->{fh}->write('

'); - } elsif ($level < $max) { - my $x = $max > 1 ? ('

' x ($max - $level)) : ''; - $state->{fh}->write($x .= '

'); - $state->{cur_level} = $level; - } else { # ($level > $max) # start a new level - $state->{cur_level} = $level; - $state->{fh}->write(($max ? '

' : '') . '

'); - } - '

'. ghost_parent($upfx, $mid) . '

"; + my $id = ''; + if ($state->{mapping}) { + $id = id_compress($mid, 1); + $m = '#m'.$id; + $id = "\nid=r".$id; + } else { + $m = $state->{upfx}.$m->as_href.'/'; + } + $$dst .= "$pfx"; $$dst .= defined($s) ? "$s $f\n" : "$f\n"; } sub skel_dump { - my ($dst, $state, $upfx, $node, $level) = @_; - return unless $node; + my ($state, $level, $node) = @_; if (my $mime = $node->message) { - my $hdr = $mime->header_obj; - my $mid = mid_clean($hdr->header_raw('Message-ID')); - _skel_header($dst, $state, $upfx, $hdr, $level); + _skel_header($state, $mime->header_obj, $level); } else { my $mid = $node->messageid; + my $dst = $state->{dst}; if ($mid eq 'subject dummy') { $$dst .= "\t[no common parent]\n"; + return; + } + if ($state->{pct}) { # search result + $$dst .= ' [irrelevant] '; } else { $$dst .= ' [not found] '; - $$dst .= indent_for($level) . th_pfx($level); - $mid = PublicInbox::Hval->new_msgid($mid); - my $href = "$upfx../" . $mid->as_href . '/'; - my $html = $mid->as_html; - $$dst .= qq{<$html>\n}; } + $$dst .= indent_for($level) . th_pfx($level); + my $upfx = $state->{upfx}; + my $id = ''; + if ($state->{mapping}) { # thread index view + $id = "\nid=".anchor_for($mid); + } + $mid = PublicInbox::Hval->new_msgid($mid); + my $href = $upfx . $mid->as_href . '/'; + my $html = $mid->as_html; + $$dst .= qq{<$html>\n}; } - skel_dump($dst, $state, $upfx, $node->child, $level+1); - skel_dump($dst, $state, $upfx, $node->next, $level); } sub sort_ts { @@ -766,38 +683,36 @@ sub sort_ts { } @_; } +sub _tryload_ghost ($$) { + my ($srch, $mid) = @_; + my $smsg = $srch->lookup_mail($mid) or return; + $smsg->mini_mime; +} + # accumulate recent topics if search is supported # returns 1 if done, undef if not sub add_topic { - my ($state, $node, $level) = @_; - return unless $node; - my $child_adjust = 1; - - if (my $x = $node->message) { + my ($state, $level, $node) = @_; + my $srch = $state->{srch}; + my $mid = $node->messageid; + my $x = $node->message || _tryload_ghost($srch, $mid); + my ($subj, $ts); + if ($x) { $x = $x->header_obj; - my $subj; - $subj = $x->header('Subject'); - $subj = $state->{srch}->subject_normalized($subj); - - if (++$state->{subjs}->{$subj} == 1) { - push @{$state->{order}}, [ $level, $subj ]; - } - - my $mid = mid_clean($x->header_raw('Message-ID')); - - my $ts = $x->header('X-PI-TS'); - my $exist = $state->{latest}->{$subj}; - if (!$exist || $exist->[1] < $ts) { - $state->{latest}->{$subj} = [ $mid, $ts ]; - } - } else { - # ghost message, do not bump level - $child_adjust = 0; + $subj = $srch->subject_normalized($subj); + $ts = $x->header('X-PI-TS'); + } else { # ghost message, do not bump level + $ts = -666; + $subj = "<$mid>"; + } + if (++$state->{subjs}->{$subj} == 1) { + push @{$state->{order}}, [ $level, $subj ]; + } + my $exist = $state->{latest}->{$subj}; + if (!$exist || $exist->[1] < $ts) { + $state->{latest}->{$subj} = [ $mid, $ts ]; } - - add_topic($state, $node->child, $level + $child_adjust); - add_topic($state, $node->next, $level); } sub emit_topics { @@ -817,7 +732,6 @@ sub emit_topics { 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" : ''; if ($nl && $cur) { @@ -826,10 +740,14 @@ sub emit_topics { } $cur ||= [ $ts, '' ]; $cur->[0] = $ts if $ts > $cur->[0]; - $cur->[1] .= $nl . $pfx . th_pfx($level) . - "" . - $subj . "\n"; + $cur->[1] .= $nl . $pfx . th_pfx($level); + if ($ts == -666) { # ghost + $cur->[1] .= ghost_parent('', $mid) . "\n"; + next; # child will have mbox / atom link + } + $subj = PublicInbox::Hval->new($subj)->as_html; + $cur->[1] .= "$subj\n"; $ts = fmt_ts($ts); my $attr = " $ts UTC"; @@ -852,20 +770,17 @@ sub emit_topics { sub emit_index_topics { my ($state) = @_; - my $off = $state->{ctx}->{cgi}->param('o'); - $off = 0 unless defined $off; + my ($off) = (($state->{ctx}->{cgi}->param('o') || '0') =~ /(\d+)/); $state->{order} = []; $state->{subjs} = {}; $state->{latest} = {}; my $max = 25; - my %opts = ( offset => int $off, limit => $max * 4 ); + my %opts = ( offset => $off, limit => $max * 4 ); while (scalar @{$state->{order}} < $max) { my $sres = $state->{srch}->query('', \%opts); my $nr = scalar @{$sres->{msgs}} or last; - - for (thread_results(load_results($sres))->rootset) { - add_topic($state, $_, 0); - } + $sres = load_results($sres); + walk_thread(thread_results($sres), $state, *add_topic); $opts{offset} += $nr; }