www: a note .onion URLs require the usage of Tor

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

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index abba43d1f03ef25d032ee31abf07a78767d40e97..2c0bb040e785ddaa0cb2e9ad01394b06f11dc005 100644 (file)
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -7,7 +7,9 @@ use warnings;
 # very loose regexes, here.  We don't need RFC-compliance,
 # just enough to make thing sanely displayable and pass to git
 
-sub emails { ($_[0] =~ /([\w\.\+=\-]+\@[\w\.\-]+)>?\s*(?:,\s*|\z)/g) }
+sub emails {
+       ($_[0] =~ /([\w\.\+=\-]+\@[\w\.\-]+)>?\s*(?:\(.*?\))?(?:,\s*|\z)/g)
+}
 
 sub names {
        map {
@@ -16,22 +18,10 @@ sub names {
                my $e = $1;
                s/\A['"\s]*//;
                s/['"\s]*\z//;
-               $_ =~ /\S/ ? $_ : $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;
+               $e = $_ =~ /\S/ ? $_ : $e;
+               $e =~ s/\@\S+\z//;
+               $e;
+       } split(/\@+[\w\.\-]+>?\s*(?:\(.*?\))?(?:,\s*|\z)/, $_[0]);
 }
 
 1;