use PublicInbox::MIME;
use PublicInbox::Config;
use PublicInbox::WWW;
+use PublicInbox::MID qw(mids);
my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
URI::Escape Plack::Builder);
foreach my $mod (@mods) {
$mime->header_set(Date => 'Fri, 02 Oct 1993 00:01:00 +0000');
ok($im->add($mime), 'added duplicate-but-different message');
is(scalar(@warn), 1, 'got one warning');
-my @mids = $mime->header_obj->header_raw('Message-Id');
-$new_mid = PublicInbox::MID::mid_clean($mids[0]);
+my $mids = mids($mime->header_obj);
+$new_mid = $mids->[1];
$im->done;
my $cfgpfx = "publicinbox.v2test";
like($warn[0], qr/mismatched/, 'warned about mismatched messages');
is($warn[0], $warn[1], 'both warnings are the same');
-@mids = $mime->header_obj->header_raw('Message-Id');
-my $third = PublicInbox::MID::mid_clean($mids[0]);
+$mids = mids($mime->header_obj);
+my $third = $mids->[-1];
$im->done;
test_psgi(sub { $www->call(@_) }, sub {
foreach my $mid ('a-mid@b', $new_mid, $third) {
like($raw, qr/<\Q$mid\E>/s, "Message-ID $mid shown");
}
+ like($raw, qr/\b3\+ messages\b/, 'thread overview shown');
+
+ my $exp = [ qw(<a-mid@b> <reuse@mid>) ];
+ $mime->header_set('Message-Id', @$exp);
+ $mime->header_set('Subject', '4th dupe');
+ local $SIG{__WARN__} = sub {};
+ ok($im->add($mime), 'added one message');
+ $im->done;
+ my @h = $mime->header('Message-ID');
+ is_deeply($exp, \@h, 'reused existing Message-ID');
+
+ $config->each_inbox(sub { $_[0]->search->reopen });
+
+ $res = $cb->(GET('/v2test/new.atom'));
+ my @ids = ($res->content =~ m!<id>urn:uuid:([^<]+)</id>!sg);
+ my %ids;
+ $ids{$_}++ for @ids;
+ is_deeply([qw(1 1 1 1)], [values %ids], 'feed ids unique');
+
+ $res = $cb->(GET('/v2test/reuse@mid/T/'));
+ $raw = $res->content;
+ like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /T/');
+
+ $res = $cb->(GET('/v2test/reuse@mid/t/'));
+ $raw = $res->content;
+ like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /t/');
+
+ $res = $cb->(GET('/v2test/0/info/refs'));
+ is($res->code, 200, 'got info refs for dumb clones');
+ $res = $cb->(GET('/v2test/info/refs'));
+ is($res->code, 404, 'unpartitioned git URL fails');
+
+ # ensure conflicted attachments can be resolved
+ foreach my $body (qw(old new)) {
+ my $parts = [
+ PublicInbox::MIME->create(
+ attributes => { content_type => 'text/plain' },
+ body => 'blah',
+ ),
+ PublicInbox::MIME->create(
+ attributes => {
+ filename => 'attach.txt',
+ content_type => 'text/plain',
+ },
+ body => $body
+ )
+ ];
+ $mime = PublicInbox::MIME->create(
+ parts => $parts,
+ header_str => [ From => 'root@z',
+ 'Message-ID' => '<a@dup>',
+ Subject => 'hi']
+ );
+ ok($im->add($mime), "added attachment $body");
+ }
+ $im->done;
+ $config->each_inbox(sub { $_[0]->search->reopen });
+ $res = $cb->(GET('/v2test/a@dup/'));
+ my @links = ($res->content =~ m!"\.\./([^/]+/2-attach\.txt)\"!g);
+ is(scalar(@links), 2, 'both attachment links exist');
+ isnt($links[0], $links[1], 'attachment links are different');
+ {
+ my $old = $cb->(GET('/v2test/' . $links[0]));
+ my $new = $cb->(GET('/v2test/' . $links[1]));
+ is($old->content, 'old', 'got expected old content');
+ is($new->content, 'new', 'got expected new content');
+ }
});
done_testing();