X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=4cb295e60e4291f37b23137d78eaa688aacccb97;hb=58852a50f6a72265cce1e4729aae3875bba5aa96;hp=0bd458c94e2bdd05564f386136d0ddacbfaca83f;hpb=227a1d886672767e37cc86a3432952c14eb8a143;p=public-inbox.git
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 0bd458c9..4cb295e6 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019 all contributors
+# Copyright (C) 2013-2020 all contributors
# License: AGPL-3.0+
#
# Used for generating Atom feeds for web-accessible mailing list archives.
@@ -8,7 +8,7 @@ use warnings;
use PublicInbox::MIME;
use PublicInbox::View;
use PublicInbox::WwwAtomStream;
-use PublicInbox::SearchMsg; # this loads w/o Search::Xapian
+use PublicInbox::Smsg; # this loads w/o Search::Xapian
sub generate_i {
my ($ctx) = @_;
@@ -84,15 +84,10 @@ sub recent_msgs {
my ($ctx) = @_;
my $ibx = $ctx->{-inbox};
my $max = $ibx->{feedmax};
- my $qp = $ctx->{qp};
- my $v = $ibx->version;
- if ($v > 2) {
- die "BUG: unsupported inbox version: $v\n";
- }
- if ($ibx->over) {
- return PublicInbox::View::paginate_recent($ctx, $max);
- }
+ return PublicInbox::View::paginate_recent($ctx, $max) if $ibx->over;
+ # only for rare v1 inboxes which aren't indexed at all
+ my $qp = $ctx->{qp};
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})$!;
@@ -142,7 +137,7 @@ sub recent_msgs {
}
$ctx->{next_page} = "r=$last_commit" if $last_commit;
- [ map { bless {blob => $_ }, 'PublicInbox::SearchMsg' } @oids ];
+ [ map { bless {blob => $_ }, 'PublicInbox::Smsg' } @oids ];
}
1;