No ext_urls

[public-inbox.git] / lib / PublicInbox / Feed.pm

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index b2219dad9955005c2cb97d0fe3d47b710d617837..de1e7dfeb584a5631acb8704d909b51ceedc2223 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2013-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used for generating Atom feeds for web-accessible mailing list archives.
 package PublicInbox::Feed;
 use strict;
-use warnings;
+use v5.10.1;
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 use PublicInbox::Smsg; # this loads w/o Search::Xapian
@@ -19,14 +19,14 @@ sub generate {
        my ($ctx) = @_;
        my $msgs = $ctx->{msgs} = recent_msgs($ctx);
        return _no_thread() unless @$msgs;
-       PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i);
+       PublicInbox::WwwAtomStream->response($ctx, \&generate_i);
 }
 
 sub generate_thread_atom {
        my ($ctx) = @_;
        my $msgs = $ctx->{msgs} = $ctx->{ibx}->over->get_thread($ctx->{mid});
        return _no_thread() unless @$msgs;
-       PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i);
+       PublicInbox::WwwAtomStream->response($ctx, \&generate_i);
 }
 
 sub generate_html_index {
@@ -49,12 +49,15 @@ sub generate_html_index {
 
 sub new_html_i {
        my ($ctx, $eml) = @_;
-       $ctx->zmore($ctx->html_top) if exists $ctx->{-html_tip};
+       print { $ctx->zfh } $ctx->html_top if exists $ctx->{-html_tip};
 
-       $eml and return PublicInbox::View::eml_entry($ctx, $eml);
+       if ($eml) {
+               $ctx->{smsg}->populate($eml) if !$ctx->{ibx}->{over};
+               return PublicInbox::View::eml_entry($ctx, $eml);
+       }
        my $smsg = shift @{$ctx->{msgs}} or
-               $ctx->zmore(PublicInbox::View::pagination_footer(
-                                               $ctx, './new.html'));
+               print { $ctx->zfh } PublicInbox::View::pagination_footer(
+                                               $ctx, './new.html');
        $smsg;
 }
 
@@ -67,8 +70,9 @@ sub new_html {
        }
        $ctx->{-html_tip} = '<pre>';
        $ctx->{-upfx} = '';
+       $ctx->{-spfx} = '' if $ctx->{ibx}->{coderepo};
        $ctx->{-hr} = 1;
-       PublicInbox::WwwStream::aresponse($ctx, 200, \&new_html_i);
+       PublicInbox::WwwStream::aresponse($ctx, \&new_html_i);
 }
 
 # private subs
@@ -108,13 +112,13 @@ sub recent_msgs {
        my $last;
        my $last_commit;
        local $/ = "\n";
-       my @oids;
+       my @ret;
        while (defined(my $line = <$log>)) {
                if ($line =~ /$addmsg/o) {
                        my $add = $1;
                        next if $deleted{$add}; # optimization-only
-                       push @oids, $add;
-                       if (scalar(@oids) >= $max) {
+                       push(@ret, bless { blob => $add }, 'PublicInbox::Smsg');
+                       if (scalar(@ret) >= $max) {
                                $last = 1;
                                last;
                        }
@@ -136,8 +140,7 @@ sub recent_msgs {
        $last_commit and
                $ctx->{next_page} = qq[<a\nhref="?r=$last_commit"\nrel=next>] .
                                        'next (older)</a>';
-
-       [ map { bless {blob => $_ }, 'PublicInbox::Smsg' } @oids ];
+       \@ret;
 }
 
 1;