about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2015-08-18 01:08:28 +0000
committerEric Wong <e@80x24.org>2015-08-18 01:09:42 +0000
commit7310cc79cea5ba64b1cc7c97169d811d8a4653a0 (patch)
tree4a74ea30b0244e3c4b160d40d41cee02669b9b7b /lib
parent9beef8313200e56ef37764a43fbdfe1f4bfb4294 (diff)
downloadpublic-inbox-7310cc79cea5ba64b1cc7c97169d811d8a4653a0.tar.gz
Avoid compiling a weird and potentially fragile regexp every
time and use the same logic as our search module to dedupe
References.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/View.pm27
1 files changed, 17 insertions, 10 deletions
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 6fbc3660..b0b8e140 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -395,10 +395,19 @@ sub headers_to_html_header {
 
         my $refs = $header_obj->header_raw('References');
         if ($refs) {
-                $refs =~ s/\s*\Q$irt\E\s*// if (defined $irt);
-                my @refs = ($refs =~ /<([^>]+)>/g);
+                # avoid redundant URLs wasting bandwidth
+                my %seen;
+                $seen{mid_clean($irt)} = 1 if defined $irt;
+                my @refs;
+                my @raw_refs = ($refs =~ /<([^>]+)>/g);
+                foreach my $ref (@raw_refs) {
+                        next if $seen{$ref};
+                        $seen{$ref} = 1;
+                        push @refs, linkify_ref($ref);
+                }
+
                 if (@refs) {
-                        $rv .= 'References: '. linkify_refs(@refs) . "\n";
+                        $rv .= 'References: '. join(' ', @refs) . "\n";
                 }
         }
 
@@ -466,13 +475,11 @@ sub html_footer {
         "$irt<a\nhref=\"" . ascii_html($href) . '">reply</a>' . $idx;
 }
 
-sub linkify_refs {
-        join(' ', map {
-                my $v = PublicInbox::Hval->new_msgid($_);
-                my $html = $v->as_html;
-                my $href = $v->as_href;
-                "&lt;<a\nhref=\"$href.html\">$html</a>&gt;";
-        } @_);
+sub linkify_ref {
+        my $v = PublicInbox::Hval->new_msgid($_[0]);
+        my $html = $v->as_html;
+        my $href = $v->as_href;
+        "&lt;<a\nhref=\"$href.html\">$html</a>&gt;";
 }
 
 sub anchor_for {