From 13eda978e8937065575623d045f78592cbb6d022 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 25 Jun 2016 10:56:59 +0000
Subject: address: remove Address::from_name

Address::names is sufficient to handle what from_name did.
---
 lib/PublicInbox/Address.pm   | 14 --------------
 lib/PublicInbox/Feed.pm      |  2 +-
 lib/PublicInbox/SearchMsg.pm |  3 ++-
 lib/PublicInbox/View.pm      |  4 ++--
 4 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'lib/PublicInbox')

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index abba43d1..cd5fbfbe 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -20,18 +20,4 @@ sub names {
 	} 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;
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 455b8e23..8e233061 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -317,7 +317,7 @@ sub feed_entry {
 
 	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);
 
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index d41d2439..4b0b645e 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -85,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;
 }
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index d906276a..30d8e3e8 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -354,8 +354,8 @@ sub _msg_html_prepare {
 		$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) {
-- 
cgit v1.2.3-24-ge0c7