www: use WwwStream for dumping thread and search views

[public-inbox.git] / lib / PublicInbox / SearchMsg.pm

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index caebe3729d4cf3a038c75c05736d6fd3045d1dca..4b0b645e17af961b9bf450f57756fce97acba481 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -11,8 +11,6 @@ use POSIX qw//;
 use Date::Parse qw/str2time/;
 use PublicInbox::MID qw/mid_clean/;
 use PublicInbox::Address;
-use Encode qw/find_encoding/;
-my $enc_utf8 = find_encoding('UTF-8');
 our $PFX2TERM_RE = undef;
 use constant EPOCH_822 => 'Thu, 01 Jan 1970 00:00:00 +0000';
 use POSIX qw(strftime);
@@ -37,9 +35,9 @@ sub get_val ($$) {
 
 sub load_doc {
        my ($class, $doc) = @_;
-       my $data = $doc->get_data;
+       my $data = $doc->get_data or return;
        my $ts = get_val($doc, &PublicInbox::Search::TS);
-       $data = $enc_utf8->decode($data);
+       utf8::decode($data);
        my ($subj, $from, $refs, $to, $cc) = split(/\n/, $data);
        bless {
                doc => $doc,
@@ -87,7 +85,8 @@ sub from ($) {
        my ($self) = @_;
        my $from = __hdr($self, 'from');
        if (defined $from && !defined $self->{from_name}) {
-               $self->{from_name} = PublicInbox::Address::from_name($from);
+               my @n = PublicInbox::Address::names($from);
+               $self->{from_name} = join(', ', @n);
        }
        $from;
 }