diff --git a/internal/router/priority_test.go b/internal/router/priority_test.go new file mode 100644 index 0000000..fd9ef41 --- /dev/null +++ b/internal/router/priority_test.go @@ -0,0 +1,127 @@ +package router + +import ( + "database/sql" + "testing" + + "codeberg.org/squidd/parsimony/internal/store" +) + +// newsletterEnv is newEnv on a database file whose list has the publishers post policy, set +// directly in the database. +func newsletterEnv(t *testing.T) *env { + t.Helper() + path := t.TempDir() + "/p.db" + s, err := store.Open(path) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { s.Close() }) + l, _ := s.CreateList("dev", "example.org", "Dev") + s.AddMember(l.ID, "alice@example.com", "Alice") + s.AddMember(l.ID, "bob@example.com", "Bob") + db, err := sql.Open("sqlite", path) + if err != nil { + t.Fatal(err) + } + defer db.Close() + if _, err := db.Exec(`UPDATE lists SET post_policy=? WHERE id=?`, store.PostPublishers, l.ID); err != nil { + t.Fatal(err) + } + l, _ = s.GetList(l.ID) + return &env{r: New(s), s: s, list: l} +} + +func duePriorities(t *testing.T, s *store.Store) []int { + t.Helper() + due, err := s.DueOutbox(100) + if err != nil { + t.Fatal(err) + } + var out []int + for _, d := range due { + out = append(out, d.Priority) + } + return out +} + +func allEqual(ps []int, want int, n int) bool { + if len(ps) != n { + return false + } + for _, p := range ps { + if p != want { + return false + } + } + return true +} + +const samplePost = "From: alice@example.com\r\nSubject: hi\r\nMessage-ID: \r\n\r\nbody\r\n" + +func TestANewsletterIsDeliveredWithPriorityOne(t *testing.T) { + e := newsletterEnv(t) + res, err := e.r.prepare(e.list, []byte(samplePost)) + if err != nil { + t.Fatal(err) + } + if err := e.r.Deliver(res); err != nil { + t.Fatal(err) + } + if ps := duePriorities(t, e.s); !allEqual(ps, 1, 2) { + t.Fatalf("priorities: %v", ps) + } +} + +func TestADiscussionPostIsDeliveredWithPriorityZero(t *testing.T) { + e := newEnv(t) + if err := e.post(t, samplePost); err != nil { + t.Fatal(err) + } + if ps := duePriorities(t, e.s); !allEqual(ps, 0, 2) { + t.Fatalf("priorities: %v", ps) + } +} + +func TestAReleasedNewsletterHasPriorityOne(t *testing.T) { + e := newsletterEnv(t) + id, _ := e.s.HoldMessage(e.list.ID, "alice@example.com", []byte(samplePost), "r") + if err := e.r.Release(id); err != nil { + t.Fatal(err) + } + if ps := duePriorities(t, e.s); !allEqual(ps, 1, 2) { + t.Fatalf("priorities: %v", ps) + } +} + +func TestAReleasedDiscussionPostHasPriorityZero(t *testing.T) { + e := newEnv(t) + id, _ := e.s.HoldMessage(e.list.ID, "alice@example.com", []byte(samplePost), "r") + if err := e.r.Release(id); err != nil { + t.Fatal(err) + } + if ps := duePriorities(t, e.s); !allEqual(ps, 0, 2) { + t.Fatalf("priorities: %v", ps) + } +} + +func TestConfirmationMailOfANewsletterHasPriorityZero(t *testing.T) { + e := newsletterEnv(t) + if handled, err := e.r.Command("carol@x.com", "dev+join@example.org", nil); !handled || err != nil { + t.Fatalf("join: %v %v", handled, err) + } + if ps := duePriorities(t, e.s); !allEqual(ps, 0, 1) { + t.Fatalf("priorities: %v", ps) + } +} + +func TestAPostIsRecordedWithItsRecipients(t *testing.T) { + e := newEnv(t) + if err := e.post(t, samplePost); err != nil { + t.Fatal(err) + } + posts, err := e.s.ListPosts(e.list.ID, 0) + if err != nil || len(posts) != 1 || posts[0].Recipients != 2 || posts[0].MessageID != "" || posts[0].Subject == "" { + t.Fatalf("posts: %+v %v", posts, err) + } +} diff --git a/internal/router/router.go b/internal/router/router.go index 7e95813..cface5d 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -163,8 +163,13 @@ func postID(data []byte) string { return "sha256:" + hex.EncodeToString(sum[:]) } -// outbound builds one queue entry per recipient. +// outbound builds one queue entry per recipient. A newsletter (post policy publishers) is sent +// with priority 1, so that its many deliveries never delay discussion mail. func (r *Router) outbound(res Result) ([]store.NewOutbound, error) { + priority := 0 + if res.List.PostPolicy == store.PostPublishers { + priority = 1 + } items := make([]store.NewOutbound, 0, len(res.Recipients)) for _, rc := range res.Recipients { from := r.bounceAddress(res.List, rc.ID) @@ -172,7 +177,7 @@ func (r *Router) outbound(res Result) ([]store.NewOutbound, error) { return nil, errors.New("cannot create bounce address") } items = append(items, store.NewOutbound{ - From: from, Rcpt: rc.Address, MemberID: rc.ID, Prefix: r.unsubscribeHeaders(res.List, rc.ID), + From: from, Rcpt: rc.Address, MemberID: rc.ID, Prefix: r.unsubscribeHeaders(res.List, rc.ID), Priority: priority, }) } return items, nil