hval: export prurl and add prototype

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

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 7995b3154bcd8ceb17720b2001446fdae723cf34..a52dba110c359fa988e4781657d2be81d7fe6d0c 100644 (file)
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -6,7 +6,7 @@
 package PublicInbox::WwwListing;
 use strict;
 use warnings;
-use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::Hval qw(ascii_html prurl);
 use PublicInbox::Linkify;
 use PublicInbox::View;
 use PublicInbox::Inbox;
@@ -32,7 +32,7 @@ sub list_all ($$$) {
 sub list_match_domain_i {
        my ($ibx, $arg) = @_;
        my ($list, $hide_key, $re) = @$arg;
-       if (!$ibx->{-hide}->{$hide_key} && $ibx->{url} =~ $re) {
+       if (!$ibx->{-hide}->{$hide_key} && grep($re, @{$ibx->{url}})) {
                push @$list, $ibx;
        }
 }
@@ -84,13 +84,13 @@ sub new {
 sub ibx_entry {
        my ($mtime, $ibx, $env) = @_;
        my $ts = PublicInbox::View::fmt_ts($mtime);
-       my $url = PublicInbox::Hval::prurl($env, $ibx->{url});
+       my $url = prurl($env, $ibx->{url});
        my $tmp = <<"";
 * $ts - $url
   ${\$ibx->description}
 
-       if (defined(my $info_url = $ibx->{info_url})) {
-               $tmp .= "\n$info_url";
+       if (defined(my $info_url = $ibx->{infourl})) {
+               $tmp .= '  ' . prurl($env, $info_url) . "\n";
        }
        $tmp;
 }