From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 8/8] view: remove last Hval->new caller
Date: Sat, 15 Feb 2020 09:46:40 +0000 [thread overview]
Message-ID: <20200215094640.19425-9-e@yhbt.net> (raw)
In-Reply-To: <20200215094640.19425-1-e@yhbt.net>
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.
---
lib/PublicInbox/Hval.pm | 21 ---------------------
lib/PublicInbox/View.pm | 5 ++---
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]);
prev parent reply other threads:[~2020-02-15 9:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-15 9:46 [PATCH 0/8] some view cleanups and minor bugfixes Eric Wong
2020-02-15 9:46 ` [PATCH 1/8] view: remove mhref arg from multipart_text_as_html Eric Wong
2020-02-15 9:46 ` [PATCH 2/8] view: single id="t" for multi-Subject messages Eric Wong
2020-02-15 9:46 ` [PATCH 3/8] view: dump_topics: better naming of top Subject Eric Wong
2020-02-15 9:46 ` [PATCH 4/8] view: cleanup topic accumulation and dumping Eric Wong
2020-02-15 9:46 ` [PATCH 5/8] view,searchview: avoid smsg method calls when using SQLite/Xapian Eric Wong
2020-02-15 9:46 ` [PATCH 6/8] view: escape Subject HTML directly Eric Wong
2020-02-15 9:46 ` [PATCH 7/8] view: escape ampersand in Message-IDs Eric Wong
2020-02-15 9:46 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200215094640.19425-9-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).