-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use warnings;
use Test::More;
use PublicInbox::TestCommon;
+use PublicInbox::Eml;
require_mods(qw(DBD::SQLite Data::Dumper));
use_ok 'PublicInbox::NNTP';
use_ok 'PublicInbox::Inbox';
my ($date, $time, $gmt) = @_;
my $m = join(' ', @_);
my $ts = PublicInbox::NNTP::parse_time(@_);
- my @t = gmtime($ts);
+ my @t = $gmt ? gmtime($ts) : localtime($ts);
my ($d, $t) = split(' ', strftime('%Y%m%d %H%M%S', @t));
if (length($date) != 8) { # Net::NNTP uses YYMMDD :<
$d =~ s/^[0-9]{2}//;
}
{ # test setting NNTP headers in HEAD and ARTICLE requests
- require Email::MIME;
my $u = 'https://example.com/a/';
my $ng = PublicInbox::Inbox->new({ name => 'test',
inboxdir => 'test.git',
url => [ '//example.com/a' ]});
is($ng->base_url, $u, 'URL expanded');
my $mid = 'a@b';
- my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n");
+ my $mime = PublicInbox::Eml->new("Message-ID: <$mid>\r\n\r\n");
my $hdr = $mime->header_obj;
- my $mock_self = { nntpd => { grouplist => [],
- servername => 'example.com' } };
- PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid);
+ my $mock_self = {
+ nntpd => { grouplist => [], servername => 'example.com' },
+ ng => $ng,
+ };
+ my $smsg = { num => 1, mid => $mid };
+ PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
'Message-ID unchanged');
is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
'Xref: set');
$ng->{-base_url} = 'http://mirror.example.com/m/';
- PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
+ $smsg->{num} = 2;
+ PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
'Message-ID unchanged');
is_deeply([ $mime->header('Archived-At') ],