Address::names is sufficient to handle what from_name did.
} split(/\@+[\w\.\-]+>?\s*(?:,\s*|\z)/, $_[0]);
}
-sub from_name {
- my ($val) = @_;
- my $name = $val;
- $name =~ s/\s*\S+\@\S+\s*\z//;
- if ($name !~ /\S/ || $name =~ /[<>]/) { # git does not like [<>]
- ($name) = emails($val);
- $name =~ s/\@.*//;
- }
- $name =~ tr/\r\n\t/ /;
- $name =~ s/\A['"\s]*//;
- $name =~ s/['"\s]*\z//;
- $name;
-}
-
1;
my $from = $header_obj->header('From') or return;
my ($email) = PublicInbox::Address::emails($from);
- my $name = PublicInbox::Address::from_name($from);
+ my $name = join(', ',PublicInbox::Address::names($from));
$name = ascii_html($name);
$email = ascii_html($email);
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;
}
$v = PublicInbox::Hval->new($v);
if ($h eq 'From') {
- my $n = PublicInbox::Address::from_name($v->raw);
- $title[1] = ascii_html($n);
+ my @n = PublicInbox::Address::names($v->raw);
+ $title[1] = ascii_html(join(', ', @n));
} elsif ($h eq 'Subject') {
$title[0] = $v->as_html;
if ($srch) {
my $msg = Email::MIME->new($str);
my $from = $msg->header('From');
- my $author = PublicInbox::Address::from_name($from);
+ my ($author) = PublicInbox::Address::names($from);
my ($email) = PublicInbox::Address::emails($from);
my $date = $msg->header('Date');