update copyrights for 2018

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

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