X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fnntp.t;h=655af39825b2f514d621600399964db7ba4b450e;hp=938eef385bb5f2b12e3abccd5954d9db183c2f0c;hb=refs%2Fheads%2Fmaster;hpb=1988d730c0088e8b1f6193650c7ee929df8a2ed7

diff --git a/t/nntp.t b/t/nntp.t
index 938eef38..655af398 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,12 +1,14 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2021 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';
+use PublicInbox::Config;
 
 {
 	sub quote_str {
@@ -68,7 +70,7 @@ 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}//;
@@ -96,42 +98,38 @@ use_ok 'PublicInbox::Inbox';
 }
 
 { # 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',
+	my $ibx = PublicInbox::Inbox->new({ name => 'test',
 					inboxdir => 'test.git',
 					address => 'a@example.com',
 					-primary_address => 'a@example.com',
 					newsgroup => 'test',
 					domain => 'example.com',
 					url => [ '//example.com/a' ]});
-	is($ng->base_url, $u, 'URL expanded');
+	is($ibx->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 => {
+			servername => 'example.com',
+			pi_cfg => bless {}, 'PublicInbox::Config',
+		},
+		ibx => $ibx,
+	};
+	my $smsg = { num => 1, mid => $mid, nntp => $mock_self, -ibx => $ibx };
+	PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
 	is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
 		'Message-ID unchanged');
-	is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
-		'Archived-At: set');
-	is_deeply([ $mime->header('List-Archive') ], [ "<$u>" ],
-		'List-Archive: set');
-	is_deeply([ $mime->header('List-Post') ], [ '<mailto:a@example.com>' ],
-		'List-Post: set');
 	is_deeply([ $mime->header('Newsgroups') ], [ 'test' ],
 		'Newsgroups: set');
 	is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ],
 		'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($hdr, $smsg);
 	is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
 		'Message-ID unchanged');
-	is_deeply([ $mime->header('Archived-At') ],
-		[ "<${u}a\@b/>", '<http://mirror.example.com/m/a@b/>' ],
-		'Archived-At: appended');
 	is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
 		'Old Xref: clobbered');
 }