nntpd: fix LISTGROUP with range

This reverts 0c62cffc2389 ("nntp: listgroup_range_i: remove useless
`map' op") and adds a test that demonstrates the breakage: the server
returns lines like

    ARRAY(0x556dace73f08)

instead of message numbers.

Fixes: 0c62cffc2389 ("nntp: listgroup_range_i: remove useless `map' op")

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index ceaf05f6948da0948fa90fb14fd9eae634faf356..dd33a232fa6b95d69ef013b5dc7863c1be043a45 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -188,7 +188,7 @@ sub listgroup_range_i {
        my ($self, $beg, $end) = @_;
        my $r = $self->{ibx}->mm(1)->msg_range($beg, $end, 'num');
        scalar(@$r) or return;
-       $self->msg_more(join("\r\n", @$r, ''));
+       $self->msg_more(join('', map { "$_->[0]\r\n" } @$r));
        1;
 }
 

diff --git a/t/nntpd.t b/t/nntpd.t
index d352c3c14805aa523cd15518f1a4789c97416933..058bd796e8fb28979ac46b76d9dfb3a0b9c44f69 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -93,6 +93,13 @@ close $cfgfh or BAIL_OUT;
        is_deeply([$n->group($group)], [ qw(0 1 1), $group ], 'GROUP works');
        is_deeply($n->listgroup($group), [1], 'listgroup OK');
        # TODO: Net::NNTP::listgroup does not support range at the moment
+       my $s = tcp_connect($sock);
+       sysread($s, my $buf, 4096);
+       is($buf, "201 " . hostname . " ready - post via email\r\n",
+               'got greeting');
+       syswrite($s, "LISTGROUP $group 1-1\r\n");
+       $buf = read_til_dot($s);
+       like($buf, qr/\r\n1\r\n/s, 'LISTGROUP with range works');
 
        {
                my $expect = [ qw(Subject: From: Date: Message-ID:
@@ -120,8 +127,8 @@ close $cfgfh or BAIL_OUT;
                'references' => '<reftabsqueezed>',
        );
 
-       my $s = tcp_connect($sock);
-       sysread($s, my $buf, 4096);
+       $s = tcp_connect($sock);
+       sysread($s, $buf, 4096);
        is($buf, "201 " . hostname . " ready - post via email\r\n",
                'got greeting');