X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAddress.pm;h=46aa0da7f9db085a1adb1f13b83b0b74455cd14d;hb=3c39f9c942a6975245fda878e9b957d8d3367662;hp=772adedb29b3ed1546a647181a31609e5f3d7766;hpb=c70cc0c804f94127b7eb4448d796f4c1b3f6dd6f;p=public-inbox.git

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 772adedb..46aa0da7 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package PublicInbox::Address;
 use strict;
@@ -7,20 +7,22 @@ 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] =~ /([^<\s,]+\@[^>\s,]+)/g) }
+sub emails {
+	($_[0] =~ /([\w\.\+=\?"\(\)\-!#\$%&'\*\/\^\`\|\{\}~]+\@[\w\.\-\(\)]+)
+		(?:\s[^>]*)?>?\s*(?:\(.*?\))?(?:,\s*|\z)/gx)
+}
 
-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;
+sub names {
+	map {
+		tr/\r\n\t/ /;
+		s/\s*<([^<]+)\z//;
+		my $e = $1;
+		s/\A['"\s]*//;
+		s/['"\s]*\z//;
+		$e = $_ =~ /\S/ ? $_ : $e;
+		$e =~ s/\@\S+\z//;
+		$e;
+	} split(/\@+[\w\.\-]+>?\s*(?:\(.*?\))?(?:,\s*|\z)/, $_[0]);
 }
 
 1;