From: Eric Wong <e@80x24.org>
Date: Sat, 10 Sep 2022 08:17:05 +0000 (+0000)
Subject: view: remove multipart_text_as_html
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=109711976cb9c5e0b9a465b0b6ffcb509434f688;p=public-inbox.git

view: remove multipart_text_as_html

It seems like a pointless wrapper function that's not saving us
a whole lot.  Drop some direct {obuf} manipulation while we're
at it.
---

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 37b484ae..0b67d92f 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -39,8 +39,8 @@ sub msg_page_i {
 		$ctx->{mhref} = ($ctx->{nr} || $ctx->{smsg}) ?
 				"../${\mid_href($smsg->{mid})}/" : '';
 		if (_msg_page_prepare_obuf($eml, $ctx)) {
-			multipart_text_as_html($eml, $ctx);
-			${$ctx->{obuf}} .= '</pre><hr>';
+			$eml->each_part(\&add_text_body, $ctx, 1);
+			$ctx->zmore('</pre><hr>');
 		}
 		html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg};
 		delete($ctx->{obuf}) // \'';
@@ -57,8 +57,8 @@ sub no_over_html ($) {
 	$ctx->{mhref} = '';
 	PublicInbox::WwwStream::init($ctx);
 	if (_msg_page_prepare_obuf($eml, $ctx)) { # sets {-title_html}
-		multipart_text_as_html($eml, $ctx);
-		${$ctx->{obuf}} .= '</pre><hr>';
+		$eml->each_part(\&add_text_body, $ctx, 1);
+		$ctx->zmore('</pre><hr>');
 	}
 	html_footer($ctx, $eml);
 	$ctx->html_done;
@@ -506,13 +506,6 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback
 	}
 }
 
-sub multipart_text_as_html {
-	# ($mime, $ctx) = @_; # each_part may do "$_[0] = undef"
-
-	# scan through all parts, looking for displayable text
-	$_[0]->each_part(\&add_text_body, $_[1], 1);
-}
-
 sub submsg_hdr ($$) {
 	my ($ctx, $eml) = @_;
 	my $obfs_ibx = $ctx->{-obfs_ibx};
diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 906b292a..09c79a8a 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -157,9 +157,8 @@ sub feed_entry {
 	$ctx->{obuf} = \$s;
 	$ctx->{mhref} = $href;
 	$ctx->{changed_href} = "${href}#related";
-	PublicInbox::View::multipart_text_as_html($eml, $ctx);
-	delete $ctx->{obuf};
-	$s .= '</pre></div></content></entry>';
+	$eml->each_part(\&PublicInbox::View::add_text_body, $ctx, 1);
+	'</pre></div></content></entry>';
 }
 
 sub feed_updated {