treewide: replace {-inbox} with {ibx} for consistency

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 476d946f515d2882e881d61ab3c0117c38042721..4dd584d3478a2e2371be75de2375ac50793fc489 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -24,7 +24,7 @@ sub generate {
 
 sub generate_thread_atom {
        my ($ctx) = @_;
-       my $msgs = $ctx->{msgs} = $ctx->{-inbox}->over->get_thread($ctx->{mid});
+       my $msgs = $ctx->{msgs} = $ctx->{ibx}->over->get_thread($ctx->{mid});
        return _no_thread() unless @$msgs;
        PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i);
 }
@@ -34,7 +34,7 @@ sub generate_html_index {
        # if the 'r' query parameter is given, it is a legacy permalink
        # which we must continue supporting:
        my $qp = $ctx->{qp};
-       my $ibx = $ctx->{-inbox};
+       my $ibx = $ctx->{ibx};
        if ($qp && !$qp->{r} && $ibx->over) {
                return PublicInbox::View::index_topics($ctx);
        }
@@ -51,8 +51,7 @@ sub new_html_i {
        my ($ctx, $eml) = @_;
        $ctx->zmore($ctx->html_top) if exists $ctx->{-html_tip};
 
-       $eml and return PublicInbox::View::eml_entry($ctx, $eml,
-                                               scalar @{$ctx->{msgs}});
+       $eml and return PublicInbox::View::eml_entry($ctx, $eml);
        my $smsg = shift @{$ctx->{msgs}} or
                $ctx->zmore(PublicInbox::View::pagination_footer(
                                                $ctx, './new.html'));
@@ -80,7 +79,7 @@ sub _no_thread () {
 
 sub recent_msgs {
        my ($ctx) = @_;
-       my $ibx = $ctx->{-inbox};
+       my $ibx = $ctx->{ibx};
        my $max = $ibx->{feedmax};
        return PublicInbox::View::paginate_recent($ctx, $max) if $ibx->over;
 
@@ -89,7 +88,7 @@ sub recent_msgs {
        my $hex = '[a-f0-9]';
        my $addmsg = qr!^:000000 100644 \S+ (\S+) A\t${hex}{2}/${hex}{38}$!;
        my $delmsg = qr!^:100644 000000 (\S+) \S+ D\t(${hex}{2}/${hex}{38})$!;
-       my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~[0-9]+)?/;
+       my $refhex = qr/(?:HEAD|${hex}{4,})(?:~[0-9]+)?/;
 
        # revision ranges may be specified
        my $range = 'HEAD';
@@ -127,14 +126,17 @@ sub recent_msgs {
        if ($last) {
                local $/ = "\n";
                while (my $line = <$log>) {
-                       if ($line =~ /^(${hex}{7,40})/) {
+                       if ($line =~ /^(${hex}{7,})/) {
                                $last_commit = $1;
                                last;
                        }
                }
        }
 
-       $ctx->{next_page} = "r=$last_commit" if $last_commit;
+       $last_commit and
+               $ctx->{next_page} = qq[<a\nhref="?r=$last_commit"\nrel=next>] .
+                                       'next (older)</a>';
+
        [ map { bless {blob => $_ }, 'PublicInbox::Smsg' } @oids ];
 }