Add nested posts UI cutover.

Render reply trees with permission-aware inline controls, and move hunt, profile, voting, submission, and hiding flows to post storage.

.env.example

@@ -18,7 +18,7 @@ SECURE_COOKIE=0
 # RESEND_API_KEY=re_xxxxxxxxx
 # RESEND_FROM=Ask a Plumber <notify@yourdomain.com>
 # Public site origin used in email links (required when Resend is enabled):
-# APP_BASE_URL=https://www.askaplumberfirst.com
+# APP_BASE_URL=https://askaplumber.example
 # DigitalOcean Spaces (profile avatars). Leave unset to disable uploads.
 # SPACES_KEY=
 # SPACES_SECRET=

internal/mail/mail.go

@@ -5,7 +5,6 @@ import (
 	_ "embed"
 	"fmt"
 	"html"
-	"net/url"
 	"os"
 	"strings"
 
@@ -15,26 +14,24 @@ import (
 //go:embed mark.png
 var markPNG []byte
 
-// PostReply is the payload for notifying a post author of a direct reply.
-type PostReply struct {
-	ToEmail         string
-	ToName          string
-	RootID          string
-	RootTitle       string
-	ReplyID         string
-	ReplyBody       string
-	ReplyAuthorName string
+// QuestionAnswered is the payload for notifying a question author of a reply.
+type QuestionAnswered struct {
+	ToEmail       string
+	ToName        string
+	QuestionID    string
+	QuestionTitle string
+	AnswerBody    string
 }
 
-// Notifier sends transactional email about post replies.
+// Notifier sends transactional email about answered questions.
 type Notifier interface {
-	NotifyPostReply(ctx context.Context, msg PostReply) error
+	NotifyQuestionAnswered(ctx context.Context, msg QuestionAnswered) error
 }
 
 // Nop is a no-op Notifier used when Resend is not configured.
 type Nop struct{}
 
-func (Nop) NotifyPostReply(context.Context, PostReply) error { return nil }
+func (Nop) NotifyQuestionAnswered(context.Context, QuestionAnswered) error { return nil }
 
 // Resend sends via the Resend HTTP API.
 type Resend struct {
@@ -65,7 +62,7 @@ func FromEnv() (Notifier, error) {
 	}, nil
 }
 
-func (r *Resend) NotifyPostReply(ctx context.Context, msg PostReply) error {
+func (r *Resend) NotifyQuestionAnswered(ctx context.Context, msg QuestionAnswered) error {
 	if r == nil || r.client == nil {
 		return nil
 	}
@@ -73,72 +70,59 @@ func (r *Resend) NotifyPostReply(ctx context.Context, msg PostReply) error {
 	if to == "" {
 		return nil
 	}
-	text, htmlBody := postReplyContent(r.baseURL, msg)
+	text, htmlBody := questionAnsweredContent(r.baseURL, msg)
 	params := &resend.SendEmailRequest{
 		From:    r.from,
 		To:      []string{to},
-		Subject: "New reply to your post",
+		Subject: "Your question was answered",
 		Text:    text,
 		Html:    htmlBody,
 		Attachments: []*resend.Attachment{{
 			Content:     markPNG,
 			Filename:    "ask-a-plumber-first.png",
 			ContentType: "image/png",
-			ContentId:   "reply-notification-mark",
+			ContentId:   "answer-notification-mark",
 		}},
 	}
 	opts := &resend.SendEmailOptions{
-		IdempotencyKey: "post-reply:" + msg.ReplyID,
+		IdempotencyKey: "answer-notify:" + msg.QuestionID,
 	}
 	_, err := r.client.Emails.SendWithOptions(ctx, params, opts)
 	return err
 }
 
-func postReplyContent(baseURL string, msg PostReply) (string, string) {
-	link := strings.TrimRight(baseURL, "/") +
-		"/questions/" + url.PathEscape(msg.RootID) +
-		"#post-" + url.PathEscape(msg.ReplyID)
-	title := replyRootTitle(msg.RootTitle)
-	author := strings.TrimSpace(msg.ReplyAuthorName)
-	if author == "" {
-		author = "Someone"
+func questionAnsweredContent(baseURL string, msg QuestionAnswered) (string, string) {
+	link := strings.TrimRight(baseURL, "/") + "/questions/" + msg.QuestionID
+	title := strings.TrimSpace(msg.QuestionTitle)
+	if title == "" {
+		title = "your question"
 	}
 	text := fmt.Sprintf(
-		"Hi%s,\n\n%s replied in %q:\n\n%s\n\nView the reply:\n%s\n",
+		"Hi%s,\n\nYour question %q has an answer from a plumber:\n\n%s\n\nView it here:\n%s\n",
 		greetingName(msg.ToName),
-		author,
 		title,
-		msg.ReplyBody,
+		msg.AnswerBody,
 		link,
 	)
 	htmlBody := strings.NewReplacer(
-		"{{PREHEADER}}", html.EscapeString(author+" replied in "+title+"."),
+		"{{PREHEADER}}", html.EscapeString("A plumber answered "+title+"."),
 		"{{GREETING}}", html.EscapeString(greetingName(msg.ToName)),
 		"{{TITLE}}", html.EscapeString(title),
-		"{{AUTHOR}}", html.EscapeString(author),
-		"{{REPLY}}", html.EscapeString(msg.ReplyBody),
+		"{{ANSWER}}", html.EscapeString(msg.AnswerBody),
 		"{{LINK}}", html.EscapeString(link),
-		"{{MARK}}", "cid:reply-notification-mark",
-	).Replace(postReplyHTML)
+		"{{MARK}}", "cid:answer-notification-mark",
+	).Replace(questionAnsweredHTML)
 	return text, htmlBody
 }
 
-func replyRootTitle(title string) string {
-	title = strings.TrimSpace(title)
-	if title == "" {
-		return "your conversation"
-	}
-	return title
-}
-
-const postReplyHTML = `<!doctype html>
+const questionAnsweredHTML = `<!doctype html>
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="color-scheme" content="dark">
   <meta name="supported-color-schemes" content="dark">
-  <title>New reply to your conversation</title>
+  <title>Your question was answered</title>
 </head>
 <body style="margin:0;padding:0;background:#161719;color:#ecebe7;font-family:Arial,'Helvetica Neue',sans-serif;">
   <div style="display:none;max-height:0;overflow:hidden;opacity:0;color:transparent;">{{PREHEADER}}</div>
@@ -163,22 +147,22 @@ const postReplyHTML = `<!doctype html>
           </tr>
           <tr>
             <td style="padding:30px 28px 32px;">
-              <div style="margin:0 0 10px;color:#e96a26;font-family:'Courier New',monospace;font-size:11px;font-weight:700;line-height:1.4;letter-spacing:1.8px;text-transform:uppercase;">New reply</div>
-              <h1 style="margin:0;color:#ecebe7;font-size:28px;font-weight:600;line-height:1.2;letter-spacing:-0.4px;">The conversation has a new reply.</h1>
-              <p style="margin:18px 0 0;color:#b8babf;font-size:16px;line-height:1.6;">Hi{{GREETING}}, {{AUTHOR}} replied in:</p>
+              <div style="margin:0 0 10px;color:#e96a26;font-family:'Courier New',monospace;font-size:11px;font-weight:700;line-height:1.4;letter-spacing:1.8px;text-transform:uppercase;">Shop response</div>
+              <h1 style="margin:0;color:#ecebe7;font-size:28px;font-weight:600;line-height:1.2;letter-spacing:-0.4px;">Your question has an answer.</h1>
+              <p style="margin:18px 0 0;color:#b8babf;font-size:16px;line-height:1.6;">Hi{{GREETING}}, a plumber replied to:</p>
               <p style="margin:8px 0 0;color:#ecebe7;font-size:17px;font-weight:600;line-height:1.45;">“{{TITLE}}”</p>
               <table role="presentation" width="100%" cellspacing="0" cellpadding="0" border="0" style="width:100%;margin-top:24px;background:#161719;border:1px solid #2e3136;border-radius:3px;">
                 <tr>
                   <td style="padding:20px 18px;">
-                    <div style="margin:0 0 10px;color:#8d9096;font-family:'Courier New',monospace;font-size:10px;font-weight:700;line-height:1.4;letter-spacing:1.5px;text-transform:uppercase;">The reply</div>
-                    <div style="margin:0;color:#ecebe7;font-size:16px;line-height:1.65;white-space:pre-wrap;">{{REPLY}}</div>
+                    <div style="margin:0 0 10px;color:#8d9096;font-family:'Courier New',monospace;font-size:10px;font-weight:700;line-height:1.4;letter-spacing:1.5px;text-transform:uppercase;">The answer</div>
+                    <div style="margin:0;color:#ecebe7;font-size:16px;line-height:1.65;white-space:pre-wrap;">{{ANSWER}}</div>
                   </td>
                 </tr>
               </table>
               <table role="presentation" cellspacing="0" cellpadding="0" border="0" style="margin-top:26px;">
                 <tr>
                   <td bgcolor="#e96a26" style="border-radius:3px;">
-                    <a href="{{LINK}}" style="display:inline-block;padding:13px 18px;color:#161719;font-family:'Courier New',monospace;font-size:12px;font-weight:700;line-height:1;text-decoration:none;letter-spacing:0.8px;text-transform:uppercase;">View the reply&nbsp;&rarr;</a>
+                    <a href="{{LINK}}" style="display:inline-block;padding:13px 18px;color:#161719;font-family:'Courier New',monospace;font-size:12px;font-weight:700;line-height:1;text-decoration:none;letter-spacing:0.8px;text-transform:uppercase;">View the answer&nbsp;&rarr;</a>
                   </td>
                 </tr>
               </table>
@@ -186,7 +170,7 @@ const postReplyHTML = `<!doctype html>
           </tr>
           <tr>
             <td style="padding:18px 28px;border-top:1px solid #2e3136;color:#8d9096;font-family:'Courier New',monospace;font-size:10px;line-height:1.6;letter-spacing:0.4px;">
-              You received this because someone replied to your post on Ask a Plumber First.
+              You received this because you asked a question on Ask a Plumber First.
             </td>
           </tr>
         </table>

internal/mail/mail_test.go

@@ -14,27 +14,24 @@ func TestEmbeddedMarkIsPNG(t *testing.T) {
 	}
 }
 
-func TestPostReplyContent(t *testing.T) {
+func TestQuestionAnsweredContent(t *testing.T) {
 	t.Parallel()
 
-	text, htmlBody := postReplyContent("https://www.askaplumberfirst.com/", PostReply{
-		ToName:          `<Sam & Pat>`,
-		RootID:          "question-123",
-		RootTitle:       `<b>Leaky sink</b>`,
-		ReplyID:         "reply-456",
-		ReplyBody:       "Replace the cartridge.\nThen test the handle. <script>alert('x')</script>",
-		ReplyAuthorName: `<Jo & Co>`,
+	text, htmlBody := questionAnsweredContent("https://plumber.example/", QuestionAnswered{
+		ToName:        `<Sam & Pat>`,
+		QuestionID:    "question-123",
+		QuestionTitle: `<b>Leaky sink</b>`,
+		AnswerBody:    "Replace the cartridge.\nThen test the handle. <script>alert('x')</script>",
 	})
 
 	for _, want := range []string{
 		"Ask a Plumber First",
-		"New reply",
-		"cid:reply-notification-mark",
-		"https://www.askaplumberfirst.com/questions/question-123#post-reply-456",
+		"Shop response",
+		"cid:answer-notification-mark",
+		"https://plumber.example/questions/question-123",
 		"white-space:pre-wrap",
 		"&lt;Sam &amp; Pat&gt;",
 		"&lt;b&gt;Leaky sink&lt;/b&gt;",
-		"&lt;Jo &amp; Co&gt;",
 		"&lt;script&gt;alert(&#39;x&#39;)&lt;/script&gt;",
 	} {
 		if !strings.Contains(htmlBody, want) {
@@ -44,7 +41,6 @@ func TestPostReplyContent(t *testing.T) {
 	for _, unsafe := range []string{
 		"<Sam & Pat>",
 		"<b>Leaky sink</b>",
-		"<Jo & Co>",
 		"<script>alert('x')</script>",
 	} {
 		if strings.Contains(htmlBody, unsafe) {
@@ -56,9 +52,9 @@ func TestPostReplyContent(t *testing.T) {
 	}
 	for _, want := range []string{
 		`Hi <Sam & Pat>,`,
-		`<Jo & Co> replied in "<b>Leaky sink</b>"`,
+		`Your question "<b>Leaky sink</b>"`,
 		"Replace the cartridge.\nThen test the handle.",
-		"https://www.askaplumberfirst.com/questions/question-123#post-reply-456",
+		"https://plumber.example/questions/question-123",
 	} {
 		if !strings.Contains(text, want) {
 			t.Errorf("text missing %q", want)
@@ -66,15 +62,15 @@ func TestPostReplyContent(t *testing.T) {
 	}
 }
 
-func TestPostReplyContentUsesFallbacks(t *testing.T) {
+func TestQuestionAnsweredContentUsesFallbackTitle(t *testing.T) {
 	t.Parallel()
 
-	text, htmlBody := postReplyContent("https://www.askaplumberfirst.com", PostReply{})
-	if !strings.Contains(text, `Someone replied in "your conversation"`) {
+	text, htmlBody := questionAnsweredContent("https://plumber.example", QuestionAnswered{})
+	if !strings.Contains(text, `"your question"`) {
 		t.Errorf("text missing fallback title")
 	}
-	if !strings.Contains(htmlBody, "Someone replied in:</p>") ||
-		!strings.Contains(htmlBody, "“your conversation”") {
-		t.Errorf("HTML missing fallbacks")
+	if !strings.Contains(htmlBody, "a plumber replied to:</p>") ||
+		!strings.Contains(htmlBody, "“your question”") {
+		t.Errorf("HTML missing fallback title")
 	}
 }

internal/mail/recording.go

@@ -8,10 +8,10 @@ import (
 // Recording is a test Notifier that records calls.
 type Recording struct {
 	mu   sync.Mutex
-	Msgs []PostReply
+	Msgs []QuestionAnswered
 }
 
-func (r *Recording) NotifyPostReply(_ context.Context, msg PostReply) error {
+func (r *Recording) NotifyQuestionAnswered(_ context.Context, msg QuestionAnswered) error {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.Msgs = append(r.Msgs, msg)
@@ -25,10 +25,10 @@ func (r *Recording) Len() int {
 }
 
 // Snapshot returns a copy of recorded messages.
-func (r *Recording) Snapshot() []PostReply {
+func (r *Recording) Snapshot() []QuestionAnswered {
 	r.mu.Lock()
 	defer r.mu.Unlock()
-	out := make([]PostReply, len(r.Msgs))
+	out := make([]QuestionAnswered, len(r.Msgs))
 	copy(out, r.Msgs)
 	return out
 }

internal/web/posts.go

@@ -5,15 +5,12 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"log"
 	"net/http"
 	"net/url"
 	"strings"
-	"time"
 
 	"github.com/go-chi/chi/v5"
 
-	"plumber/internal/mail"
 	"plumber/internal/store"
 )
 
@@ -40,7 +37,7 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 		AuthorID: user.ID,
 		Body:     truncateRunes(body, 12000),
 	}
-	var parent, root *store.Post
+	var root *store.Post
 	if parentID == "" {
 		post.Title = truncateRunes(strings.TrimSpace(r.PostFormValue("title")), 120)
 		post.City = truncateRunes(strings.TrimSpace(r.PostFormValue("city")), 80)
@@ -49,7 +46,7 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else {
-		loadedParent, threadRoot, err := s.postAndRoot(r.Context(), parentID)
+		parent, threadRoot, err := s.postAndRoot(r.Context(), parentID)
 		if err != nil {
 			if errors.Is(err, sql.ErrNoRows) {
 				http.NotFound(w, r)
@@ -66,7 +63,6 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "forbidden", http.StatusForbidden)
 			return
 		}
-		parent = loadedParent
 		post.ParentID = &parent.ID
 		root = threadRoot
 	}
@@ -82,9 +78,6 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 	if root == nil {
 		root = post
 	}
-	if parent != nil {
-		s.notifyPostReply(parent, root, post, user)
-	}
 	http.Redirect(
 		w,
 		r,
@@ -93,53 +86,6 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 	)
 }
 
-// notifyPostReply asynchronously emails the direct parent post's author.
-func (s *Server) notifyPostReply(
-	parent *store.Post,
-	root *store.Post,
-	reply *store.Post,
-	replyAuthor *store.User,
-) {
-	if parent == nil ||
-		root == nil ||
-		reply == nil ||
-		replyAuthor == nil ||
-		s.cfg.Mail == nil ||
-		parent.AuthorID == replyAuthor.ID {
-		return
-	}
-	if _, disabled := s.cfg.Mail.(mail.Nop); disabled {
-		return
-	}
-	msg := mail.PostReply{
-		RootID:          root.ID,
-		RootTitle:       root.Title,
-		ReplyID:         reply.ID,
-		ReplyBody:       reply.Body,
-		ReplyAuthorName: replyAuthor.Name,
-	}
-	recipientID := parent.AuthorID
-	go func() {
-		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-		defer cancel()
-		recipient, err := s.store.UserByID(ctx, recipientID)
-		if err != nil {
-			log.Printf("notify reply %s: load recipient: %v", msg.ReplyID, err)
-			return
-		}
-		if recipient == nil || strings.TrimSpace(recipient.Email) == "" {
-			return
-		}
-		msg.ToEmail = recipient.Email
-		msg.ToName = recipient.Name
-		if err := s.cfg.Mail.NotifyPostReply(ctx, msg); err != nil {
-			log.Printf("notify reply %s: %v", msg.ReplyID, err)
-			return
-		}
-		log.Printf("notify reply %s: accepted", msg.ReplyID)
-	}()
-}
-
 // handleEditPost updates only a post's body after verifying that the current
 // homeowner owns it or that an admin is editing an admin-authored post.
 func (s *Server) handleEditPost(w http.ResponseWriter, r *http.Request) {

internal/web/posts_test.go

@@ -7,9 +7,7 @@ import (
 	"net/url"
 	"strings"
 	"testing"
-	"time"
 
-	"plumber/internal/mail"
 	"plumber/internal/pacific"
 	"plumber/internal/store"
 )
@@ -260,127 +258,6 @@ func TestEditPostRoutePermissions(t *testing.T) {
 	}
 }
 
-func TestPostReplyNotifications(t *testing.T) {
-	t.Parallel()
-
-	recording := &mail.Recording{}
-	srv, mem := newTestServer(t, Config{Mail: recording})
-	handler := srv.Handler()
-	homeowner := seedUser(t, mem, uniq("homeowner"), "hunter22", store.RoleUser)
-	admin := seedUser(t, mem, uniq("admin"), "hunter22", store.RoleAdmin)
-	homeownerCookies := loginUser(t, handler, homeowner.Username, "hunter22")
-	adminCookies := loginUser(t, handler, admin.Username, "hunter22")
-	homeownerCSRF := csrfForCookies(t, handler, homeownerCookies)
-	adminCSRF := csrfForCookies(t, handler, adminCookies)
-
-	rec := postForm(handler, "/posts", url.Values{
-		"_csrf": {homeownerCSRF},
-		"title": {"Leaky sink"},
-		"body":  {"Water under the cabinet."},
-	}, homeownerCookies)
-	if rec.Code != http.StatusSeeOther {
-		t.Fatalf("root create status = %d: %s", rec.Code, rec.Body.String())
-	}
-	if recording.Len() != 0 {
-		t.Fatalf("root create sent %d notifications", recording.Len())
-	}
-	roots, err := mem.ListRootPosts(context.Background(), pacific.Today(), homeowner.ID)
-	if err != nil || len(roots) != 1 {
-		t.Fatalf("created roots = %+v, %v", roots, err)
-	}
-	root := roots[0]
-
-	rec = postForm(handler, "/posts", url.Values{
-		"_csrf":     {adminCSRF},
-		"parent_id": {root.ID},
-		"body":      {"Replace the cartridge."},
-	}, adminCookies)
-	if rec.Code != http.StatusSeeOther {
-		t.Fatalf("admin reply status = %d: %s", rec.Code, rec.Body.String())
-	}
-	thread, err := mem.GetPostThread(context.Background(), root.ID)
-	if err != nil || len(thread.Replies) != 1 {
-		t.Fatalf("admin reply thread = %+v, %v", thread, err)
-	}
-	adminReply := thread.Replies[0]
-	msgs := waitForMail(t, recording, 1)
-	if msg := msgs[0]; msg.ToEmail != homeowner.Email ||
-		msg.RootID != root.ID ||
-		msg.RootTitle != root.Title ||
-		msg.ReplyID != adminReply.ID ||
-		msg.ReplyBody != adminReply.Body ||
-		msg.ReplyAuthorName != admin.Name {
-		t.Fatalf("admin reply notification = %+v", msg)
-	}
-
-	rec = postForm(handler, "/posts", url.Values{
-		"_csrf":     {homeownerCSRF},
-		"parent_id": {adminReply.ID},
-		"body":      {"That fixed the drip."},
-	}, homeownerCookies)
-	if rec.Code != http.StatusSeeOther {
-		t.Fatalf("homeowner reply status = %d: %s", rec.Code, rec.Body.String())
-	}
-	thread, err = mem.GetPostThread(context.Background(), root.ID)
-	if err != nil || len(thread.Replies[0].Replies) != 1 {
-		t.Fatalf("homeowner nested reply thread = %+v, %v", thread, err)
-	}
-	homeownerReply := thread.Replies[0].Replies[0]
-	msgs = waitForMail(t, recording, 2)
-	if msg := msgs[1]; msg.ToEmail != admin.Email ||
-		msg.RootID != root.ID ||
-		msg.ReplyID != homeownerReply.ID ||
-		msg.ReplyAuthorName != homeowner.Name {
-		t.Fatalf("homeowner reply notification = %+v", msg)
-	}
-
-	rec = postForm(handler, "/posts", url.Values{
-		"_csrf":     {homeownerCSRF},
-		"parent_id": {root.ID},
-		"body":      {"A note to myself."},
-	}, homeownerCookies)
-	if rec.Code != http.StatusSeeOther {
-		t.Fatalf("self reply status = %d: %s", rec.Code, rec.Body.String())
-	}
-	rec = postForm(handler, "/posts/"+adminReply.ID+"/edit", url.Values{
-		"_csrf": {adminCSRF},
-		"body":  {"Replace the ceramic cartridge."},
-	}, adminCookies)
-	if rec.Code != http.StatusSeeOther {
-		t.Fatalf("edit status = %d: %s", rec.Code, rec.Body.String())
-	}
-
-	noEmail := &store.User{
-		Username:     uniq("no-email"),
-		PasswordHash: homeowner.PasswordHash,
-		Role:         store.RoleUser,
-	}
-	if err := mem.CreateUser(context.Background(), noEmail); err != nil {
-		t.Fatal(err)
-	}
-	noEmailRoot := &store.Post{
-		AuthorID: noEmail.ID,
-		Title:    "Quiet thread",
-		Body:     "No email configured.",
-		PostDate: pacific.Today(),
-	}
-	if err := mem.CreatePost(context.Background(), noEmailRoot); err != nil {
-		t.Fatal(err)
-	}
-	rec = postForm(handler, "/posts", url.Values{
-		"_csrf":     {adminCSRF},
-		"parent_id": {noEmailRoot.ID},
-		"body":      {"This should not send."},
-	}, adminCookies)
-	if rec.Code != http.StatusSeeOther {
-		t.Fatalf("no-email reply status = %d: %s", rec.Code, rec.Body.String())
-	}
-	time.Sleep(50 * time.Millisecond)
-	if recording.Len() != 2 {
-		t.Fatalf("self, edit, or no-email action sent a notification: %+v", recording.Snapshot())
-	}
-}
-
 func TestQuestionPageRendersNestedPostControls(t *testing.T) {
 	t.Parallel()
 
@@ -468,19 +345,6 @@ func TestQuestionPageRendersNestedPostControls(t *testing.T) {
 	}
 }
 
-func waitForMail(t *testing.T, recording *mail.Recording, want int) []mail.PostReply {
-	t.Helper()
-	deadline := time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		if recording.Len() >= want {
-			return recording.Snapshot()
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatalf("recorded %d notifications, want %d", recording.Len(), want)
-	return nil
-}
-
 func csrfForCookies(t *testing.T, handler http.Handler, cookies []*http.Cookie) string {
 	t.Helper()
 	req := httptest.NewRequest(http.MethodGet, "/submit", nil)

internal/web/server.go

@@ -510,7 +510,6 @@ func (s *Server) handleAnswer(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "could not save answer", http.StatusInternalServerError)
 		return
 	}
-	s.notifyPostReply(root, root, reply, u)
 	location := "/questions/" + url.PathEscape(id) + "#post-" + url.PathEscape(reply.ID)
 	if isHTMX(r) {
 		w.Header().Set("HX-Redirect", location)

internal/web/server_test.go

@@ -19,7 +19,6 @@ import (
 
 	"plumber"
 	"plumber/internal/blob"
-	"plumber/internal/mail"
 	"plumber/internal/pacific"
 	"plumber/internal/store"
 )
@@ -484,8 +483,7 @@ func TestProfileAdminAnsweredListAndAvatarUpload(t *testing.T) {
 }
 
 func TestMutationsVoteAnswerHideAndCSRF(t *testing.T) {
-	recording := &mail.Recording{}
-	srv, mem := newTestServer(t, Config{Mail: recording})
+	srv, mem := newTestServer(t, Config{})
 	h := srv.Handler()
 	adminName := uniq("admin")
 	userName := uniq("user")
@@ -613,13 +611,6 @@ func TestMutationsVoteAnswerHideAndCSRF(t *testing.T) {
 	if got := rec.Header().Get("HX-Redirect"); got != "/questions/"+q.ID+"#post-"+adminReply.ID {
 		t.Fatalf("admin answer redirect = %q", got)
 	}
-	msgs := waitForMail(t, recording, 1)
-	if msg := msgs[0]; msg.ToEmail != user.Email ||
-		msg.RootID != q.ID ||
-		msg.ReplyID != adminReply.ID ||
-		msg.ReplyBody != adminReply.Body {
-		t.Fatalf("compatibility reply notification = %+v", msg)
-	}
 
 	rec = httptest.NewRecorder()
 	req = httptest.NewRequest(http.MethodGet, "/questions/"+q.ID, nil)