address: use comment as name if no phrase available

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

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index e17d0b574ec9337cc57f735ee3def5cedff10495..a58d1efff9e38ea9071c9d96e4a4bec0d664e9d7 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-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,19 +7,32 @@ 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*(?:\(.*?\))?(?:,\s*|\z)/gx)
+}
 
 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]);
+       my @p = split(/<?([^@<>]+)\@[\w\.\-]+>?\s*(\(.*?\))?(?:,\s*|\z)/,
+                       $_[0]);
+       my @ret;
+       for (my $i = 0; $i <= $#p;) {
+               my $phrase = $p[$i++];
+               $phrase =~ tr/\r\n\t / /s;
+               $phrase =~ s/\A['"\s]*//;
+               $phrase =~ s/['"\s]*\z//;
+               my $user = $p[$i++] // '';
+               my $comment = $p[$i++] // '';
+               if ($phrase =~ /\S/) {
+                       $phrase =~ s/\@\S+\z//;
+                       push @ret, $phrase;
+               } elsif ($comment =~ /\A\((.*?)\)\z/) {
+                       push @ret, $1;
+               } else {
+                       push @ret, $user;
+               }
+       }
+       @ret;
 }
 
 1;