From 2bc961811c57bef3feef24244bf20546f3754d4f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 10 Mar 2021 13:23:42 +0000 Subject: watch: IMAP: ignore \Deleted and \Draft messages This matches existing Maildir behavior, as trash and draft messages have little reason to be exposed publicly. --- xt/net_writer-imap.t | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'xt') diff --git a/xt/net_writer-imap.t b/xt/net_writer-imap.t index 3631d932..11a10e74 100644 --- a/xt/net_writer-imap.t +++ b/xt/net_writer-imap.t @@ -7,6 +7,8 @@ use POSIX qw(strftime); use PublicInbox::OnDestroy; use PublicInbox::URIimap; use PublicInbox::Config; +use PublicInbox::DS; +use PublicInbox::InboxIdle; use Fcntl qw(O_EXCL O_WRONLY O_CREAT); my $imap_url = $ENV{TEST_IMAP_WRITE_URL} or plan skip_all => 'TEST_IMAP_WRITE_URL unset'; @@ -170,6 +172,48 @@ test_lei(sub { $res = json_utf8->decode($lei_out)->[0]; is_deeply([@$res{qw(m kw)}], ['testmessage@example.com', ['seen']], 'kw set'); + + $mic = $nwr->mic_for_folder($folder_uri); + for my $kw (qw(Deleted Seen Answered Draft)) { + my $buf = < + +EOM + $mic->append_string($folder_uri->mailbox, $buf, "\\$kw") + or BAIL_OUT "append $kw $@"; + } + # $mic->expunge or BAIL_OUT "expunge: $@"; + $mic->disconnect; + + my $inboxdir = "$ENV{HOME}/wtest"; + my @cmd = (qw(-init -Lbasic wtest), $inboxdir, + qw(https://example.com/wtest wtest@example.com)); + run_script(\@cmd) or BAIL_OUT "init wtest"; + xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config", + 'publicinbox.wtest.watch', + $$folder_uri) == 0 or BAIL_OUT "git config $?"; + my $watcherr = "$ENV{HOME}/watch.err"; + open my $err_wr, '>>', $watcherr or BAIL_OUT $!; + my $pub_cfg = PublicInbox::Config->new; + PublicInbox::DS->Reset; + my $ii = PublicInbox::InboxIdle->new($pub_cfg); + my $cb = sub { PublicInbox::DS->SetPostLoopCallback(sub {}) }; + my $obj = bless \$cb, 'PublicInbox::TestCommon::InboxWakeup'; + $pub_cfg->each_inbox(sub { $_[0]->subscribe_unlock('ident', $obj) }); + my $w = start_script(['-watch'], undef, { 2 => $err_wr }); + diag 'waiting for initial fetch...'; + PublicInbox::DS->EventLoop; + my $ibx = $pub_cfg->lookup_name('wtest'); + my $mm = $ibx->mm; + ok(defined($mm->num_for('Seen@test.example.com')), + '-watch takes seen message'); + ok(defined($mm->num_for('Answered@test.example.com')), + '-watch takes answered message'); + ok(!defined($mm->num_for('Deleted@test.example.com')), + '-watch ignored \\Deleted'); + ok(!defined($mm->num_for('Draft@test.example.com')), + '-watch ignored \\Draft'); }); undef $cleanup; # remove temporary folder -- cgit v1.2.3-24-ge0c7