about summary refs log tree commit
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-02-15 09:46:40 +0000
committerEric Wong <e@yhbt.net>2020-02-16 00:06:50 +0000
commit6b2a40269d00d014c2c94af4bb7dfecff6dff57e (patch)
treeb3c1bb135756593e7da5652e557649f855fc46c0
parent1fee6f86d7ee78161cc48a00232654f13a14bb88 (diff)
downloadpublic-inbox-master.tar.gz
view: remove last Hval->new caller HEAD master
The object-oriented Hval API turned out to be less useful and
more clunky than I envisioned years ago, so get rid of it.
We'll no longer strip trailing whitespace from From: headers in
the HTML display, but I doubt anybody cares.
-rw-r--r--lib/PublicInbox/Hval.pm21
-rw-r--r--lib/PublicInbox/View.pm5
2 files changed, 2 insertions, 24 deletions
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 40c97da4..5f7ab513 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -16,17 +16,6 @@ my $enc_ascii = find_encoding('us-ascii');
 # safe-ish acceptable filename pattern for portability
 our $FN = '[a-zA-Z0-9][a-zA-Z0-9_\-\.]+[a-zA-Z0-9]'; # needs \z anchor
 
-sub new {
-        my ($class, $raw, $href) = @_;
-
-        # we never care about trailing whitespace
-        $raw =~ s/\s*\z//;
-        bless {
-                raw => $raw,
-                href => defined $href ? $href : $raw,
-        }, $class;
-}
-
 sub mid_href { ascii_html(mid_escape($_[0])) }
 
 # some of these overrides are standard C escapes so they're
@@ -71,16 +60,6 @@ sub ascii_html {
         $enc_ascii->encode($s, Encode::HTMLCREF);
 }
 
-sub as_html { ascii_html($_[0]->{raw}) }
-
-sub raw {
-        if (defined $_[1]) {
-                $_[0]->{raw} = $_[1];
-        } else {
-                $_[0]->{raw};
-        }
-}
-
 # returns a protocol-relative URL string
 sub prurl ($$) {
         my ($env, $u) = @_;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 14b7d81d..980f265a 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -630,10 +630,9 @@ sub _msg_page_prepare_obuf {
         }
         my @title; # (Subject[0], From[0])
         for my $v ($hdr->header('From')) {
-                $v = PublicInbox::Hval->new($v);
-                my @n = PublicInbox::Address::names($v->raw);
+                my @n = PublicInbox::Address::names($v);
+                $v = ascii_html($v);
                 $title[1] //= ascii_html(join(', ', @n));
-                $v = $v->as_html;
                 if ($obfs_ibx) {
                         obfuscate_addrs($obfs_ibx, $v);
                         obfuscate_addrs($obfs_ibx, $title[1]);