inbox: base_url method takes PSGI env hashref instead

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

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index abba43d1f03ef25d032ee31abf07a78767d40e97..e17d0b574ec9337cc57f735ee3def5cedff10495 100644 (file)
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -16,22 +16,10 @@ sub names {
                my $e = $1;
                s/\A['"\s]*//;
                s/['"\s]*\z//;
-               $_ =~ /\S/ ? $_ : $e;
+               $e = $_ =~ /\S/ ? $_ : $e;
+               $e =~ s/\@\S+\z//;
+               $e;
        } 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;