X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHval.pm;h=23233f0e7e979c8ff524e1864a46489a747512c9;hb=78792fee4031aee0a8bd532bff98efc2b9409d68;hp=40c97da478fe6685810afa1c2c866945b70ef7a3;hpb=1fee6f86d7ee78161cc48a00232654f13a14bb88;p=public-inbox.git diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index 40c97da4..23233f0e 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 @@ -66,21 +55,10 @@ sub src_escape ($) { sub ascii_html { my ($s) = @_; - $s =~ s/\r\n/\n/sg; # fixup bad line endings $s =~ s/([<>&'"\x7f\x00-\x1f])/$xhtml_map{$1}/sge; $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) = @_; @@ -100,7 +78,7 @@ sub prurl ($$) { # However, • was chosen to make copy+paste errors more obvious sub obfuscate_addrs ($$;$) { my $ibx = $_[0]; - my $repl = $_[2] || '•'; + my $repl = $_[2] // '•'; my $re = $ibx->{-no_obfuscate_re}; # regex of domains my $addrs = $ibx->{-no_obfuscate}; # { adddress => 1 } $_[1] =~ s/(([\w\.\+=\-]+)\@([\w\-]+\.[\w\.\-]+))/