imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index fb21041acafcaa534c3563a1f191f902acc631df..00b3c8b45946abff63461132bac7075307253b5b 100644 (file)
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # represents a header value in various forms.  Used for HTML generation
@@ -34,7 +34,7 @@ my %escape_sequence = (
        "\x7f" => '\\x7f', # DEL
 );
 
-my %xhtml_map = (
+our %xhtml_map = (
        '"' => '&#34;',
        '&' => '&#38;',
        "'" => '&#39;',
@@ -82,15 +82,22 @@ sub obfuscate_addrs ($$;$) {
        my $repl = $_[2] // '&#8226;';
        my $re = $ibx->{-no_obfuscate_re}; # regex of domains
        my $addrs = $ibx->{-no_obfuscate}; # { $address => 1 }
-       $_[1] =~ s/(([\w\.\+=\-]+)\@([\w\-]+\.[\w\.\-]+))/
-               my ($addr, $user, $domain) = ($1, $2, $3);
-               if ($addrs->{$addr} || ((defined $re && $domain =~ $re))) {
-                       $addr;
+       $_[1] =~ s#(\S+)\@([\w\-]+\.[\w\.\-]+)#
+               my ($pfx, $domain) = ($1, $2);
+               if (index($pfx, '://') > 0 || $pfx !~ s/([\w\.\+=\-]+)\z//) {
+                       "$pfx\@$domain";
                } else {
-                       $domain =~ s!([^\.]+)\.!$1$repl!;
-                       $user . '@' . $domain
+                       my $user = $1;
+                       my $addr = "$user\@$domain";
+                       if ($addrs->{$addr} || ((defined($re) &&
+                                               $domain =~ $re))) {
+                               $pfx.$addr;
+                       } else {
+                               $domain =~ s!([^\.]+)\.!$1$repl!;
+                               $pfx . $user . '@' . $domain
+                       }
                }
-               /sge;
+               #sge;
 }
 
 # like format_sanitized_subject in git.git pretty.c with '%f' format string