run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 2f59f8c2939b258d0c028c07a323cbb85380fcfb..da230525da2e42cf2b919104ad900e754b5d32e6 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2019 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.
@@ -27,14 +27,13 @@ sub generate {
 sub generate_thread_atom {
        my ($ctx) = @_;
        my $mid = $ctx->{mid};
-       my $res = $ctx->{srch}->get_thread($mid);
-       return _no_thread() unless $res->{total};
-
        my $ibx = $ctx->{-inbox};
+       my $msgs = $ibx->over->get_thread($mid);
+       return _no_thread() unless @$msgs;
+
        my $html_url = $ibx->base_url($ctx->{env});
        $html_url .= PublicInbox::Hval->new_msgid($mid)->{href};
        $ctx->{-html_url} = $html_url;
-       my $msgs = $res->{msgs};
        PublicInbox::WwwAtomStream->response($ctx, 200, sub {
                while (my $smsg = shift @$msgs) {
                        $ibx->smsg_mime($smsg) and return $smsg;
@@ -47,12 +46,13 @@ 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};
-       if ($qp && !$qp->{r} && $ctx->{srch}) {
+       my $ibx = $ctx->{-inbox};
+       if ($qp && !$qp->{r} && $ibx->over) {
                return PublicInbox::View::index_topics($ctx);
        }
 
        my $env = $ctx->{env};
-       my $url = $ctx->{-inbox}->base_url($env) . 'new.html';
+       my $url = $ibx->base_url($env) . 'new.html';
        my $qs = $env->{QUERY_STRING};
        $url .= "?$qs" if $qs ne '';
        [302, [ 'Location', $url, 'Content-Type', 'text/plain'],
@@ -76,7 +76,7 @@ sub new_html {
                        my $more = scalar @$msgs;
                        return PublicInbox::View::index_entry($m, $ctx, $more);
                }
-               new_html_footer($ctx);
+               PublicInbox::View::pagination_footer($ctx, './new.html');
        });
 }
 
@@ -86,21 +86,6 @@ sub _no_thread () {
        [404, ['Content-Type', 'text/plain'], ["No feed found for thread\n"]];
 }
 
-sub new_html_footer {
-       my ($ctx) = @_;
-       my $qp = delete $ctx->{qp} or return;
-       my $latest = '';
-       my $next = delete $ctx->{next_page} || '';
-       if ($next) {
-               $next = qq!<a\nhref="?$next"\nrel=next>next</a>!;
-       }
-       if (!$qp) {
-               $latest = qq! <a\nhref='./new.html'>latest</a>!;
-               $next ||= '    ';
-       }
-       "<hr><pre>page: $next$latest</pre>";
-}
-
 sub recent_msgs {
        my ($ctx) = @_;
        my $ibx = $ctx->{-inbox};
@@ -110,20 +95,14 @@ sub recent_msgs {
        if ($v > 2) {
                die "BUG: unsupported inbox version: $v\n";
        }
-       if (my $srch = $ibx->search) {
-               my $o = $qp ? $qp->{o} : 0;
-               $o += 0;
-               $o = 0 if $o < 0;
-               my $res = $ibx->recent({ limit => $max, offset => $o });
-               my $next = $o + $max;
-               $ctx->{next_page} = "o=$next" if $res->{total} >= $next;
-               return $res->{msgs};
+       if ($ibx->over) {
+               return PublicInbox::View::paginate_recent($ctx, $max);
        }
 
        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})(?:~\d+)?/;
+       my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~[0-9]+)?/;
 
        # revision ranges may be specified
        my $range = 'HEAD';
@@ -138,7 +117,7 @@ sub recent_msgs {
        my $log = $ibx->git->popen(qw/log
                                --no-notes --no-color --raw -r
                                --no-abbrev --abbrev-commit/,
-                               "--format=%h", $range);
+                               "--format=%H", $range);
        my %deleted; # only an optimization at this point
        my $last;
        my $last_commit;