nntp: fix redundant CRLF from "LISTGROUP GROUP RANGE"

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

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 0d2bc4f33d8b46f471e12b8fcaf3d17074bf4533..41f1e9c1ed9e6a5321b1ead30853419b43fad644 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -29,8 +29,9 @@ use constant {
 use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT);
 use Errno qw(EAGAIN);
 
-my @OVERVIEW = qw(Subject From Date Message-ID References Xref);
-my $OVERVIEW_FMT = join(":\r\n", @OVERVIEW, qw(Bytes Lines)) . ":\r\n";
+my @OVERVIEW = qw(Subject From Date Message-ID References);
+my $OVERVIEW_FMT = join(":\r\n", @OVERVIEW, qw(Bytes Lines), '') .
+               "Xref:full\r\n";
 my $LIST_HEADERS = join("\r\n", @OVERVIEW,
                        qw(:bytes :lines Xref To Cc)) . "\r\n";
 my $CAPABILITIES = <<"";
@@ -220,22 +221,34 @@ sub cmd_list ($;$$) {
        '.'
 }
 
-sub cmd_listgroup ($;$) {
-       my ($self, $group) = @_;
+sub cmd_listgroup ($;$$) {
+       my ($self, $group, $range) = @_;
        if (defined $group) {
                my $res = cmd_group($self, $group);
                return $res if ($res !~ /\A211 /);
                more($self, $res);
        }
-
-       $self->{ng} or return '412 no newsgroup selected';
-       my $n = 0;
-       long_response($self, sub {
-               my $ary = $self->{ng}->mm->ids_after(\$n);
-               scalar @$ary or return;
-               more($self, join("\r\n", @$ary));
-               1;
-       });
+       my $ng = $self->{ng} or return '412 no newsgroup selected';
+       my $mm = $ng->mm;
+       if (defined $range) {
+               my $r = get_range($self, $range);
+               return $r unless ref $r;
+               my ($beg, $end) = @$r;
+               long_response($self, sub {
+                       $r = $mm->msg_range(\$beg, $end, 'num');
+                       scalar(@$r) or return;
+                       more($self, join("\r\n", map { $_->[0] } @$r));
+                       1;
+               });
+       } else { # grab every article number
+               my $n = 0;
+               long_response($self, sub {
+                       my $ary = $mm->ids_after(\$n);
+                       scalar(@$ary) or return;
+                       more($self, join("\r\n", @$ary));
+                       1;
+               });
+       }
 }
 
 sub parse_time ($$;$) {