Merge pull request 'App' (#9) from app into master

Reviewed-on: #9

.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://askaplumber.example
+# APP_BASE_URL=https://www.askaplumberfirst.com
 # DigitalOcean Spaces (profile avatars). Leave unset to disable uploads.
 # SPACES_KEY=
 # SPACES_SECRET=

db/queries/answers.sql

@@ -1,11 +0,0 @@
--- name: UpsertAnswer :exec
-INSERT INTO answers (question_id, author_id, body, created_at, updated_at)
-VALUES ($1, $2, $3, $4, $5)
-ON CONFLICT (question_id) DO UPDATE
-SET body = excluded.body, author_id = excluded.author_id, updated_at = excluded.updated_at;
-
--- name: GetAnswer :one
-SELECT a.question_id, a.author_id, u.name AS author_name, a.body, a.created_at, a.updated_at
-FROM answers a
-JOIN users u ON u.id = a.author_id
-WHERE a.question_id = $1;

db/queries/posts.sql

@@ -44,6 +44,16 @@ FROM thread
 JOIN users u ON u.id = thread.author_id
 ORDER BY thread.created_at, thread.id;
 
+-- name: GetRootPostVoteSummary :one
+SELECT
+  COALESCE(SUM(value), 0)::bigint AS score,
+  COALESCE(
+    MAX(value) FILTER (WHERE user_id = sqlc.arg(viewer_id)),
+    0
+  )::bigint AS user_vote
+FROM post_votes
+WHERE post_id = sqlc.arg(root_id);
+
 -- name: UpdatePost :execrows
 UPDATE posts
 SET
@@ -51,6 +61,14 @@ SET
   updated_at = sqlc.arg(updated_at)
 WHERE id = sqlc.arg(id);
 
+-- name: UpdateRootPostState :execrows
+UPDATE posts
+SET
+  post_state = sqlc.arg(post_state),
+  updated_at = sqlc.arg(updated_at)
+WHERE id = sqlc.arg(id)
+  AND parent_id IS NULL;
+
 -- name: ListRootPosts :many
 WITH RECURSIVE roots AS (
   SELECT p.*
@@ -100,6 +118,46 @@ LEFT JOIN post_votes viewer_vote
 ORDER BY score DESC, roots.created_at, roots.id
 LIMIT sqlc.arg(row_limit);
 
+-- name: ListRootPostsByAuthor :many
+SELECT
+  p.id, p.parent_id, p.author_id,
+  u.name AS author_name, u.role AS author_role,
+  p.title, p.body, p.city, p.post_date,
+  p.post_state, p.created_at, p.updated_at
+FROM posts p
+JOIN users u ON u.id = p.author_id
+WHERE p.parent_id IS NULL
+  AND p.author_id = sqlc.arg(author_id)
+  AND p.post_state <> sqlc.arg(hidden_state)
+ORDER BY p.created_at DESC, p.id DESC
+LIMIT sqlc.arg(row_limit);
+
+-- name: ListRootPostsAnsweredBy :many
+WITH RECURSIVE ancestors AS (
+  SELECT p.id, p.parent_id
+  FROM posts p
+  WHERE p.author_id = sqlc.arg(admin_id)
+    AND p.parent_id IS NOT NULL
+
+  UNION
+
+  SELECT parent.id, parent.parent_id
+  FROM posts parent
+  JOIN ancestors child ON child.parent_id = parent.id
+)
+SELECT DISTINCT
+  root.id, root.parent_id, root.author_id,
+  u.name AS author_name, u.role AS author_role,
+  root.title, root.body, root.city, root.post_date,
+  root.post_state, root.created_at, root.updated_at
+FROM posts root
+JOIN ancestors ON ancestors.id = root.id
+JOIN users u ON u.id = root.author_id
+WHERE root.parent_id IS NULL
+  AND root.post_state <> sqlc.arg(hidden_state)
+ORDER BY root.created_at DESC, root.id DESC
+LIMIT sqlc.arg(row_limit);
+
 -- name: PostIsVisibleRoot :one
 SELECT EXISTS(
   SELECT 1

db/queries/questions.sql

@@ -1,62 +0,0 @@
--- name: CreateQuestion :exec
-INSERT INTO questions (id, author_id, title, body, city, hunt_date, hidden, created_at)
-VALUES ($1, $2, $3, $4, $5, $6, 0, $7);
-
--- name: HideQuestion :exec
-UPDATE questions
-SET hidden = 1
-WHERE id = $1;
-
--- name: ListHunt :many
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE(SUM(v.value), 0)::bigint AS score,
-       CASE WHEN a.question_id IS NULL THEN 0 ELSE 1 END::bigint AS answered,
-       COALESCE((
-         SELECT votes.value FROM votes
-         WHERE votes.user_id = sqlc.arg(viewer_id) AND votes.question_id = q.id
-       ), 0)::bigint AS user_vote
-FROM questions q
-JOIN users u ON u.id = q.author_id
-LEFT JOIN votes v ON v.question_id = q.id
-LEFT JOIN answers a ON a.question_id = q.id
-WHERE q.hunt_date = sqlc.arg(hunt_date) AND q.hidden = 0
-GROUP BY q.id, q.author_id, u.name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at, a.question_id
-ORDER BY score DESC, q.created_at ASC
-LIMIT sqlc.arg(row_limit);
-
--- name: GetQuestion :one
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE((SELECT SUM(votes.value) FROM votes WHERE votes.question_id = q.id), 0)::bigint AS score,
-       CASE WHEN a.question_id IS NULL THEN 0 ELSE 1 END::bigint AS answered,
-       COALESCE((
-         SELECT votes.value FROM votes
-         WHERE votes.user_id = sqlc.arg(viewer_id) AND votes.question_id = q.id
-       ), 0)::bigint AS user_vote
-FROM questions q
-JOIN users u ON u.id = q.author_id
-LEFT JOIN answers a ON a.question_id = q.id
-WHERE q.id = sqlc.arg(id);
-
--- name: ListQuestionsByAuthor :many
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE((SELECT SUM(votes.value) FROM votes WHERE votes.question_id = q.id), 0)::bigint AS score,
-       CASE WHEN a.question_id IS NULL THEN 0 ELSE 1 END::bigint AS answered,
-       0::bigint AS user_vote
-FROM questions q
-JOIN users u ON u.id = q.author_id
-LEFT JOIN answers a ON a.question_id = q.id
-WHERE q.author_id = sqlc.arg(author_id) AND q.hidden = 0
-ORDER BY q.created_at DESC
-LIMIT sqlc.arg(row_limit);
-
--- name: ListQuestionsAnsweredBy :many
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE((SELECT SUM(votes.value) FROM votes WHERE votes.question_id = q.id), 0)::bigint AS score,
-       1::bigint AS answered,
-       0::bigint AS user_vote
-FROM answers ans
-JOIN questions q ON q.id = ans.question_id
-JOIN users u ON u.id = q.author_id
-WHERE ans.author_id = sqlc.arg(admin_id) AND q.hidden = 0
-ORDER BY ans.updated_at DESC
-LIMIT sqlc.arg(row_limit);

db/queries/votes.sql

@@ -1,24 +0,0 @@
--- name: GetVote :one
-SELECT value
-FROM votes
-WHERE user_id = $1 AND question_id = $2;
-
--- name: QuestionIsVisible :one
-SELECT EXISTS(
-  SELECT 1 FROM questions WHERE id = $1 AND hidden = 0
-)::bool;
-
--- name: DeleteVote :exec
-DELETE FROM votes
-WHERE user_id = $1 AND question_id = $2;
-
--- name: UpsertVoteOnVisible :execrows
-INSERT INTO votes (user_id, question_id, value)
-SELECT $1, $2, $3
-FROM questions q
-WHERE q.id = $2 AND q.hidden = 0
-ON CONFLICT (user_id, question_id) DO UPDATE
-SET value = excluded.value
-WHERE EXISTS (
-  SELECT 1 FROM questions q2 WHERE q2.id = excluded.question_id AND q2.hidden = 0
-);

internal/mail/mail.go

@@ -5,6 +5,7 @@ import (
 	_ "embed"
 	"fmt"
 	"html"
+	"net/url"
 	"os"
 	"strings"
 
@@ -14,24 +15,26 @@ import (
 //go:embed mark.png
 var markPNG []byte
 
-// QuestionAnswered is the payload for notifying a question author of a reply.
+// PostReply is the payload for notifying a post author of a direct reply.
-type QuestionAnswered struct {
+type PostReply struct {
-	ToEmail       string
+	ToEmail         string
-	ToName        string
+	ToName          string
-	QuestionID    string
+	RootID          string
-	QuestionTitle string
+	RootTitle       string
-	AnswerBody    string
+	ReplyID         string
+	ReplyBody       string
+	ReplyAuthorName string
 }
 
-// Notifier sends transactional email about answered questions.
+// Notifier sends transactional email about post replies.
 type Notifier interface {
-	NotifyQuestionAnswered(ctx context.Context, msg QuestionAnswered) error
+	NotifyPostReply(ctx context.Context, msg PostReply) error
 }
 
 // Nop is a no-op Notifier used when Resend is not configured.
 type Nop struct{}
 
-func (Nop) NotifyQuestionAnswered(context.Context, QuestionAnswered) error { return nil }
+func (Nop) NotifyPostReply(context.Context, PostReply) error { return nil }
 
 // Resend sends via the Resend HTTP API.
 type Resend struct {
@@ -62,7 +65,7 @@ func FromEnv() (Notifier, error) {
 	}, nil
 }
 
-func (r *Resend) NotifyQuestionAnswered(ctx context.Context, msg QuestionAnswered) error {
+func (r *Resend) NotifyPostReply(ctx context.Context, msg PostReply) error {
 	if r == nil || r.client == nil {
 		return nil
 	}
@@ -70,59 +73,72 @@ func (r *Resend) NotifyQuestionAnswered(ctx context.Context, msg QuestionAnswere
 	if to == "" {
 		return nil
 	}
-	text, htmlBody := questionAnsweredContent(r.baseURL, msg)
+	text, htmlBody := postReplyContent(r.baseURL, msg)
 	params := &resend.SendEmailRequest{
 		From:    r.from,
 		To:      []string{to},
-		Subject: "Your question was answered",
+		Subject: "New reply to your post",
 		Text:    text,
 		Html:    htmlBody,
 		Attachments: []*resend.Attachment{{
 			Content:     markPNG,
 			Filename:    "ask-a-plumber-first.png",
 			ContentType: "image/png",
-			ContentId:   "answer-notification-mark",
+			ContentId:   "reply-notification-mark",
 		}},
 	}
 	opts := &resend.SendEmailOptions{
-		IdempotencyKey: "answer-notify:" + msg.QuestionID,
+		IdempotencyKey: "post-reply:" + msg.ReplyID,
 	}
 	_, err := r.client.Emails.SendWithOptions(ctx, params, opts)
 	return err
 }
 
-func questionAnsweredContent(baseURL string, msg QuestionAnswered) (string, string) {
+func postReplyContent(baseURL string, msg PostReply) (string, string) {
-	link := strings.TrimRight(baseURL, "/") + "/questions/" + msg.QuestionID
+	link := strings.TrimRight(baseURL, "/") +
-	title := strings.TrimSpace(msg.QuestionTitle)
+		"/questions/" + url.PathEscape(msg.RootID) +
-	if title == "" {
+		"#post-" + url.PathEscape(msg.ReplyID)
-		title = "your question"
+	title := replyRootTitle(msg.RootTitle)
+	author := strings.TrimSpace(msg.ReplyAuthorName)
+	if author == "" {
+		author = "Someone"
 	}
 	text := fmt.Sprintf(
-		"Hi%s,\n\nYour question %q has an answer from a plumber:\n\n%s\n\nView it here:\n%s\n",
+		"Hi%s,\n\n%s replied in %q:\n\n%s\n\nView the reply:\n%s\n",
 		greetingName(msg.ToName),
+		author,
 		title,
-		msg.AnswerBody,
+		msg.ReplyBody,
 		link,
 	)
 	htmlBody := strings.NewReplacer(
-		"{{PREHEADER}}", html.EscapeString("A plumber answered "+title+"."),
+		"{{PREHEADER}}", html.EscapeString(author+" replied in "+title+"."),
 		"{{GREETING}}", html.EscapeString(greetingName(msg.ToName)),
 		"{{TITLE}}", html.EscapeString(title),
-		"{{ANSWER}}", html.EscapeString(msg.AnswerBody),
+		"{{AUTHOR}}", html.EscapeString(author),
+		"{{REPLY}}", html.EscapeString(msg.ReplyBody),
 		"{{LINK}}", html.EscapeString(link),
-		"{{MARK}}", "cid:answer-notification-mark",
+		"{{MARK}}", "cid:reply-notification-mark",
-	).Replace(questionAnsweredHTML)
+	).Replace(postReplyHTML)
 	return text, htmlBody
 }
 
-const questionAnsweredHTML = `<!doctype html>
+func replyRootTitle(title string) string {
+	title = strings.TrimSpace(title)
+	if title == "" {
+		return "your conversation"
+	}
+	return title
+}
+
+const postReplyHTML = `<!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>Your question was answered</title>
+  <title>New reply to your conversation</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>
@@ -147,22 +163,22 @@ const questionAnsweredHTML = `<!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;">Shop response</div>
+              <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;">Your question has an answer.</h1>
+              <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}}, a plumber replied to:</p>
+              <p style="margin:18px 0 0;color:#b8babf;font-size:16px;line-height:1.6;">Hi{{GREETING}}, {{AUTHOR}} replied in:</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 answer</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 reply</div>
-                    <div style="margin:0;color:#ecebe7;font-size:16px;line-height:1.65;white-space:pre-wrap;">{{ANSWER}}</div>
+                    <div style="margin:0;color:#ecebe7;font-size:16px;line-height:1.65;white-space:pre-wrap;">{{REPLY}}</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 answer&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 reply&nbsp;&rarr;</a>
                   </td>
                 </tr>
               </table>
@@ -170,7 +186,7 @@ const questionAnsweredHTML = `<!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 you asked a question on Ask a Plumber First.
+              You received this because someone replied to your post on Ask a Plumber First.
             </td>
           </tr>
         </table>

internal/mail/mail_test.go

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

internal/mail/recording.go

@@ -8,10 +8,10 @@ import (
 // Recording is a test Notifier that records calls.
 type Recording struct {
 	mu   sync.Mutex
-	Msgs []QuestionAnswered
+	Msgs []PostReply
 }
 
-func (r *Recording) NotifyQuestionAnswered(_ context.Context, msg QuestionAnswered) error {
+func (r *Recording) NotifyPostReply(_ context.Context, msg PostReply) 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() []QuestionAnswered {
+func (r *Recording) Snapshot() []PostReply {
 	r.mu.Lock()
 	defer r.mu.Unlock()
-	out := make([]QuestionAnswered, len(r.Msgs))
+	out := make([]PostReply, len(r.Msgs))
 	copy(out, r.Msgs)
 	return out
 }

internal/store/answer.go

@@ -1,63 +0,0 @@
-package store
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-	"strings"
-	"time"
-
-	"plumber/internal/store/sqlc"
-)
-
-// Answer is an admin reply to a question.
-type Answer struct {
-	QuestionID string
-	AuthorID   string
-	AuthorName string
-	Body       string
-	CreatedAt  string
-	UpdatedAt  string
-	db         *sql.DB
-}
-
-// NewAnswer returns an Answer bound to db.
-func NewAnswer(db *sql.DB) *Answer {
-	return &Answer{db: db}
-}
-
-// Upsert inserts or updates the answer for QuestionID.
-func (a *Answer) Upsert(ctx context.Context) error {
-	if a == nil || a.db == nil {
-		return fmt.Errorf("answer: no database")
-	}
-	a.Body = strings.TrimSpace(a.Body)
-	now := time.Now().UTC().Format(time.RFC3339)
-	if a.CreatedAt == "" {
-		a.CreatedAt = now
-	}
-	a.UpdatedAt = now
-	return sqlc.New(a.db).UpsertAnswer(ctx, sqlc.UpsertAnswerParams{
-		QuestionID: a.QuestionID,
-		AuthorID:   a.AuthorID,
-		Body:       a.Body,
-		CreatedAt:  a.CreatedAt,
-		UpdatedAt:  a.UpdatedAt,
-	})
-}
-
-func GetAnswer(ctx context.Context, db *sql.DB, questionID string) (*Answer, error) {
-	r, err := sqlc.New(db).GetAnswer(ctx, questionID)
-	if err != nil {
-		return nil, err
-	}
-	return &Answer{
-		QuestionID: r.QuestionID,
-		AuthorID:   r.AuthorID,
-		AuthorName: r.AuthorName,
-		Body:       r.Body,
-		CreatedAt:  r.CreatedAt,
-		UpdatedAt:  r.UpdatedAt,
-		db:         db,
-	}, nil
-}

internal/store/memory.go

@@ -10,20 +10,15 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-
-	"plumber/internal/pacific"
 )
 
 // Memory is an in-process Store for tests.
 type Memory struct {
 	mu        sync.Mutex
-	users     map[string]*User           // id -> user
+	users     map[string]*User          // id -> user
-	byName    map[string]string          // username -> id
+	byName    map[string]string         // username -> id
-	questions map[string]*RankedQuestion // id -> question
+	posts     map[string]*Post          // id -> post
-	answers   map[string]*Answer         // questionID -> answer
+	postVotes map[string]map[string]int // postID -> userID -> value
-	votes     map[string]map[string]int  // questionID -> userID -> value
-	posts     map[string]*Post           // id -> post
-	postVotes map[string]map[string]int  // postID -> userID -> value
 }
 
 // NewMemory returns an empty Memory store.
@@ -31,9 +26,6 @@ func NewMemory() *Memory {
 	return &Memory{
 		users:     map[string]*User{},
 		byName:    map[string]string{},
-		questions: map[string]*RankedQuestion{},
-		answers:   map[string]*Answer{},
-		votes:     map[string]map[string]int{},
 		posts:     map[string]*Post{},
 		postVotes: map[string]map[string]int{},
 	}
@@ -210,172 +202,6 @@ func (m *Memory) SaveUserProfile(_ context.Context, u *User) error {
 	return nil
 }
 
-func (m *Memory) CreateQuestion(_ context.Context, q *RankedQuestion) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	q.Title = strings.TrimSpace(q.Title)
-	q.Body = strings.TrimSpace(q.Body)
-	q.City = strings.TrimSpace(q.City)
-	if q.ID == "" {
-		q.ID = uuid.NewString()
-	}
-	if q.HuntDate == "" {
-		q.HuntDate = pacific.Today()
-	}
-	if q.CreatedAt == "" {
-		q.CreatedAt = time.Now().UTC().Format(time.RFC3339)
-	}
-	author, ok := m.users[q.AuthorID]
-	if !ok {
-		return fmt.Errorf("unknown author")
-	}
-	cp := *q
-	cp.AuthorName = author.Name
-	cp.db = nil
-	m.questions[cp.ID] = &cp
-	*q = cp
-	return nil
-}
-
-func (m *Memory) annotate(q *RankedQuestion, viewerID string) RankedQuestion {
-	out := *q
-	score := 0
-	userVote := 0
-	if votes, ok := m.votes[q.ID]; ok {
-		for uid, v := range votes {
-			score += v
-			if uid == viewerID {
-				userVote = v
-			}
-		}
-	}
-	_, answered := m.answers[q.ID]
-	out.Score = score
-	out.Answered = answered
-	out.UserVote = userVote
-	out.db = nil
-	return out
-}
-
-func (m *Memory) GetQuestion(_ context.Context, id, viewerID string) (*RankedQuestion, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	q, ok := m.questions[id]
-	if !ok {
-		return nil, sql.ErrNoRows
-	}
-	out := m.annotate(q, viewerID)
-	return &out, nil
-}
-
-func (m *Memory) ListHunt(_ context.Context, huntDate, viewerID string) ([]RankedQuestion, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	out := make([]RankedQuestion, 0)
-	for _, q := range m.questions {
-		if q.HuntDate != huntDate || q.Hidden {
-			continue
-		}
-		out = append(out, m.annotate(q, viewerID))
-	}
-	sort.Slice(out, func(i, j int) bool {
-		if out[i].Score != out[j].Score {
-			return out[i].Score > out[j].Score
-		}
-		return out[i].CreatedAt < out[j].CreatedAt
-	})
-	if len(out) > HuntListLimit {
-		out = out[:HuntListLimit]
-	}
-	return out, nil
-}
-
-func (m *Memory) ListQuestionsByAuthor(_ context.Context, authorID string) ([]RankedQuestion, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	out := make([]RankedQuestion, 0)
-	for _, q := range m.questions {
-		if q.AuthorID != authorID || q.Hidden {
-			continue
-		}
-		out = append(out, m.annotate(q, ""))
-	}
-	sort.Slice(out, func(i, j int) bool { return out[i].CreatedAt > out[j].CreatedAt })
-	if len(out) > ProfileListLimit {
-		out = out[:ProfileListLimit]
-	}
-	return out, nil
-}
-
-func (m *Memory) ListQuestionsAnsweredBy(_ context.Context, adminID string) ([]RankedQuestion, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	out := make([]RankedQuestion, 0)
-	for qid, a := range m.answers {
-		if a.AuthorID != adminID {
-			continue
-		}
-		q, ok := m.questions[qid]
-		if !ok || q.Hidden {
-			continue
-		}
-		rq := m.annotate(q, "")
-		rq.Answered = true
-		out = append(out, rq)
-	}
-	sort.Slice(out, func(i, j int) bool { return out[i].CreatedAt > out[j].CreatedAt })
-	if len(out) > ProfileListLimit {
-		out = out[:ProfileListLimit]
-	}
-	return out, nil
-}
-
-func (m *Memory) HideQuestion(_ context.Context, id string) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	q, ok := m.questions[id]
-	if !ok {
-		return sql.ErrNoRows
-	}
-	q.Hidden = true
-	return nil
-}
-
-func (m *Memory) GetAnswer(_ context.Context, questionID string) (*Answer, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	a, ok := m.answers[questionID]
-	if !ok {
-		return nil, sql.ErrNoRows
-	}
-	cp := *a
-	if u, ok := m.users[a.AuthorID]; ok {
-		cp.AuthorName = u.Name
-	}
-	return &cp, nil
-}
-
-func (m *Memory) UpsertAnswer(_ context.Context, a *Answer) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if _, ok := m.questions[a.QuestionID]; !ok {
-		return fmt.Errorf("unknown question")
-	}
-	a.Body = strings.TrimSpace(a.Body)
-	now := time.Now().UTC().Format(time.RFC3339)
-	if existing, ok := m.answers[a.QuestionID]; ok {
-		a.CreatedAt = existing.CreatedAt
-	} else if a.CreatedAt == "" {
-		a.CreatedAt = now
-	}
-	a.UpdatedAt = now
-	cp := *a
-	cp.db = nil
-	m.answers[a.QuestionID] = &cp
-	*a = cp
-	return nil
-}
-
 func (m *Memory) CreatePost(_ context.Context, post *Post) error {
 	if post == nil {
 		return fmt.Errorf("%w: post is nil", ErrInvalidPost)
@@ -438,6 +264,21 @@ func (m *Memory) GetPostThread(_ context.Context, rootID string) (*Post, error)
 	return buildPostTree(posts, rootID)
 }
 
+func (m *Memory) GetPostThreadForViewer(ctx context.Context, rootID, viewerID string) (*Post, error) {
+	root, err := m.GetPostThread(ctx, rootID)
+	if err != nil {
+		return nil, err
+	}
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	for _, value := range m.postVotes[rootID] {
+		root.Score += value
+	}
+	root.UserVote = m.postVotes[rootID][viewerID]
+	root.Answered = m.threadContainsAdminReply(rootID)
+	return root, nil
+}
+
 func (m *Memory) UpdatePost(_ context.Context, post *Post) error {
 	if post == nil {
 		return fmt.Errorf("%w: post is nil", ErrInvalidPost)
@@ -489,6 +330,73 @@ func (m *Memory) ListRootPosts(_ context.Context, postDate, viewerID string) ([]
 	return posts, nil
 }
 
+func (m *Memory) ListRootPostsByAuthor(_ context.Context, authorID string) ([]Post, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	posts := make([]Post, 0)
+	for _, post := range m.posts {
+		if post.ParentID != nil ||
+			post.AuthorID != authorID ||
+			post.PostState == PostStateHidden {
+			continue
+		}
+		posts = append(posts, *clonePostWithAuthor(post, m.users))
+	}
+	return sortProfilePosts(posts), nil
+}
+
+func (m *Memory) ListRootPostsAnsweredBy(_ context.Context, adminID string) ([]Post, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	posts := make([]Post, 0)
+	for _, root := range m.posts {
+		if root.ParentID != nil || root.PostState == PostStateHidden {
+			continue
+		}
+		participated := false
+		for _, post := range m.posts {
+			if post.AuthorID == adminID && m.postIsDescendantOf(post, root.ID) {
+				participated = true
+				break
+			}
+		}
+		if participated {
+			posts = append(posts, *clonePostWithAuthor(root, m.users))
+		}
+	}
+	return sortProfilePosts(posts), nil
+}
+
+func (m *Memory) SetRootPostState(_ context.Context, id string, state PostState) error {
+	switch state {
+	case PostStateVisible, PostStateHidden, PostStateLocked:
+	default:
+		return fmt.Errorf("%w: invalid post state", ErrInvalidPost)
+	}
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	post, ok := m.posts[id]
+	if !ok || post.ParentID != nil {
+		return sql.ErrNoRows
+	}
+	post.PostState = state
+	post.UpdatedAt = time.Now().UTC().Format(time.RFC3339Nano)
+	return nil
+}
+
+func sortProfilePosts(posts []Post) []Post {
+	sort.Slice(posts, func(i, j int) bool {
+		if posts[i].CreatedAt != posts[j].CreatedAt {
+			return posts[i].CreatedAt > posts[j].CreatedAt
+		}
+		return posts[i].ID > posts[j].ID
+	})
+	if len(posts) > ProfileListLimit {
+		posts = posts[:ProfileListLimit]
+	}
+	return posts
+}
+
 func (m *Memory) VotePost(_ context.Context, userID, postID string, value int) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -555,24 +463,3 @@ func clonePostWithAuthor(post *Post, users map[string]*User) *Post {
 	}
 	return cp
 }
-
-func (m *Memory) Vote(_ context.Context, userID, questionID string, value int) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if value != 1 && value != -1 && value != 0 {
-		return fmt.Errorf("invalid vote")
-	}
-	q, ok := m.questions[questionID]
-	if !ok || q.Hidden {
-		return ErrHiddenOrMissing
-	}
-	if m.votes[questionID] == nil {
-		m.votes[questionID] = map[string]int{}
-	}
-	if value == 0 {
-		delete(m.votes[questionID], userID)
-		return nil
-	}
-	m.votes[questionID][userID] = value
-	return nil
-}

internal/store/migrate.go

@@ -35,13 +35,11 @@ CREATE UNIQUE INDEX IF NOT EXISTS users_email_lower_uidx
 	return nil
 }
 
-// migratePosts creates the unified post model and snapshots legacy content.
+// migratePosts creates the unified post model.
-// Legacy tables remain in place until the application cutover is complete.
 func migratePosts(ctx context.Context, exec execContext) error {
 	steps := []struct {
 		name string
 		sql  string
-		args []any
 	}{
 		{name: "create posts", sql: `
 CREATE TABLE IF NOT EXISTS posts (
@@ -64,6 +62,9 @@ CREATE TABLE IF NOT EXISTS posts (
 		{name: "index post replies", sql: `
 CREATE INDEX IF NOT EXISTS idx_posts_parent_created
   ON posts(parent_id, created_at, id)`},
+		{name: "index post authors", sql: `
+CREATE INDEX IF NOT EXISTS idx_posts_author_created
+  ON posts(author_id, created_at DESC, id DESC)`},
 		{name: "index root posts", sql: `
 CREATE INDEX IF NOT EXISTS idx_posts_root_date
   ON posts(post_date, post_state)
@@ -75,33 +76,9 @@ CREATE TABLE IF NOT EXISTS post_votes (
   value INTEGER NOT NULL CHECK (value IN (-1, 1)),
   PRIMARY KEY (user_id, post_id)
 )`},
-		{name: "copy questions", sql: `
-INSERT INTO posts (
-  id, parent_id, author_id, title, body, city, post_date, post_state, created_at, updated_at
-)
-SELECT
-  id, NULL, author_id, title, body, city, hunt_date,
-  CASE WHEN hidden = 0 THEN $1 ELSE $2 END,
-  created_at, created_at
-FROM questions
-ON CONFLICT (id) DO NOTHING`, args: []any{string(PostStateVisible), string(PostStateHidden)}},
-		{name: "copy answers", sql: `
-INSERT INTO posts (
-  id, parent_id, author_id, title, body, city, post_date, post_state, created_at, updated_at
-)
-SELECT
-  'answer:' || question_id, question_id, author_id, '', body, '', '',
-  $1, created_at, updated_at
-FROM answers
-ON CONFLICT (id) DO NOTHING`, args: []any{string(PostStateVisible)}},
-		{name: "copy votes", sql: `
-INSERT INTO post_votes (user_id, post_id, value)
-SELECT user_id, question_id, value
-FROM votes
-ON CONFLICT (user_id, post_id) DO NOTHING`},
 	}
 	for _, step := range steps {
-		if _, err := exec.ExecContext(ctx, step.sql, step.args...); err != nil {
+		if _, err := exec.ExecContext(ctx, step.sql); err != nil {
 			return fmt.Errorf("%s: %w", step.name, err)
 		}
 	}
@@ -117,6 +94,32 @@ CREATE INDEX IF NOT EXISTS idx_post_votes_post_id
 	return nil
 }
 
+func migratePostAuthorIndex(ctx context.Context, exec execContext) error {
+	if _, err := exec.ExecContext(ctx, `
+CREATE INDEX IF NOT EXISTS idx_posts_author_created
+  ON posts(author_id, created_at DESC, id DESC)`); err != nil {
+		return fmt.Errorf("idx_posts_author_created: %w", err)
+	}
+	return nil
+}
+
+func migrateDropLegacyPostTables(ctx context.Context, exec execContext) error {
+	steps := []struct {
+		name string
+		sql  string
+	}{
+		{"drop legacy answers", `DROP TABLE IF EXISTS answers`},
+		{"drop legacy votes", `DROP TABLE IF EXISTS votes`},
+		{"drop legacy questions", `DROP TABLE IF EXISTS questions`},
+	}
+	for _, step := range steps {
+		if _, err := exec.ExecContext(ctx, step.sql); err != nil {
+			return fmt.Errorf("%s: %w", step.name, err)
+		}
+	}
+	return nil
+}
+
 func migratePostDate(ctx context.Context, exec execContext) error {
 	steps := []struct {
 		name string
@@ -306,6 +309,8 @@ CREATE TABLE IF NOT EXISTS schema_migrations (
 		{"005_post_vote_post_id_index", migratePostVoteIndex},
 		{"006_post_date", migratePostDate},
 		{"007_post_state", migratePostState},
+		{"008_post_author_index", migratePostAuthorIndex},
+		{"009_drop_legacy_post_tables", migrateDropLegacyPostTables},
 	}
 	for _, m := range migrations {
 		if applied[m.version] {

internal/store/migrate_posts_test.go

@@ -13,7 +13,7 @@ import (
 	"plumber/internal/store/sqlc"
 )
 
-func TestMigratePostsCopiesLegacyData(t *testing.T) {
+func TestPostMigrationsAndQueries(t *testing.T) {
 	rawURL := strings.TrimSpace(os.Getenv("TEST_DATABASE_URL"))
 	if rawURL == "" {
 		t.Skip("TEST_DATABASE_URL is not set")
@@ -47,47 +47,13 @@ func TestMigratePostsCopiesLegacyData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	legacySchema := `
+	baseSchema := `
 CREATE TABLE users (
   id TEXT PRIMARY KEY,
   name TEXT NOT NULL,
   role TEXT NOT NULL
-);
-CREATE TABLE questions (
-  id TEXT PRIMARY KEY,
-  author_id TEXT NOT NULL REFERENCES users(id),
-  title TEXT NOT NULL,
-  body TEXT NOT NULL,
-  city TEXT NOT NULL DEFAULT '',
-  hunt_date TEXT NOT NULL,
-  hidden INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL
-);
-CREATE TABLE answers (
-  question_id TEXT PRIMARY KEY REFERENCES questions(id) ON DELETE CASCADE,
-  author_id TEXT NOT NULL REFERENCES users(id),
-  body TEXT NOT NULL,
-  created_at TEXT NOT NULL,
-  updated_at TEXT NOT NULL
-);
-CREATE TABLE votes (
-  user_id TEXT NOT NULL REFERENCES users(id),
-  question_id TEXT NOT NULL REFERENCES questions(id) ON DELETE CASCADE,
-  value INTEGER NOT NULL CHECK (value IN (-1, 1)),
-  PRIMARY KEY (user_id, question_id)
 );`
-	if err := applySchema(ctx, conn, legacySchema); err != nil {
+	if err := applySchema(ctx, conn, baseSchema); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := conn.ExecContext(ctx, `
-INSERT INTO users (id, name, role)
-VALUES ('homeowner', 'Home Owner', 'user'), ('plumber', 'The Plumber', 'admin');
-INSERT INTO questions (id, author_id, title, body, city, hunt_date, hidden, created_at)
-VALUES ('question-1', 'homeowner', 'Leaky sink', 'It drips.', 'Oakland', '2026-08-26', 0, '2026-08-26T08:00:00Z');
-INSERT INTO answers (question_id, author_id, body, created_at, updated_at)
-VALUES ('question-1', 'plumber', 'Replace the cartridge.', '2026-08-26T09:00:00Z', '2026-08-26T09:05:00Z');
-INSERT INTO votes (user_id, question_id, value)
-VALUES ('homeowner', 'question-1', 1);`); err != nil {
 		t.Fatal(err)
 	}
 
@@ -103,28 +69,40 @@ VALUES ('homeowner', 'question-1', 1);`); err != nil {
 	if err := migratePostVoteIndex(ctx, conn); err != nil {
 		t.Fatalf("post vote index migration is not idempotent: %v", err)
 	}
+	if err := migratePostAuthorIndex(ctx, conn); err != nil {
+		t.Fatal(err)
+	}
+	if err := migratePostAuthorIndex(ctx, conn); err != nil {
+		t.Fatalf("post author index migration is not idempotent: %v", err)
+	}
+	if _, err := conn.ExecContext(ctx, `
+INSERT INTO users (id, name, role)
+VALUES ('homeowner', 'Home Owner', 'user'), ('plumber', 'The Plumber', 'admin');
+INSERT INTO posts (
+  id, parent_id, author_id, title, body, city, post_date, post_state, created_at, updated_at
+) VALUES
+  (
+    'root-1', NULL, 'homeowner', 'Leaky sink', 'It drips.', 'Oakland',
+    '2026-08-26', 'visible', '2026-08-26T08:00:00Z', '2026-08-26T08:00:00Z'
+  ),
+  (
+    'reply-1', 'root-1', 'plumber', '', 'Replace the cartridge.', '', '',
+    'visible', '2026-08-26T09:00:00Z', '2026-08-26T09:05:00Z'
+  );
+INSERT INTO post_votes (user_id, post_id, value)
+VALUES ('homeowner', 'root-1', 1);`); err != nil {
+		t.Fatal(err)
+	}
 
-	var postCount, voteCount, legacyQuestionCount, legacyAnswerCount int
+	var postCount, voteCount int
 	if err := conn.QueryRowContext(ctx, "SELECT count(*) FROM posts").Scan(&postCount); err != nil {
 		t.Fatal(err)
 	}
 	if err := conn.QueryRowContext(ctx, "SELECT count(*) FROM post_votes").Scan(&voteCount); err != nil {
 		t.Fatal(err)
 	}
-	if err := conn.QueryRowContext(ctx, "SELECT count(*) FROM questions").Scan(&legacyQuestionCount); err != nil {
+	if postCount != 2 || voteCount != 1 {
-		t.Fatal(err)
+		t.Fatalf("counts posts=%d votes=%d", postCount, voteCount)
-	}
-	if err := conn.QueryRowContext(ctx, "SELECT count(*) FROM answers").Scan(&legacyAnswerCount); err != nil {
-		t.Fatal(err)
-	}
-	if postCount != 2 || voteCount != 1 || legacyQuestionCount != 1 || legacyAnswerCount != 1 {
-		t.Fatalf(
-			"counts posts=%d votes=%d legacy questions=%d answers=%d",
-			postCount,
-			voteCount,
-			legacyQuestionCount,
-			legacyAnswerCount,
-		)
 	}
 	var postVoteIndexCount int
 	if err := conn.QueryRowContext(ctx, `
@@ -138,9 +116,21 @@ WHERE schemaname = current_schema()
 	if postVoteIndexCount != 1 {
 		t.Fatalf("post vote index count = %d, want 1", postVoteIndexCount)
 	}
+	var postAuthorIndexCount int
+	if err := conn.QueryRowContext(ctx, `
+SELECT count(*)
+FROM pg_indexes
+WHERE schemaname = current_schema()
+  AND tablename = 'posts'
+  AND indexname = 'idx_posts_author_created'`).Scan(&postAuthorIndexCount); err != nil {
+		t.Fatal(err)
+	}
+	if postAuthorIndexCount != 1 {
+		t.Fatalf("post author index count = %d, want 1", postAuthorIndexCount)
+	}
 	if _, err := conn.ExecContext(ctx, `
 INSERT INTO post_votes (user_id, post_id, value)
-VALUES ('homeowner', 'question-1', -1)`); err == nil {
+VALUES ('homeowner', 'root-1', -1)`); err == nil {
 		t.Fatal("duplicate user/post vote unexpectedly succeeded")
 	}
 
@@ -149,7 +139,7 @@ VALUES ('homeowner', 'question-1', -1)`); err == nil {
 	if err := conn.QueryRowContext(ctx, `
 SELECT parent_id, author_id, title, body, city, post_date, post_state, created_at, updated_at
 FROM posts
-WHERE id = 'question-1'`).Scan(
+WHERE id = 'root-1'`).Scan(
 		&rootParent,
 		&rootAuthor,
 		&title,
@@ -178,7 +168,7 @@ WHERE id = 'question-1'`).Scan(
 	if err := conn.QueryRowContext(ctx, `
 SELECT parent_id, author_id, body, post_state, created_at, updated_at
 FROM posts
-WHERE id = 'answer:question-1'`).Scan(
+WHERE id = 'reply-1'`).Scan(
 		&replyParent,
 		&replyAuthor,
 		&replyBody,
@@ -188,7 +178,7 @@ WHERE id = 'answer:question-1'`).Scan(
 	); err != nil {
 		t.Fatal(err)
 	}
-	if replyParent != "question-1" ||
+	if replyParent != "root-1" ||
 		replyAuthor != "plumber" ||
 		replyBody != "Replace the cartridge." ||
 		replyState != "visible" ||
@@ -200,7 +190,7 @@ WHERE id = 'answer:question-1'`).Scan(
 	var voteValue int
 	if err := conn.QueryRowContext(ctx, `
 SELECT value FROM post_votes
-WHERE user_id = 'homeowner' AND post_id = 'question-1'`).Scan(&voteValue); err != nil {
+WHERE user_id = 'homeowner' AND post_id = 'root-1'`).Scan(&voteValue); err != nil {
 		t.Fatal(err)
 	}
 	if voteValue != 1 {
@@ -211,7 +201,7 @@ WHERE user_id = 'homeowner' AND post_id = 'question-1'`).Scan(&voteValue); err !
 INSERT INTO posts (
   id, parent_id, author_id, title, body, city, post_date, post_state, created_at, updated_at
 ) VALUES (
-  'invalid-reply', 'question-1', 'homeowner', 'Replies cannot have titles', 'Body', '', '',
+  'invalid-reply', 'root-1', 'homeowner', 'Replies cannot have titles', 'Body', '', '',
   'visible', 'now', 'now'
 )`); err == nil {
 		t.Fatal("reply with root-only title unexpectedly succeeded")
@@ -220,7 +210,7 @@ INSERT INTO posts (
 	queries := sqlc.New(conn)
 	if err := queries.CreatePost(ctx, sqlc.CreatePostParams{
 		ID:        "follow-up",
-		ParentID:  sql.NullString{String: "answer:question-1", Valid: true},
+		ParentID:  sql.NullString{String: "reply-1", Valid: true},
 		AuthorID:  "homeowner",
 		Body:      "It is still dripping.",
 		PostState: string(PostStateVisible),
@@ -229,17 +219,17 @@ INSERT INTO posts (
 	}); err != nil {
 		t.Fatal(err)
 	}
-	thread, err := queries.ListPostThread(ctx, "question-1")
+	thread, err := queries.ListPostThread(ctx, "root-1")
 	if err != nil {
 		t.Fatal(err)
 	}
 	if len(thread) != 3 ||
-		thread[0].ID != "question-1" ||
+		thread[0].ID != "root-1" ||
-		thread[1].ID != "answer:question-1" ||
+		thread[1].ID != "reply-1" ||
 		thread[2].ID != "follow-up" {
 		t.Fatalf("recursive thread = %+v", thread)
 	}
-	nonRootThread, err := queries.ListPostThread(ctx, "answer:question-1")
+	nonRootThread, err := queries.ListPostThread(ctx, "reply-1")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -255,7 +245,7 @@ INSERT INTO posts (
 	}
 	if n, err := queries.UpsertPostVoteOnVisibleRoot(ctx, sqlc.UpsertPostVoteOnVisibleRootParams{
 		UserID:      "plumber",
-		PostID:      "question-1",
+		PostID:      "root-1",
 		Value:       1,
 		HiddenState: string(PostStateHidden),
 	}); err != nil || n != 1 {
@@ -276,6 +266,39 @@ INSERT INTO posts (
 		roots[0].UserVote != 1 {
 		t.Fatalf("root annotations = %+v", roots)
 	}
+	summary, err := queries.GetRootPostVoteSummary(ctx, sqlc.GetRootPostVoteSummaryParams{
+		ViewerID: "plumber",
+		RootID:   "root-1",
+	})
+	if err != nil || summary.Score != 2 || summary.UserVote != 1 {
+		t.Fatalf("root vote summary = %+v, %v", summary, err)
+	}
+	byAuthor, err := queries.ListRootPostsByAuthor(ctx, sqlc.ListRootPostsByAuthorParams{
+		AuthorID:    "homeowner",
+		HiddenState: string(PostStateHidden),
+		RowLimit:    50,
+	})
+	if err != nil || len(byAuthor) != 1 || byAuthor[0].ID != "root-1" {
+		t.Fatalf("roots by author = %+v, %v", byAuthor, err)
+	}
+	answeredBy, err := queries.ListRootPostsAnsweredBy(ctx, sqlc.ListRootPostsAnsweredByParams{
+		HiddenState: string(PostStateHidden),
+		AdminID:     "plumber",
+		RowLimit:    50,
+	})
+	if err != nil || len(answeredBy) != 1 || answeredBy[0].ID != "root-1" {
+		t.Fatalf("roots answered by admin = %+v, %v", answeredBy, err)
+	}
+	for _, state := range []PostState{PostStateLocked, PostStateVisible} {
+		n, err := queries.UpdateRootPostState(ctx, sqlc.UpdateRootPostStateParams{
+			PostState: string(state),
+			UpdatedAt: "2026-08-26T10:10:00Z",
+			ID:        "root-1",
+		})
+		if err != nil || n != 1 {
+			t.Fatalf("set root state %q rows=%d error=%v", state, n, err)
+		}
+	}
 
 	if _, err := conn.ExecContext(ctx, `
 DROP INDEX idx_posts_root_date;
@@ -313,7 +336,7 @@ WHERE schemaname = current_schema()
 	}
 	var migratedPostDate string
 	if err := conn.QueryRowContext(ctx, `
-SELECT post_date FROM posts WHERE id = 'question-1'`).Scan(&migratedPostDate); err != nil {
+SELECT post_date FROM posts WHERE id = 'root-1'`).Scan(&migratedPostDate); err != nil {
 		t.Fatal(err)
 	}
 	if postDateColumnCount != 1 ||
@@ -335,7 +358,7 @@ SELECT post_date FROM posts WHERE id = 'question-1'`).Scan(&migratedPostDate); e
 DROP INDEX idx_posts_root_date;
 ALTER TABLE posts DROP CONSTRAINT posts_shape_check;
 ALTER TABLE posts ADD COLUMN hidden INTEGER NOT NULL DEFAULT 0;
-UPDATE posts SET hidden = CASE WHEN id = 'question-1' THEN 1 ELSE 0 END;
+UPDATE posts SET hidden = CASE WHEN id = 'root-1' THEN 1 ELSE 0 END;
 ALTER TABLE posts DROP COLUMN post_state;
 ALTER TABLE posts ADD CONSTRAINT posts_check CHECK (
   (parent_id IS NULL AND title <> '' AND post_date <> '')
@@ -366,11 +389,11 @@ WHERE table_schema = current_schema()
 	}
 	var hiddenState, replyStateAfterMigration string
 	if err := conn.QueryRowContext(ctx, `
-SELECT post_state FROM posts WHERE id = 'question-1'`).Scan(&hiddenState); err != nil {
+SELECT post_state FROM posts WHERE id = 'root-1'`).Scan(&hiddenState); err != nil {
 		t.Fatal(err)
 	}
 	if err := conn.QueryRowContext(ctx, `
-SELECT post_state FROM posts WHERE id = 'answer:question-1'`).Scan(&replyStateAfterMigration); err != nil {
+SELECT post_state FROM posts WHERE id = 'reply-1'`).Scan(&replyStateAfterMigration); err != nil {
 		t.Fatal(err)
 	}
 	var postStateDataType string
@@ -408,6 +431,28 @@ WHERE schemaname = current_schema()
 			stateIndexCount,
 		)
 	}
+
+	if _, err := conn.ExecContext(ctx, `
+CREATE TABLE questions (id TEXT PRIMARY KEY);
+CREATE TABLE votes (id TEXT PRIMARY KEY);
+CREATE TABLE answers (id TEXT PRIMARY KEY);`); err != nil {
+		t.Fatal(err)
+	}
+	if err := migrateDropLegacyPostTables(ctx, conn); err != nil {
+		t.Fatal(err)
+	}
+	if err := migrateDropLegacyPostTables(ctx, conn); err != nil {
+		t.Fatalf("legacy table cleanup is not idempotent: %v", err)
+	}
+	for _, table := range []string{"questions", "votes", "answers"} {
+		var relation sql.NullString
+		if err := conn.QueryRowContext(ctx, "SELECT to_regclass($1)", table).Scan(&relation); err != nil {
+			t.Fatal(err)
+		}
+		if relation.Valid {
+			t.Fatalf("legacy table %q still exists", table)
+		}
+	}
 }
 
 func TestMigratePostsReportsStep(t *testing.T) {
@@ -415,8 +460,8 @@ func TestMigratePostsReportsStep(t *testing.T) {
 
 	exec := &failingMigrationExec{failAt: 5}
 	err := migratePosts(context.Background(), exec)
-	if err == nil || !strings.Contains(err.Error(), "copy questions") {
+	if err == nil || !strings.Contains(err.Error(), "create post votes") {
-		t.Fatalf("error = %v, want copy questions context", err)
+		t.Fatalf("error = %v, want create post votes context", err)
 	}
 }
 

internal/store/post.go

@@ -258,6 +258,39 @@ func GetPostThread(ctx context.Context, db *sql.DB, rootID string) (*Post, error
 	return buildPostTree(posts, rootID)
 }
 
+// GetPostThreadForViewer includes root voting and answered annotations.
+func GetPostThreadForViewer(
+	ctx context.Context,
+	db *sql.DB,
+	rootID string,
+	viewerID string,
+) (*Post, error) {
+	root, err := GetPostThread(ctx, db, rootID)
+	if err != nil {
+		return nil, err
+	}
+	summary, err := sqlc.New(db).GetRootPostVoteSummary(ctx, sqlc.GetRootPostVoteSummaryParams{
+		ViewerID: viewerID,
+		RootID:   rootID,
+	})
+	if err != nil {
+		return nil, err
+	}
+	root.Score = int(summary.Score)
+	root.UserVote = int(summary.UserVote)
+	root.Answered = postTreeContainsRole(root, RoleAdmin)
+	return root, nil
+}
+
+func postTreeContainsRole(post *Post, role Role) bool {
+	for _, reply := range post.Replies {
+		if reply.AuthorRole == role || postTreeContainsRole(reply, role) {
+			return true
+		}
+	}
+	return false
+}
+
 func buildPostTree(posts []Post, rootID string) (*Post, error) {
 	byID := make(map[string]*Post, len(posts))
 	for i := range posts {
@@ -334,6 +367,89 @@ func ListRootPosts(ctx context.Context, db *sql.DB, postDate, viewerID string) (
 	return posts, nil
 }
 
+// ListRootPostsByAuthor returns visible roots created by an author, newest first.
+func ListRootPostsByAuthor(ctx context.Context, db *sql.DB, authorID string) ([]Post, error) {
+	rows, err := sqlc.New(db).ListRootPostsByAuthor(ctx, sqlc.ListRootPostsByAuthorParams{
+		AuthorID:    authorID,
+		HiddenState: string(PostStateHidden),
+		RowLimit:    ProfileListLimit,
+	})
+	if err != nil {
+		return nil, err
+	}
+	posts := make([]Post, 0, len(rows))
+	for _, r := range rows {
+		posts = append(posts, postFromValues(
+			db,
+			r.ID,
+			r.ParentID,
+			r.AuthorID,
+			r.AuthorName,
+			r.AuthorRole,
+			r.Title,
+			r.Body,
+			r.City,
+			r.PostDate,
+			r.PostState,
+			r.CreatedAt,
+			r.UpdatedAt,
+		))
+	}
+	return posts, nil
+}
+
+// ListRootPostsAnsweredBy returns visible roots containing a reply by adminID.
+func ListRootPostsAnsweredBy(ctx context.Context, db *sql.DB, adminID string) ([]Post, error) {
+	rows, err := sqlc.New(db).ListRootPostsAnsweredBy(ctx, sqlc.ListRootPostsAnsweredByParams{
+		HiddenState: string(PostStateHidden),
+		AdminID:     adminID,
+		RowLimit:    ProfileListLimit,
+	})
+	if err != nil {
+		return nil, err
+	}
+	posts := make([]Post, 0, len(rows))
+	for _, r := range rows {
+		posts = append(posts, postFromValues(
+			db,
+			r.ID,
+			r.ParentID,
+			r.AuthorID,
+			r.AuthorName,
+			r.AuthorRole,
+			r.Title,
+			r.Body,
+			r.City,
+			r.PostDate,
+			r.PostState,
+			r.CreatedAt,
+			r.UpdatedAt,
+		))
+	}
+	return posts, nil
+}
+
+// SetRootPostState changes a root post's state.
+func SetRootPostState(ctx context.Context, db *sql.DB, id string, state PostState) error {
+	switch state {
+	case PostStateVisible, PostStateHidden, PostStateLocked:
+	default:
+		return fmt.Errorf("%w: invalid post state", ErrInvalidPost)
+	}
+	n, err := sqlc.New(db).UpdateRootPostState(ctx, sqlc.UpdateRootPostStateParams{
+		PostState: string(state),
+		UpdatedAt: time.Now().UTC().Format(time.RFC3339Nano),
+		ID:        id,
+	})
+	if err != nil {
+		return err
+	}
+	if n == 0 {
+		return sql.ErrNoRows
+	}
+	return nil
+}
+
 // SetPostVote sets value to 1, -1, or 0 on a visible root post.
 func SetPostVote(ctx context.Context, db *sql.DB, userID, postID string, value int) error {
 	if value != 1 && value != -1 && value != 0 {

internal/store/post_test.go

@@ -141,6 +141,26 @@ func TestMemoryPostLifecycle(t *testing.T) {
 	if err := mem.VotePost(ctx, voter.ID, later.ID, 1); !errors.Is(err, ErrPostNotVotable) {
 		t.Fatalf("reply vote error = %v", err)
 	}
+	byAuthor, err := mem.ListRootPostsByAuthor(ctx, homeowner.ID)
+	if err != nil || len(byAuthor) != 1 || byAuthor[0].ID != root.ID {
+		t.Fatalf("roots by author = %+v, %v", byAuthor, err)
+	}
+	answeredBy, err := mem.ListRootPostsAnsweredBy(ctx, plumber.ID)
+	if err != nil || len(answeredBy) != 1 || answeredBy[0].ID != root.ID {
+		t.Fatalf("roots answered by admin = %+v, %v", answeredBy, err)
+	}
+	if err := mem.SetRootPostState(ctx, later.ID, PostStateHidden); !errors.Is(err, sql.ErrNoRows) {
+		t.Fatalf("reply state error = %v, want sql.ErrNoRows", err)
+	}
+	if err := mem.SetRootPostState(ctx, root.ID, PostStateHidden); err != nil {
+		t.Fatal(err)
+	}
+	if roots, err := mem.ListRootPostsByAuthor(ctx, homeowner.ID); err != nil || len(roots) != 0 {
+		t.Fatalf("hidden author roots = %+v, %v", roots, err)
+	}
+	if roots, err := mem.ListRootPostsAnsweredBy(ctx, plumber.ID); err != nil || len(roots) != 0 {
+		t.Fatalf("hidden answered roots = %+v, %v", roots, err)
+	}
 }
 
 func TestMemoryPostValidation(t *testing.T) {

internal/store/postgres_store.go

@@ -109,41 +109,6 @@ func (p *Postgres) SaveUserProfile(ctx context.Context, u *User) error {
 	return u.SaveProfile(ctx)
 }
 
-func (p *Postgres) CreateQuestion(ctx context.Context, q *RankedQuestion) error {
-	q.db = p.db
-	return q.Create(ctx)
-}
-
-func (p *Postgres) GetQuestion(ctx context.Context, id, viewerID string) (*RankedQuestion, error) {
-	return GetQuestion(ctx, p.db, id, viewerID)
-}
-
-func (p *Postgres) ListHunt(ctx context.Context, huntDate, viewerID string) ([]RankedQuestion, error) {
-	return ListHunt(ctx, p.db, huntDate, viewerID)
-}
-
-func (p *Postgres) ListQuestionsByAuthor(ctx context.Context, authorID string) ([]RankedQuestion, error) {
-	return ListQuestionsByAuthor(ctx, p.db, authorID)
-}
-
-func (p *Postgres) ListQuestionsAnsweredBy(ctx context.Context, adminID string) ([]RankedQuestion, error) {
-	return ListQuestionsAnsweredBy(ctx, p.db, adminID)
-}
-
-func (p *Postgres) HideQuestion(ctx context.Context, id string) error {
-	q := &RankedQuestion{ID: id, db: p.db}
-	return q.Hide(ctx)
-}
-
-func (p *Postgres) GetAnswer(ctx context.Context, questionID string) (*Answer, error) {
-	return GetAnswer(ctx, p.db, questionID)
-}
-
-func (p *Postgres) UpsertAnswer(ctx context.Context, a *Answer) error {
-	a.db = p.db
-	return a.Upsert(ctx)
-}
-
 func (p *Postgres) CreatePost(ctx context.Context, post *Post) error {
 	post.db = p.db
 	return post.Create(ctx)
@@ -157,6 +122,10 @@ func (p *Postgres) GetPostThread(ctx context.Context, rootID string) (*Post, err
 	return GetPostThread(ctx, p.db, rootID)
 }
 
+func (p *Postgres) GetPostThreadForViewer(ctx context.Context, rootID, viewerID string) (*Post, error) {
+	return GetPostThreadForViewer(ctx, p.db, rootID, viewerID)
+}
+
 func (p *Postgres) UpdatePost(ctx context.Context, post *Post) error {
 	post.db = p.db
 	return post.Update(ctx)
@@ -166,10 +135,18 @@ func (p *Postgres) ListRootPosts(ctx context.Context, postDate, viewerID string)
 	return ListRootPosts(ctx, p.db, postDate, viewerID)
 }
 
+func (p *Postgres) ListRootPostsByAuthor(ctx context.Context, authorID string) ([]Post, error) {
+	return ListRootPostsByAuthor(ctx, p.db, authorID)
+}
+
+func (p *Postgres) ListRootPostsAnsweredBy(ctx context.Context, adminID string) ([]Post, error) {
+	return ListRootPostsAnsweredBy(ctx, p.db, adminID)
+}
+
+func (p *Postgres) SetRootPostState(ctx context.Context, id string, state PostState) error {
+	return SetRootPostState(ctx, p.db, id, state)
+}
+
 func (p *Postgres) VotePost(ctx context.Context, userID, postID string, value int) error {
 	return SetPostVote(ctx, p.db, userID, postID, value)
 }
-
-func (p *Postgres) Vote(ctx context.Context, userID, questionID string, value int) error {
-	return Vote(ctx, p.db, userID, questionID, value)
-}

internal/store/question.go

@@ -1,156 +0,0 @@
-package store
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-
-	"plumber/internal/pacific"
-	"plumber/internal/store/sqlc"
-)
-
-// RankedQuestion is a question row with score / vote annotations for lists.
-type RankedQuestion struct {
-	ID         string
-	AuthorID   string
-	AuthorName string
-	Title      string
-	Body       string
-	City       string
-	HuntDate   string
-	Hidden     bool
-	CreatedAt  string
-	Score      int
-	Answered   bool
-	UserVote   int
-	db         *sql.DB
-}
-
-// NewQuestion returns a question bound to db (not yet inserted).
-func NewQuestion(db *sql.DB) *RankedQuestion {
-	return &RankedQuestion{db: db}
-}
-
-// Create inserts the question. Sets ID, HuntDate, and CreatedAt when empty.
-func (q *RankedQuestion) Create(ctx context.Context) error {
-	if q == nil || q.db == nil {
-		return fmt.Errorf("question: no database")
-	}
-	q.Title = strings.TrimSpace(q.Title)
-	q.Body = strings.TrimSpace(q.Body)
-	q.City = strings.TrimSpace(q.City)
-	if q.ID == "" {
-		q.ID = uuid.NewString()
-	}
-	if q.HuntDate == "" {
-		q.HuntDate = pacific.Today()
-	}
-	if q.CreatedAt == "" {
-		q.CreatedAt = time.Now().UTC().Format(time.RFC3339)
-	}
-	return sqlc.New(q.db).CreateQuestion(ctx, sqlc.CreateQuestionParams{
-		ID:        q.ID,
-		AuthorID:  q.AuthorID,
-		Title:     q.Title,
-		Body:      q.Body,
-		City:      q.City,
-		HuntDate:  q.HuntDate,
-		CreatedAt: q.CreatedAt,
-	})
-}
-
-// Hide marks the question hidden.
-func (q *RankedQuestion) Hide(ctx context.Context) error {
-	if q == nil || q.db == nil {
-		return fmt.Errorf("question: no database")
-	}
-	if err := sqlc.New(q.db).HideQuestion(ctx, q.ID); err != nil {
-		return err
-	}
-	q.Hidden = true
-	return nil
-}
-
-func rankedFrom(
-	db *sql.DB,
-	id, authorID, authorName, title, body, city, huntDate, createdAt string,
-	hidden int32, score, answered, userVote int64,
-) RankedQuestion {
-	return RankedQuestion{
-		ID:         id,
-		AuthorID:   authorID,
-		AuthorName: authorName,
-		Title:      title,
-		Body:       body,
-		City:       city,
-		HuntDate:   huntDate,
-		Hidden:     hidden != 0,
-		CreatedAt:  createdAt,
-		Score:      int(score),
-		Answered:   answered != 0,
-		UserVote:   int(userVote),
-		db:         db,
-	}
-}
-
-func ListHunt(ctx context.Context, db *sql.DB, huntDate, viewerID string) ([]RankedQuestion, error) {
-	rows, err := sqlc.New(db).ListHunt(ctx, sqlc.ListHuntParams{
-		ViewerID: viewerID,
-		HuntDate: huntDate,
-		RowLimit: HuntListLimit,
-	})
-	if err != nil {
-		return nil, err
-	}
-	out := make([]RankedQuestion, 0, len(rows))
-	for _, r := range rows {
-		out = append(out, rankedFrom(db, r.ID, r.AuthorID, r.AuthorName, r.Title, r.Body, r.City, r.HuntDate, r.CreatedAt, r.Hidden, r.Score, r.Answered, r.UserVote))
-	}
-	return out, nil
-}
-
-func GetQuestion(ctx context.Context, db *sql.DB, id, viewerID string) (*RankedQuestion, error) {
-	r, err := sqlc.New(db).GetQuestion(ctx, sqlc.GetQuestionParams{
-		ViewerID: viewerID,
-		ID:       id,
-	})
-	if err != nil {
-		return nil, err
-	}
-	q := rankedFrom(db, r.ID, r.AuthorID, r.AuthorName, r.Title, r.Body, r.City, r.HuntDate, r.CreatedAt, r.Hidden, r.Score, r.Answered, r.UserVote)
-	return &q, nil
-}
-
-func ListQuestionsByAuthor(ctx context.Context, db *sql.DB, authorID string) ([]RankedQuestion, error) {
-	rows, err := sqlc.New(db).ListQuestionsByAuthor(ctx, sqlc.ListQuestionsByAuthorParams{
-		AuthorID: authorID,
-		RowLimit: ProfileListLimit,
-	})
-	if err != nil {
-		return nil, err
-	}
-	out := make([]RankedQuestion, 0, len(rows))
-	for _, r := range rows {
-		out = append(out, rankedFrom(db, r.ID, r.AuthorID, r.AuthorName, r.Title, r.Body, r.City, r.HuntDate, r.CreatedAt, r.Hidden, r.Score, r.Answered, r.UserVote))
-	}
-	return out, nil
-}
-
-func ListQuestionsAnsweredBy(ctx context.Context, db *sql.DB, adminID string) ([]RankedQuestion, error) {
-	rows, err := sqlc.New(db).ListQuestionsAnsweredBy(ctx, sqlc.ListQuestionsAnsweredByParams{
-		AdminID:  adminID,
-		RowLimit: ProfileListLimit,
-	})
-	if err != nil {
-		return nil, err
-	}
-	out := make([]RankedQuestion, 0, len(rows))
-	for _, r := range rows {
-		out = append(out, rankedFrom(db, r.ID, r.AuthorID, r.AuthorName, r.Title, r.Body, r.City, r.HuntDate, r.CreatedAt, r.Hidden, r.Score, r.Answered, r.UserVote))
-	}
-	return out, nil
-}

internal/store/sqlc/answers.sql.go

@@ -1,66 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: answers.sql
-
-package sqlc
-
-import (
-	"context"
-)
-
-const getAnswer = `-- name: GetAnswer :one
-SELECT a.question_id, a.author_id, u.name AS author_name, a.body, a.created_at, a.updated_at
-FROM answers a
-JOIN users u ON u.id = a.author_id
-WHERE a.question_id = $1
-`
-
-type GetAnswerRow struct {
-	QuestionID string
-	AuthorID   string
-	AuthorName string
-	Body       string
-	CreatedAt  string
-	UpdatedAt  string
-}
-
-func (q *Queries) GetAnswer(ctx context.Context, questionID string) (GetAnswerRow, error) {
-	row := q.db.QueryRowContext(ctx, getAnswer, questionID)
-	var i GetAnswerRow
-	err := row.Scan(
-		&i.QuestionID,
-		&i.AuthorID,
-		&i.AuthorName,
-		&i.Body,
-		&i.CreatedAt,
-		&i.UpdatedAt,
-	)
-	return i, err
-}
-
-const upsertAnswer = `-- name: UpsertAnswer :exec
-INSERT INTO answers (question_id, author_id, body, created_at, updated_at)
-VALUES ($1, $2, $3, $4, $5)
-ON CONFLICT (question_id) DO UPDATE
-SET body = excluded.body, author_id = excluded.author_id, updated_at = excluded.updated_at
-`
-
-type UpsertAnswerParams struct {
-	QuestionID string
-	AuthorID   string
-	Body       string
-	CreatedAt  string
-	UpdatedAt  string
-}
-
-func (q *Queries) UpsertAnswer(ctx context.Context, arg UpsertAnswerParams) error {
-	_, err := q.db.ExecContext(ctx, upsertAnswer,
-		arg.QuestionID,
-		arg.AuthorID,
-		arg.Body,
-		arg.CreatedAt,
-		arg.UpdatedAt,
-	)
-	return err
-}

internal/store/sqlc/models.go

@@ -9,14 +9,6 @@ import (
 	"time"
 )
 
-type Answer struct {
-	QuestionID string
-	AuthorID   string
-	Body       string
-	CreatedAt  string
-	UpdatedAt  string
-}
-
 type Post struct {
 	ID        string
 	ParentID  sql.NullString
@@ -36,17 +28,6 @@ type PostVote struct {
 	Value  int32
 }
 
-type Question struct {
-	ID        string
-	AuthorID  string
-	Title     string
-	Body      string
-	City      string
-	HuntDate  string
-	Hidden    int32
-	CreatedAt string
-}
-
 type Session struct {
 	Token  string
 	Data   []byte
@@ -64,9 +45,3 @@ type User struct {
 	State        string
 	CreatedAt    string
 }
-
-type Vote struct {
-	UserID     string
-	QuestionID string
-	Value      int32
-}

internal/store/sqlc/posts.sql.go

@@ -117,6 +117,34 @@ func (q *Queries) GetPost(ctx context.Context, id string) (GetPostRow, error) {
 	return i, err
 }
 
+const getRootPostVoteSummary = `-- name: GetRootPostVoteSummary :one
+SELECT
+  COALESCE(SUM(value), 0)::bigint AS score,
+  COALESCE(
+    MAX(value) FILTER (WHERE user_id = $1),
+    0
+  )::bigint AS user_vote
+FROM post_votes
+WHERE post_id = $2
+`
+
+type GetRootPostVoteSummaryParams struct {
+	ViewerID string
+	RootID   string
+}
+
+type GetRootPostVoteSummaryRow struct {
+	Score    int64
+	UserVote int64
+}
+
+func (q *Queries) GetRootPostVoteSummary(ctx context.Context, arg GetRootPostVoteSummaryParams) (GetRootPostVoteSummaryRow, error) {
+	row := q.db.QueryRowContext(ctx, getRootPostVoteSummary, arg.ViewerID, arg.RootID)
+	var i GetRootPostVoteSummaryRow
+	err := row.Scan(&i.Score, &i.UserVote)
+	return i, err
+}
+
 const listPostThread = `-- name: ListPostThread :many
 WITH RECURSIVE thread AS (
   SELECT p.id, p.parent_id, p.author_id, p.title, p.body, p.city, p.post_date, p.post_state, p.created_at, p.updated_at
@@ -309,6 +337,162 @@ func (q *Queries) ListRootPosts(ctx context.Context, arg ListRootPostsParams) ([
 	return items, nil
 }
 
+const listRootPostsAnsweredBy = `-- name: ListRootPostsAnsweredBy :many
+WITH RECURSIVE ancestors AS (
+  SELECT p.id, p.parent_id
+  FROM posts p
+  WHERE p.author_id = $3
+    AND p.parent_id IS NOT NULL
+
+  UNION
+
+  SELECT parent.id, parent.parent_id
+  FROM posts parent
+  JOIN ancestors child ON child.parent_id = parent.id
+)
+SELECT DISTINCT
+  root.id, root.parent_id, root.author_id,
+  u.name AS author_name, u.role AS author_role,
+  root.title, root.body, root.city, root.post_date,
+  root.post_state, root.created_at, root.updated_at
+FROM posts root
+JOIN ancestors ON ancestors.id = root.id
+JOIN users u ON u.id = root.author_id
+WHERE root.parent_id IS NULL
+  AND root.post_state <> $1
+ORDER BY root.created_at DESC, root.id DESC
+LIMIT $2
+`
+
+type ListRootPostsAnsweredByParams struct {
+	HiddenState string
+	RowLimit    int32
+	AdminID     string
+}
+
+type ListRootPostsAnsweredByRow struct {
+	ID         string
+	ParentID   sql.NullString
+	AuthorID   string
+	AuthorName string
+	AuthorRole string
+	Title      string
+	Body       string
+	City       string
+	PostDate   string
+	PostState  string
+	CreatedAt  string
+	UpdatedAt  string
+}
+
+func (q *Queries) ListRootPostsAnsweredBy(ctx context.Context, arg ListRootPostsAnsweredByParams) ([]ListRootPostsAnsweredByRow, error) {
+	rows, err := q.db.QueryContext(ctx, listRootPostsAnsweredBy, arg.HiddenState, arg.RowLimit, arg.AdminID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	items := []ListRootPostsAnsweredByRow{}
+	for rows.Next() {
+		var i ListRootPostsAnsweredByRow
+		if err := rows.Scan(
+			&i.ID,
+			&i.ParentID,
+			&i.AuthorID,
+			&i.AuthorName,
+			&i.AuthorRole,
+			&i.Title,
+			&i.Body,
+			&i.City,
+			&i.PostDate,
+			&i.PostState,
+			&i.CreatedAt,
+			&i.UpdatedAt,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const listRootPostsByAuthor = `-- name: ListRootPostsByAuthor :many
+SELECT
+  p.id, p.parent_id, p.author_id,
+  u.name AS author_name, u.role AS author_role,
+  p.title, p.body, p.city, p.post_date,
+  p.post_state, p.created_at, p.updated_at
+FROM posts p
+JOIN users u ON u.id = p.author_id
+WHERE p.parent_id IS NULL
+  AND p.author_id = $1
+  AND p.post_state <> $2
+ORDER BY p.created_at DESC, p.id DESC
+LIMIT $3
+`
+
+type ListRootPostsByAuthorParams struct {
+	AuthorID    string
+	HiddenState string
+	RowLimit    int32
+}
+
+type ListRootPostsByAuthorRow struct {
+	ID         string
+	ParentID   sql.NullString
+	AuthorID   string
+	AuthorName string
+	AuthorRole string
+	Title      string
+	Body       string
+	City       string
+	PostDate   string
+	PostState  string
+	CreatedAt  string
+	UpdatedAt  string
+}
+
+func (q *Queries) ListRootPostsByAuthor(ctx context.Context, arg ListRootPostsByAuthorParams) ([]ListRootPostsByAuthorRow, error) {
+	rows, err := q.db.QueryContext(ctx, listRootPostsByAuthor, arg.AuthorID, arg.HiddenState, arg.RowLimit)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	items := []ListRootPostsByAuthorRow{}
+	for rows.Next() {
+		var i ListRootPostsByAuthorRow
+		if err := rows.Scan(
+			&i.ID,
+			&i.ParentID,
+			&i.AuthorID,
+			&i.AuthorName,
+			&i.AuthorRole,
+			&i.Title,
+			&i.Body,
+			&i.City,
+			&i.PostDate,
+			&i.PostState,
+			&i.CreatedAt,
+			&i.UpdatedAt,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const postIsVisibleRoot = `-- name: PostIsVisibleRoot :one
 SELECT EXISTS(
   SELECT 1
@@ -353,6 +537,29 @@ func (q *Queries) UpdatePost(ctx context.Context, arg UpdatePostParams) (int64,
 	return result.RowsAffected()
 }
 
+const updateRootPostState = `-- name: UpdateRootPostState :execrows
+UPDATE posts
+SET
+  post_state = $1,
+  updated_at = $2
+WHERE id = $3
+  AND parent_id IS NULL
+`
+
+type UpdateRootPostStateParams struct {
+	PostState string
+	UpdatedAt string
+	ID        string
+}
+
+func (q *Queries) UpdateRootPostState(ctx context.Context, arg UpdateRootPostStateParams) (int64, error) {
+	result, err := q.db.ExecContext(ctx, updateRootPostState, arg.PostState, arg.UpdatedAt, arg.ID)
+	if err != nil {
+		return 0, err
+	}
+	return result.RowsAffected()
+}
+
 const upsertPostVoteOnVisibleRoot = `-- name: UpsertPostVoteOnVisibleRoot :execrows
 INSERT INTO post_votes (user_id, post_id, value)
 SELECT $1, $2, $3

internal/store/sqlc/questions.sql.go

@@ -1,316 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: questions.sql
-
-package sqlc
-
-import (
-	"context"
-)
-
-const createQuestion = `-- name: CreateQuestion :exec
-INSERT INTO questions (id, author_id, title, body, city, hunt_date, hidden, created_at)
-VALUES ($1, $2, $3, $4, $5, $6, 0, $7)
-`
-
-type CreateQuestionParams struct {
-	ID        string
-	AuthorID  string
-	Title     string
-	Body      string
-	City      string
-	HuntDate  string
-	CreatedAt string
-}
-
-func (q *Queries) CreateQuestion(ctx context.Context, arg CreateQuestionParams) error {
-	_, err := q.db.ExecContext(ctx, createQuestion,
-		arg.ID,
-		arg.AuthorID,
-		arg.Title,
-		arg.Body,
-		arg.City,
-		arg.HuntDate,
-		arg.CreatedAt,
-	)
-	return err
-}
-
-const getQuestion = `-- name: GetQuestion :one
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE((SELECT SUM(votes.value) FROM votes WHERE votes.question_id = q.id), 0)::bigint AS score,
-       CASE WHEN a.question_id IS NULL THEN 0 ELSE 1 END::bigint AS answered,
-       COALESCE((
-         SELECT votes.value FROM votes
-         WHERE votes.user_id = $1 AND votes.question_id = q.id
-       ), 0)::bigint AS user_vote
-FROM questions q
-JOIN users u ON u.id = q.author_id
-LEFT JOIN answers a ON a.question_id = q.id
-WHERE q.id = $2
-`
-
-type GetQuestionParams struct {
-	ViewerID string
-	ID       string
-}
-
-type GetQuestionRow struct {
-	ID         string
-	AuthorID   string
-	AuthorName string
-	Title      string
-	Body       string
-	City       string
-	HuntDate   string
-	Hidden     int32
-	CreatedAt  string
-	Score      int64
-	Answered   int64
-	UserVote   int64
-}
-
-func (q *Queries) GetQuestion(ctx context.Context, arg GetQuestionParams) (GetQuestionRow, error) {
-	row := q.db.QueryRowContext(ctx, getQuestion, arg.ViewerID, arg.ID)
-	var i GetQuestionRow
-	err := row.Scan(
-		&i.ID,
-		&i.AuthorID,
-		&i.AuthorName,
-		&i.Title,
-		&i.Body,
-		&i.City,
-		&i.HuntDate,
-		&i.Hidden,
-		&i.CreatedAt,
-		&i.Score,
-		&i.Answered,
-		&i.UserVote,
-	)
-	return i, err
-}
-
-const hideQuestion = `-- name: HideQuestion :exec
-UPDATE questions
-SET hidden = 1
-WHERE id = $1
-`
-
-func (q *Queries) HideQuestion(ctx context.Context, id string) error {
-	_, err := q.db.ExecContext(ctx, hideQuestion, id)
-	return err
-}
-
-const listHunt = `-- name: ListHunt :many
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE(SUM(v.value), 0)::bigint AS score,
-       CASE WHEN a.question_id IS NULL THEN 0 ELSE 1 END::bigint AS answered,
-       COALESCE((
-         SELECT votes.value FROM votes
-         WHERE votes.user_id = $1 AND votes.question_id = q.id
-       ), 0)::bigint AS user_vote
-FROM questions q
-JOIN users u ON u.id = q.author_id
-LEFT JOIN votes v ON v.question_id = q.id
-LEFT JOIN answers a ON a.question_id = q.id
-WHERE q.hunt_date = $2 AND q.hidden = 0
-GROUP BY q.id, q.author_id, u.name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at, a.question_id
-ORDER BY score DESC, q.created_at ASC
-LIMIT $3
-`
-
-type ListHuntParams struct {
-	ViewerID string
-	HuntDate string
-	RowLimit int32
-}
-
-type ListHuntRow struct {
-	ID         string
-	AuthorID   string
-	AuthorName string
-	Title      string
-	Body       string
-	City       string
-	HuntDate   string
-	Hidden     int32
-	CreatedAt  string
-	Score      int64
-	Answered   int64
-	UserVote   int64
-}
-
-func (q *Queries) ListHunt(ctx context.Context, arg ListHuntParams) ([]ListHuntRow, error) {
-	rows, err := q.db.QueryContext(ctx, listHunt, arg.ViewerID, arg.HuntDate, arg.RowLimit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListHuntRow{}
-	for rows.Next() {
-		var i ListHuntRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.AuthorID,
-			&i.AuthorName,
-			&i.Title,
-			&i.Body,
-			&i.City,
-			&i.HuntDate,
-			&i.Hidden,
-			&i.CreatedAt,
-			&i.Score,
-			&i.Answered,
-			&i.UserVote,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listQuestionsAnsweredBy = `-- name: ListQuestionsAnsweredBy :many
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE((SELECT SUM(votes.value) FROM votes WHERE votes.question_id = q.id), 0)::bigint AS score,
-       1::bigint AS answered,
-       0::bigint AS user_vote
-FROM answers ans
-JOIN questions q ON q.id = ans.question_id
-JOIN users u ON u.id = q.author_id
-WHERE ans.author_id = $1 AND q.hidden = 0
-ORDER BY ans.updated_at DESC
-LIMIT $2
-`
-
-type ListQuestionsAnsweredByParams struct {
-	AdminID  string
-	RowLimit int32
-}
-
-type ListQuestionsAnsweredByRow struct {
-	ID         string
-	AuthorID   string
-	AuthorName string
-	Title      string
-	Body       string
-	City       string
-	HuntDate   string
-	Hidden     int32
-	CreatedAt  string
-	Score      int64
-	Answered   int64
-	UserVote   int64
-}
-
-func (q *Queries) ListQuestionsAnsweredBy(ctx context.Context, arg ListQuestionsAnsweredByParams) ([]ListQuestionsAnsweredByRow, error) {
-	rows, err := q.db.QueryContext(ctx, listQuestionsAnsweredBy, arg.AdminID, arg.RowLimit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListQuestionsAnsweredByRow{}
-	for rows.Next() {
-		var i ListQuestionsAnsweredByRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.AuthorID,
-			&i.AuthorName,
-			&i.Title,
-			&i.Body,
-			&i.City,
-			&i.HuntDate,
-			&i.Hidden,
-			&i.CreatedAt,
-			&i.Score,
-			&i.Answered,
-			&i.UserVote,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listQuestionsByAuthor = `-- name: ListQuestionsByAuthor :many
-SELECT q.id, q.author_id, u.name AS author_name, q.title, q.body, q.city, q.hunt_date, q.hidden, q.created_at,
-       COALESCE((SELECT SUM(votes.value) FROM votes WHERE votes.question_id = q.id), 0)::bigint AS score,
-       CASE WHEN a.question_id IS NULL THEN 0 ELSE 1 END::bigint AS answered,
-       0::bigint AS user_vote
-FROM questions q
-JOIN users u ON u.id = q.author_id
-LEFT JOIN answers a ON a.question_id = q.id
-WHERE q.author_id = $1 AND q.hidden = 0
-ORDER BY q.created_at DESC
-LIMIT $2
-`
-
-type ListQuestionsByAuthorParams struct {
-	AuthorID string
-	RowLimit int32
-}
-
-type ListQuestionsByAuthorRow struct {
-	ID         string
-	AuthorID   string
-	AuthorName string
-	Title      string
-	Body       string
-	City       string
-	HuntDate   string
-	Hidden     int32
-	CreatedAt  string
-	Score      int64
-	Answered   int64
-	UserVote   int64
-}
-
-func (q *Queries) ListQuestionsByAuthor(ctx context.Context, arg ListQuestionsByAuthorParams) ([]ListQuestionsByAuthorRow, error) {
-	rows, err := q.db.QueryContext(ctx, listQuestionsByAuthor, arg.AuthorID, arg.RowLimit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []ListQuestionsByAuthorRow{}
-	for rows.Next() {
-		var i ListQuestionsByAuthorRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.AuthorID,
-			&i.AuthorName,
-			&i.Title,
-			&i.Body,
-			&i.City,
-			&i.HuntDate,
-			&i.Hidden,
-			&i.CreatedAt,
-			&i.Score,
-			&i.Answered,
-			&i.UserVote,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}

internal/store/sqlc/votes.sql.go

@@ -1,82 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: votes.sql
-
-package sqlc
-
-import (
-	"context"
-)
-
-const deleteVote = `-- name: DeleteVote :exec
-DELETE FROM votes
-WHERE user_id = $1 AND question_id = $2
-`
-
-type DeleteVoteParams struct {
-	UserID     string
-	QuestionID string
-}
-
-func (q *Queries) DeleteVote(ctx context.Context, arg DeleteVoteParams) error {
-	_, err := q.db.ExecContext(ctx, deleteVote, arg.UserID, arg.QuestionID)
-	return err
-}
-
-const getVote = `-- name: GetVote :one
-SELECT value
-FROM votes
-WHERE user_id = $1 AND question_id = $2
-`
-
-type GetVoteParams struct {
-	UserID     string
-	QuestionID string
-}
-
-func (q *Queries) GetVote(ctx context.Context, arg GetVoteParams) (int32, error) {
-	row := q.db.QueryRowContext(ctx, getVote, arg.UserID, arg.QuestionID)
-	var value int32
-	err := row.Scan(&value)
-	return value, err
-}
-
-const questionIsVisible = `-- name: QuestionIsVisible :one
-SELECT EXISTS(
-  SELECT 1 FROM questions WHERE id = $1 AND hidden = 0
-)::bool
-`
-
-func (q *Queries) QuestionIsVisible(ctx context.Context, id string) (bool, error) {
-	row := q.db.QueryRowContext(ctx, questionIsVisible, id)
-	var column_1 bool
-	err := row.Scan(&column_1)
-	return column_1, err
-}
-
-const upsertVoteOnVisible = `-- name: UpsertVoteOnVisible :execrows
-INSERT INTO votes (user_id, question_id, value)
-SELECT $1, $2, $3
-FROM questions q
-WHERE q.id = $2 AND q.hidden = 0
-ON CONFLICT (user_id, question_id) DO UPDATE
-SET value = excluded.value
-WHERE EXISTS (
-  SELECT 1 FROM questions q2 WHERE q2.id = excluded.question_id AND q2.hidden = 0
-)
-`
-
-type UpsertVoteOnVisibleParams struct {
-	UserID     string
-	QuestionID string
-	Value      int32
-}
-
-func (q *Queries) UpsertVoteOnVisible(ctx context.Context, arg UpsertVoteOnVisibleParams) (int64, error) {
-	result, err := q.db.ExecContext(ctx, upsertVoteOnVisible, arg.UserID, arg.QuestionID, arg.Value)
-	if err != nil {
-		return 0, err
-	}
-	return result.RowsAffected()
-}

internal/store/store.go

@@ -27,23 +27,14 @@ type Store interface {
 	SetUserRole(ctx context.Context, id string, role Role) error
 	SaveUserProfile(ctx context.Context, u *User) error
 
-	CreateQuestion(ctx context.Context, q *RankedQuestion) error
-	GetQuestion(ctx context.Context, id, viewerID string) (*RankedQuestion, error)
-	ListHunt(ctx context.Context, huntDate, viewerID string) ([]RankedQuestion, error)
-	ListQuestionsByAuthor(ctx context.Context, authorID string) ([]RankedQuestion, error)
-	ListQuestionsAnsweredBy(ctx context.Context, adminID string) ([]RankedQuestion, error)
-	HideQuestion(ctx context.Context, id string) error
-
-	GetAnswer(ctx context.Context, questionID string) (*Answer, error)
-	UpsertAnswer(ctx context.Context, a *Answer) error
-
 	CreatePost(ctx context.Context, post *Post) error
 	GetPost(ctx context.Context, id string) (*Post, error)
 	GetPostThread(ctx context.Context, rootID string) (*Post, error)
+	GetPostThreadForViewer(ctx context.Context, rootID, viewerID string) (*Post, error)
 	UpdatePost(ctx context.Context, post *Post) error
 	ListRootPosts(ctx context.Context, postDate, viewerID string) ([]Post, error)
+	ListRootPostsByAuthor(ctx context.Context, authorID string) ([]Post, error)
+	ListRootPostsAnsweredBy(ctx context.Context, adminID string) ([]Post, error)
+	SetRootPostState(ctx context.Context, id string, state PostState) error
 	VotePost(ctx context.Context, userID, postID string, value int) error
-
-	// Vote sets the vote to 1, -1, or 0 (clear) on a visible question.
-	Vote(ctx context.Context, userID, questionID string, value int) error
 }

internal/store/user.go

@@ -9,12 +9,19 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgconn"
 
 	"plumber/internal/store/sqlc"
 )
 
-// ErrLastAdmin is returned when demoting the only remaining admin.
+var (
-var ErrLastAdmin = errors.New("cannot demote the last admin")
+	// ErrLastAdmin is returned when demoting the only remaining admin.
+	ErrLastAdmin = errors.New("cannot demote the last admin")
+	// ErrDuplicateUsername is returned when inserting an existing username.
+	ErrDuplicateUsername = errors.New("username taken")
+	// ErrDuplicateEmail is returned when inserting or updating an existing email.
+	ErrDuplicateEmail = errors.New("email taken")
+)
 
 // Role is a user privilege level stored in users.role.
 type Role string
@@ -51,6 +58,17 @@ func NormalizeUsername(s string) string {
 	return strings.ToLower(strings.TrimSpace(s))
 }
 
+func mapUniqueViolation(err error) error {
+	var pgErr *pgconn.PgError
+	if errors.As(err, &pgErr) && pgErr.Code == "23505" {
+		if strings.Contains(strings.ToLower(pgErr.ConstraintName), "email") {
+			return ErrDuplicateEmail
+		}
+		return ErrDuplicateUsername
+	}
+	return err
+}
+
 func toUser(db *sql.DB, id, username, name, role, email, avatarURL, state, createdAt, passwordHash string) *User {
 	return &User{
 		ID:           id,

internal/store/vote.go

@@ -1,71 +0,0 @@
-package store
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"strings"
-
-	"github.com/jackc/pgx/v5/pgconn"
-
-	"plumber/internal/store/sqlc"
-)
-
-// ErrDuplicateUsername is returned when inserting a username that already exists.
-var ErrDuplicateUsername = errors.New("username taken")
-
-// ErrDuplicateEmail is returned when inserting/updating an email that already exists.
-var ErrDuplicateEmail = errors.New("email taken")
-
-// ErrHiddenOrMissing is returned when voting on a hidden or unknown question.
-var ErrHiddenOrMissing = errors.New("question not votable")
-
-// SetVote sets the user's vote to value (1, -1, or 0 to clear) on a visible question.
-func SetVote(ctx context.Context, db *sql.DB, userID, questionID string, value int) error {
-	if value != 1 && value != -1 && value != 0 {
-		return fmt.Errorf("invalid vote")
-	}
-	q := sqlc.New(db)
-	if value == 0 {
-		visible, err := q.QuestionIsVisible(ctx, questionID)
-		if err != nil {
-			return err
-		}
-		if !visible {
-			return ErrHiddenOrMissing
-		}
-		return q.DeleteVote(ctx, sqlc.DeleteVoteParams{
-			UserID:     userID,
-			QuestionID: questionID,
-		})
-	}
-	n, err := q.UpsertVoteOnVisible(ctx, sqlc.UpsertVoteOnVisibleParams{
-		UserID:     userID,
-		QuestionID: questionID,
-		Value:      int32(value),
-	})
-	if err != nil {
-		return mapUniqueViolation(err)
-	}
-	if n == 0 {
-		return ErrHiddenOrMissing
-	}
-	return nil
-}
-
-// Vote is kept as an alias for SetVote for callers that still use the old name.
-func Vote(ctx context.Context, db *sql.DB, userID, questionID string, value int) error {
-	return SetVote(ctx, db, userID, questionID, value)
-}
-
-func mapUniqueViolation(err error) error {
-	var pgErr *pgconn.PgError
-	if errors.As(err, &pgErr) && pgErr.Code == "23505" {
-		if strings.Contains(strings.ToLower(pgErr.ConstraintName), "email") {
-			return ErrDuplicateEmail
-		}
-		return ErrDuplicateUsername
-	}
-	return err
-}

internal/web/posts.go

@@ -5,12 +5,15 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"log"
 	"net/http"
 	"net/url"
 	"strings"
+	"time"
 
 	"github.com/go-chi/chi/v5"
 
+	"plumber/internal/mail"
 	"plumber/internal/store"
 )
 
@@ -37,7 +40,7 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 		AuthorID: user.ID,
 		Body:     truncateRunes(body, 12000),
 	}
-	var root *store.Post
+	var parent, root *store.Post
 	if parentID == "" {
 		post.Title = truncateRunes(strings.TrimSpace(r.PostFormValue("title")), 120)
 		post.City = truncateRunes(strings.TrimSpace(r.PostFormValue("city")), 80)
@@ -46,7 +49,7 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else {
-		parent, threadRoot, err := s.postAndRoot(r.Context(), parentID)
+		loadedParent, threadRoot, err := s.postAndRoot(r.Context(), parentID)
 		if err != nil {
 			if errors.Is(err, sql.ErrNoRows) {
 				http.NotFound(w, r)
@@ -59,10 +62,11 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 			http.NotFound(w, r)
 			return
 		}
-		if !user.Admin() && user.ID != threadRoot.AuthorID {
+		if !canReplyToThread(user, threadRoot) {
 			http.Error(w, "forbidden", http.StatusForbidden)
 			return
 		}
+		parent = loadedParent
 		post.ParentID = &parent.ID
 		root = threadRoot
 	}
@@ -78,6 +82,9 @@ 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,
@@ -86,6 +93,59 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 	)
 }
 
+// notifyPostReply emails the root homeowner for admin replies and the direct
+// parent author for homeowner replies.
+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 {
+		return
+	}
+	if _, disabled := s.cfg.Mail.(mail.Nop); disabled {
+		return
+	}
+	recipientID := parent.AuthorID
+	if replyAuthor.Admin() {
+		recipientID = root.AuthorID
+	}
+	if recipientID == replyAuthor.ID {
+		return
+	}
+	msg := mail.PostReply{
+		RootID:          root.ID,
+		RootTitle:       root.Title,
+		ReplyID:         reply.ID,
+		ReplyBody:       reply.Body,
+		ReplyAuthorName: replyAuthor.Name,
+	}
+	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) {
@@ -175,3 +235,42 @@ func canEditPost(user *store.User, post *store.Post) bool {
 	}
 	return user.ID == post.AuthorID
 }
+
+func canReplyToThread(user *store.User, root *store.Post) bool {
+	return user != nil &&
+		root != nil &&
+		root.PostState != store.PostStateHidden &&
+		(user.Admin() || user.ID == root.AuthorID)
+}
+
+func postLabel(post *store.Post) string {
+	if post == nil {
+		return ""
+	}
+	if post.ParentID == nil {
+		return "Question"
+	}
+	if post.AuthorRole == store.RoleAdmin {
+		return "Shop response"
+	}
+	return "Homeowner"
+}
+
+func postDepthClass(depth int) string {
+	switch depth {
+	case 0:
+		return "root"
+	case 1:
+		return "branch"
+	default:
+		return "deep"
+	}
+}
+
+func postPointers(posts []store.Post) []*store.Post {
+	out := make([]*store.Post, len(posts))
+	for i := range posts {
+		out[i] = &posts[i]
+	}
+	return out
+}

internal/web/posts_test.go

@@ -7,7 +7,9 @@ import (
 	"net/url"
 	"strings"
 	"testing"
+	"time"
 
+	"plumber/internal/mail"
 	"plumber/internal/pacific"
 	"plumber/internal/store"
 )
@@ -258,6 +260,251 @@ 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":     {adminCSRF},
+		"parent_id": {adminReply.ID},
+		"body":      {"One more plumber detail."},
+	}, adminCookies)
+	if rec.Code != http.StatusSeeOther {
+		t.Fatalf("nested admin reply status = %d: %s", rec.Code, rec.Body.String())
+	}
+	msgs = waitForMail(t, recording, 3)
+	if msg := msgs[2]; msg.ToEmail != homeowner.Email ||
+		msg.RootID != root.ID ||
+		msg.ReplyBody != "One more plumber detail." ||
+		msg.ReplyAuthorName != admin.Name {
+		t.Fatalf("nested admin 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() != 3 {
+		t.Fatalf("self, edit, or no-email action sent a notification: %+v", recording.Snapshot())
+	}
+}
+
+func TestQuestionPageRendersNestedPostControls(t *testing.T) {
+	t.Parallel()
+
+	srv, mem := newTestServer(t, Config{})
+	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")
+
+	root := &store.Post{
+		AuthorID: homeowner.ID,
+		Title:    "Leaky sink",
+		Body:     "Water under the cabinet.",
+		City:     "Oakland",
+		PostDate: pacific.Today(),
+	}
+	if err := mem.CreatePost(context.Background(), root); err != nil {
+		t.Fatal(err)
+	}
+	homeownerReply := &store.Post{
+		ParentID: &root.ID,
+		AuthorID: homeowner.ID,
+		Body:     "The model number is 123.",
+	}
+	if err := mem.CreatePost(context.Background(), homeownerReply); err != nil {
+		t.Fatal(err)
+	}
+	adminReply := &store.Post{
+		ParentID: &homeownerReply.ID,
+		AuthorID: admin.ID,
+		Body:     "Replace the cartridge.",
+	}
+	if err := mem.CreatePost(context.Background(), adminReply); err != nil {
+		t.Fatal(err)
+	}
+	homeownerReply.Body = "The model number is 123A."
+	if err := mem.UpdatePost(context.Background(), homeownerReply); err != nil {
+		t.Fatal(err)
+	}
+
+	rec := httptest.NewRecorder()
+	req := httptest.NewRequest(http.MethodGet, "/questions/"+root.ID, nil)
+	for _, cookie := range homeownerCookies {
+		req.AddCookie(cookie)
+	}
+	handler.ServeHTTP(rec, req)
+	if rec.Code != http.StatusOK {
+		t.Fatalf("question page status = %d: %s", rec.Code, rec.Body.String())
+	}
+	body := rec.Body.String()
+	for _, want := range []string{
+		`id="post-` + root.ID + `"`,
+		`id="post-` + homeownerReply.ID + `"`,
+		`id="post-` + adminReply.ID + `"`,
+		`class="thread-post thread-post-branch`,
+		`class="thread-post thread-post-deep is-shop"`,
+		"Homeowner",
+		"Shop response",
+		"Edited",
+		`action="/posts"`,
+		`data-submit-once`,
+		`data-submit-button`,
+		`action="/posts/` + root.ID + `/edit"`,
+		`action="/posts/` + homeownerReply.ID + `/edit"`,
+		`href="/questions/` + root.ID + `#post-` + root.ID + `"`,
+		`href="/questions/` + root.ID + `#post-` + homeownerReply.ID + `"`,
+		`href="/questions/` + root.ID + `#post-` + adminReply.ID + `"`,
+		`>The model number is 123A.</textarea>`,
+		`removeAttribute('open')`,
+	} {
+		if !strings.Contains(body, want) {
+			t.Fatalf("question page missing %q: %s", want, body)
+		}
+	}
+	if got := strings.Count(body, ">Permalink</a>"); got != 3 {
+		t.Fatalf("question page rendered %d permalinks, want 3: %s", got, body)
+	}
+	if strings.Contains(body, `action="/posts/`+adminReply.ID+`/edit"`) {
+		t.Fatalf("homeowner can edit admin reply: %s", body)
+	}
+
+	rec = httptest.NewRecorder()
+	req = httptest.NewRequest(http.MethodGet, "/questions/"+root.ID, nil)
+	for _, cookie := range adminCookies {
+		req.AddCookie(cookie)
+	}
+	handler.ServeHTTP(rec, req)
+	if rec.Code != http.StatusOK ||
+		!strings.Contains(rec.Body.String(), `action="/posts/`+adminReply.ID+`/edit"`) ||
+		strings.Contains(rec.Body.String(), `action="/posts/`+root.ID+`/edit"`) {
+		t.Fatalf("admin edit controls are incorrect: %d %s", rec.Code, rec.Body.String())
+	}
+}
+
+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/profile.go

@@ -23,7 +23,7 @@ import (
 type profilePage struct {
 	page
 	States         []struct{ Code, Name string }
-	Questions      []store.RankedQuestion
+	Posts          []store.Post
 	QuestionsLabel string
 	UploadsEnabled bool
 	Error          string
@@ -255,16 +255,16 @@ func fitAvatar(img image.Image, maxDim int) image.Image {
 
 func (s *Server) renderProfile(w http.ResponseWriter, r *http.Request, u *store.User, errMsg, stateVal, emailVal string) {
 	var (
-		questions []store.RankedQuestion
+		posts []store.Post
-		label     string
+		label string
-		err       error
+		err   error
 	)
 	if u.Admin() {
 		label = "Questions you answered"
-		questions, err = s.store.ListQuestionsAnsweredBy(r.Context(), u.ID)
+		posts, err = s.store.ListRootPostsAnsweredBy(r.Context(), u.ID)
 	} else {
 		label = "Your questions"
-		questions, err = s.store.ListQuestionsByAuthor(r.Context(), u.ID)
+		posts, err = s.store.ListRootPostsByAuthor(r.Context(), u.ID)
 	}
 	if err != nil {
 		http.Error(w, "could not load questions", http.StatusInternalServerError)
@@ -275,7 +275,7 @@ func (s *Server) renderProfile(w http.ResponseWriter, r *http.Request, u *store.
 	s.exec(w, "profile", profilePage{
 		page:           p,
 		States:         geo.States,
-		Questions:      questions,
+		Posts:          posts,
 		QuestionsLabel: label,
 		UploadsEnabled: s.cfg.Blob.Enabled(),
 		Error:          errMsg,

internal/web/server.go

@@ -3,7 +3,6 @@ package web
 import (
 	"context"
 	"crypto/rand"
-	"database/sql"
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -64,13 +63,12 @@ type huntPage struct {
 	Label       string
 	IsToday     bool
 	IsYesterday bool
-	Questions   []store.RankedQuestion
+	Posts       []*store.Post
 }
 
 type questionPage struct {
 	page
-	Question *store.RankedQuestion
+	Question *store.Post
-	Answer   *store.Answer
 }
 
 type submitPage struct {
@@ -90,11 +88,19 @@ type authPage struct {
 }
 
 type voteCtx struct {
-	User     *store.User
+	User *store.User
-	CSRF     string
+	CSRF string
-	View     string
+	View string
-	Date     string
+	Date string
-	Question store.RankedQuestion
+	Post *store.Post
+}
+
+type threadPostCtx struct {
+	User  *store.User
+	CSRF  string
+	Root  *store.Post
+	Post  *store.Post
+	Depth int
 }
 
 func New(st store.Store, sessionStore scs.Store, templateFS fs.FS, staticFS fs.FS, cfg Config) (*Server, error) {
@@ -105,12 +111,27 @@ func New(st store.Store, sessionStore scs.Store, templateFS fs.FS, staticFS fs.F
 		cfg.Mail = mail.Nop{}
 	}
 	funcMap := template.FuncMap{
-		"voteCtx": func(user *store.User, csrf, view, date string, q store.RankedQuestion) voteCtx {
+		"voteCtx": func(user *store.User, csrf, view, date string, post *store.Post) voteCtx {
-			return voteCtx{User: user, CSRF: csrf, View: view, Date: date, Question: q}
+			return voteCtx{User: user, CSRF: csrf, View: view, Date: date, Post: post}
+		},
+		"postCtx": func(user *store.User, csrf string, root, post *store.Post, depth int) threadPostCtx {
+			return threadPostCtx{User: user, CSRF: csrf, Root: root, Post: post, Depth: depth}
+		},
+		"add":         func(a, b int) int { return a + b },
+		"rank":        func(i int) int { return i + 1 },
+		"isAdmin":     func(u *store.User) bool { return u.Admin() },
+		"canReply":    canReplyToThread,
+		"canEditPost": canEditPost,
+		"postLabel":   postLabel,
+		"postDepth":   postDepthClass,
+		"isEdited":    func(post *store.Post) bool { return post != nil && post.UpdatedAt != post.CreatedAt },
+		"postTime": func(value string) string {
+			t, err := time.Parse(time.RFC3339Nano, value)
+			if err != nil {
+				return value
+			}
+			return t.In(pacific.Loc).Format("Jan 2, 2006 · 3:04 PM")
 		},
-		"add":          func(a, b int) int { return a + b },
-		"rank":         func(i int) int { return i + 1 },
-		"isAdmin":      func(u *store.User) bool { return u.Admin() },
 		"pacificLabel": pacific.Label,
 		"locationTag": func(u *store.User) string {
 			if u != nil {
@@ -175,7 +196,6 @@ func (s *Server) Handler() http.Handler {
 	r.Post("/submit", s.handleSubmit)
 	r.Get("/questions/{id}", s.handleQuestion)
 	r.Post("/questions/{id}/vote", s.handleVote)
-	r.Post("/questions/{id}/answer", s.handleAnswer)
 	r.Post("/questions/{id}/hide", s.handleHide)
 	r.Post("/posts", s.handleCreatePost)
 	r.Post("/posts/{id}/edit", s.handleEditPost)
@@ -281,7 +301,7 @@ func (s *Server) renderHunt(w http.ResponseWriter, r *http.Request, date string)
 	if u := currentUser(r); u != nil {
 		viewer = u.ID
 	}
-	questions, err := s.store.ListHunt(r.Context(), date, viewer)
+	posts, err := s.store.ListRootPosts(r.Context(), date, viewer)
 	if err != nil {
 		http.Error(w, "could not load questions", http.StatusInternalServerError)
 		return
@@ -297,7 +317,7 @@ func (s *Server) renderHunt(w http.ResponseWriter, r *http.Request, date string)
 		Label:       label,
 		IsToday:     pacific.IsToday(date),
 		IsYesterday: pacific.IsYesterday(date),
-		Questions:   questions,
+		Posts:       postPointers(posts),
 	})
 }
 
@@ -341,17 +361,17 @@ func (s *Server) handleSubmit(w http.ResponseWriter, r *http.Request) {
 	if len(city) > 80 {
 		city = truncateRunes(city, 80)
 	}
-	q := &store.RankedQuestion{
+	post := &store.Post{
 		AuthorID: u.ID,
 		Title:    title,
 		Body:     body,
 		City:     city,
 	}
-	if err := s.store.CreateQuestion(r.Context(), q); err != nil {
+	if err := s.store.CreatePost(r.Context(), post); err != nil {
 		http.Error(w, "could not save question", http.StatusInternalServerError)
 		return
 	}
-	http.Redirect(w, r, "/questions/"+url.PathEscape(q.ID), http.StatusSeeOther)
+	http.Redirect(w, r, "/questions/"+url.PathEscape(post.ID), http.StatusSeeOther)
 }
 
 func (s *Server) handleQuestion(w http.ResponseWriter, r *http.Request) {
@@ -360,29 +380,14 @@ func (s *Server) handleQuestion(w http.ResponseWriter, r *http.Request) {
 	if u := currentUser(r); u != nil {
 		viewer = u.ID
 	}
-	q, err := s.store.GetQuestion(r.Context(), id, viewer)
+	post, err := s.store.GetPostThreadForViewer(r.Context(), id, viewer)
-	if err != nil || (q.Hidden && !currentUser(r).Admin()) {
+	if err != nil || (post.PostState == store.PostStateHidden && !currentUser(r).Admin()) {
 		http.NotFound(w, r)
 		return
 	}
-	var ans *store.Answer
-	if q.Answered {
-		ans, err = s.store.GetAnswer(r.Context(), q.ID)
-		if err != nil {
-			if errors.Is(err, sql.ErrNoRows) {
-				log.Printf("question %s marked answered but answer missing", q.ID)
-				http.Error(w, "answer unavailable", http.StatusInternalServerError)
-				return
-			}
-			log.Printf("get answer %s: %v", q.ID, err)
-			http.Error(w, "could not load answer", http.StatusInternalServerError)
-			return
-		}
-	}
 	s.exec(w, "question", questionPage{
-		page:     s.basePage(r, q.Title),
+		page:     s.basePage(r, post.Title),
-		Question: q,
+		Question: post,
-		Answer:   ans,
 	})
 }
 
@@ -412,8 +417,8 @@ func (s *Server) handleVote(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "invalid vote", http.StatusBadRequest)
 		return
 	}
-	if err := s.store.Vote(r.Context(), u.ID, id, value); err != nil {
+	if err := s.store.VotePost(r.Context(), u.ID, id, value); err != nil {
-		if errors.Is(err, store.ErrHiddenOrMissing) {
+		if errors.Is(err, store.ErrPostNotVotable) {
 			http.Error(w, "not found", http.StatusNotFound)
 			return
 		}
@@ -427,17 +432,17 @@ func (s *Server) handleVote(w http.ResponseWriter, r *http.Request) {
 			s.renderLeaderboard(w, r, date)
 			return
 		}
-		q, err := s.store.GetQuestion(r.Context(), id, u.ID)
+		post, err := s.store.GetPostThreadForViewer(r.Context(), id, u.ID)
 		if err != nil {
 			http.Error(w, "not found", http.StatusNotFound)
 			return
 		}
 		s.exec(w, "vote", voteCtx{
-			User:     u,
+			User: u,
-			CSRF:     s.sessions.GetString(r.Context(), "csrf"),
+			CSRF: s.sessions.GetString(r.Context(), "csrf"),
-			View:     "question",
+			View: "question",
-			Date:     q.HuntDate,
+			Date: post.PostDate,
-			Question: *q,
+			Post: post,
 		})
 		return
 	}
@@ -460,97 +465,18 @@ func (s *Server) renderLeaderboard(w http.ResponseWriter, r *http.Request, date
 	if u := currentUser(r); u != nil {
 		viewer = u.ID
 	}
-	questions, err := s.store.ListHunt(r.Context(), date, viewer)
+	posts, err := s.store.ListRootPosts(r.Context(), date, viewer)
 	if err != nil {
 		http.Error(w, "could not load questions", http.StatusInternalServerError)
 		return
 	}
 	s.exec(w, "leaderboard", huntPage{
-		page:      s.basePage(r, ""),
+		page:  s.basePage(r, ""),
-		Date:      date,
+		Date:  date,
-		Questions: questions,
+		Posts: postPointers(posts),
 	})
 }
 
-func (s *Server) handleAnswer(w http.ResponseWriter, r *http.Request) {
-	if !s.requireCSRF(w, r) {
-		return
-	}
-	u := currentUser(r)
-	if !u.Admin() {
-		http.Error(w, "forbidden", http.StatusForbidden)
-		return
-	}
-	id := chi.URLParam(r, "id")
-	body := strings.TrimSpace(r.PostFormValue("body"))
-	if body == "" {
-		http.Error(w, "answer required", http.StatusBadRequest)
-		return
-	}
-	if len(body) > 12000 {
-		body = truncateRunes(body, 12000)
-	}
-	q, err := s.store.GetQuestion(r.Context(), id, u.ID)
-	if err != nil {
-		http.NotFound(w, r)
-		return
-	}
-	_, priorErr := s.store.GetAnswer(r.Context(), id)
-	wasNew := errors.Is(priorErr, sql.ErrNoRows)
-	if priorErr != nil && !wasNew {
-		http.Error(w, "could not load answer", http.StatusInternalServerError)
-		return
-	}
-	ans := &store.Answer{
-		QuestionID: id,
-		AuthorID:   u.ID,
-		Body:       body,
-	}
-	if err := s.store.UpsertAnswer(r.Context(), ans); err != nil {
-		http.Error(w, "could not save answer", http.StatusInternalServerError)
-		return
-	}
-	if wasNew {
-		s.notifyQuestionAnswered(q, body, u.ID)
-	}
-	saved, err := s.store.GetAnswer(r.Context(), id)
-	if err != nil {
-		http.Error(w, "could not load answer", http.StatusInternalServerError)
-		return
-	}
-	if isHTMX(r) {
-		s.exec(w, "answer", questionPage{page: s.basePage(r, ""), Answer: saved})
-		return
-	}
-	http.Redirect(w, r, "/questions/"+url.PathEscape(id), http.StatusSeeOther)
-}
-
-func (s *Server) notifyQuestionAnswered(q *store.RankedQuestion, answerBody, adminID string) {
-	if q == nil || s.cfg.Mail == nil {
-		return
-	}
-	author, err := s.store.UserByID(context.Background(), q.AuthorID)
-	if err != nil || author == nil || author.Email == "" || author.ID == adminID {
-		return
-	}
-	msg := mail.QuestionAnswered{
-		ToEmail:       author.Email,
-		ToName:        author.Name,
-		QuestionID:    q.ID,
-		QuestionTitle: q.Title,
-		AnswerBody:    answerBody,
-	}
-	go func() {
-		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-		defer cancel()
-		if err := s.cfg.Mail.NotifyQuestionAnswered(ctx, msg); err != nil {
-			log.Printf("notify answer %s: %v", q.ID, err)
-			return
-		}
-		log.Printf("notify answer %s: accepted", q.ID)
-	}()
-}
-
 func (s *Server) handleHide(w http.ResponseWriter, r *http.Request) {
 	if !s.requireCSRF(w, r) {
 		return
@@ -561,17 +487,17 @@ func (s *Server) handleHide(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	id := chi.URLParam(r, "id")
-	q, err := s.store.GetQuestion(r.Context(), id, u.ID)
+	post, err := s.store.GetPost(r.Context(), id)
-	if err != nil {
+	if err != nil || post.ParentID != nil {
 		http.NotFound(w, r)
 		return
 	}
-	if err := s.store.HideQuestion(r.Context(), id); err != nil {
+	if err := s.store.SetRootPostState(r.Context(), id, store.PostStateHidden); err != nil {
 		http.Error(w, "could not hide", http.StatusInternalServerError)
 		return
 	}
 	if isHTMX(r) && r.PostFormValue("view") == "list" {
-		s.renderLeaderboard(w, r, q.HuntDate)
+		s.renderLeaderboard(w, r, post.PostDate)
 		return
 	}
 	if isHTMX(r) {

internal/web/server_test.go

@@ -19,7 +19,6 @@ import (
 
 	"plumber"
 	"plumber/internal/blob"
-	"plumber/internal/mail"
 	"plumber/internal/pacific"
 	"plumber/internal/store"
 )
@@ -169,6 +168,16 @@ func TestRegisterLoginAsk(t *testing.T) {
 	if rec.Code != 200 {
 		t.Fatalf("submit form %d", rec.Code)
 	}
+	for _, want := range []string{
+		`src="/static/app.js"`,
+		`id="submit-progress"`,
+		`data-submit-once`,
+		`data-submit-button`,
+	} {
+		if !strings.Contains(rec.Body.String(), want) {
+			t.Fatalf("submit form missing %q: %s", want, rec.Body.String())
+		}
+	}
 	csrf := csrfFrom(rec.Body.String())
 	form := strings.NewReader("_csrf=" + csrf + "&title=Leaky+faucet&body=Drip+all+night.&city=Oakland")
 	req = httptest.NewRequest(http.MethodPost, "/submit", form)
@@ -417,21 +426,21 @@ func TestProfileAdminAnsweredListAndAvatarUpload(t *testing.T) {
 	alice := seedUser(t, mem, aliceName, "hunter22", store.RoleUser)
 	adminCookies := loginUser(t, h, hubName, "hunter22")
 
-	q := &store.RankedQuestion{
+	root := &store.Post{
 		AuthorID: alice.ID,
 		Title:    "Drip",
 		Body:     "Under sink",
 		City:     "Oakland",
 	}
-	if err := mem.CreateQuestion(context.Background(), q); err != nil {
+	if err := mem.CreatePost(context.Background(), root); err != nil {
 		t.Fatal(err)
 	}
-	ans := &store.Answer{
+	reply := &store.Post{
-		QuestionID: q.ID,
+		ParentID: &root.ID,
-		AuthorID:   hub.ID,
+		AuthorID: hub.ID,
-		Body:       "Replace the cartridge.",
+		Body:     "Replace the cartridge.",
 	}
-	if err := mem.UpsertAnswer(context.Background(), ans); err != nil {
+	if err := mem.CreatePost(context.Background(), reply); err != nil {
 		t.Fatal(err)
 	}
 
@@ -483,24 +492,24 @@ func TestProfileAdminAnsweredListAndAvatarUpload(t *testing.T) {
 	}
 }
 
-func TestMutationsVoteAnswerHideAndCSRF(t *testing.T) {
+func TestMutationsVoteHideAndCSRF(t *testing.T) {
 	srv, mem := newTestServer(t, Config{})
 	h := srv.Handler()
 	adminName := uniq("admin")
 	userName := uniq("user")
-	admin := seedUser(t, mem, adminName, "hunter22", store.RoleAdmin)
+	seedUser(t, mem, adminName, "hunter22", store.RoleAdmin)
 	user := seedUser(t, mem, userName, "hunter22", store.RoleUser)
 	adminCookies := loginUser(t, h, adminName, "hunter22")
 	userCookies := loginUser(t, h, userName, "hunter22")
 
-	q := &store.RankedQuestion{
+	q := &store.Post{
 		AuthorID: user.ID,
 		Title:    "Pipe noise",
 		Body:     "Clanking",
 		City:     "SF",
-		HuntDate: pacific.Today(),
+		PostDate: pacific.Today(),
 	}
-	if err := mem.CreateQuestion(context.Background(), q); err != nil {
+	if err := mem.CreatePost(context.Background(), q); err != nil {
 		t.Fatal(err)
 	}
 
@@ -556,75 +565,16 @@ func TestMutationsVoteAnswerHideAndCSRF(t *testing.T) {
 	if rec.Code != 200 {
 		t.Fatalf("vote htmx %d %s", rec.Code, rec.Body.String())
 	}
-	got, err := mem.GetQuestion(context.Background(), q.ID, user.ID)
+	got, err := mem.GetPostThreadForViewer(context.Background(), q.ID, user.ID)
 	if err != nil || got.UserVote != 1 || got.Score != 1 {
 		t.Fatalf("vote not applied: %+v %v", got, err)
 	}
 
-	// Non-admin answer rejected
 	rec = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodGet, "/questions/"+q.ID, nil)
+	req = httptest.NewRequest(http.MethodPost, "/questions/"+q.ID+"/answer", nil)
-	for _, c := range userCookies {
-		req.AddCookie(c)
-	}
 	h.ServeHTTP(rec, req)
-	csrf = csrfFrom(rec.Body.String())
+	if rec.Code != http.StatusNotFound {
-	form = strings.NewReader("_csrf=" + csrf + "&body=Nope")
+		t.Fatalf("removed answer endpoint want 404, got %d", rec.Code)
-	req = httptest.NewRequest(http.MethodPost, "/questions/"+q.ID+"/answer", form)
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	for _, c := range userCookies {
-		req.AddCookie(c)
-	}
-	rec = httptest.NewRecorder()
-	h.ServeHTTP(rec, req)
-	if rec.Code != http.StatusForbidden {
-		t.Fatalf("non-admin answer want 403, got %d", rec.Code)
-	}
-
-	// Admin answer success (HTMX)
-	rec = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodGet, "/questions/"+q.ID, nil)
-	for _, c := range adminCookies {
-		req.AddCookie(c)
-	}
-	h.ServeHTTP(rec, req)
-	csrf = csrfFrom(rec.Body.String())
-	form = strings.NewReader("_csrf=" + csrf + "&body=Tighten+the+nuts.")
-	req = httptest.NewRequest(http.MethodPost, "/questions/"+q.ID+"/answer", form)
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("HX-Request", "true")
-	for _, c := range adminCookies {
-		req.AddCookie(c)
-	}
-	rec = httptest.NewRecorder()
-	h.ServeHTTP(rec, req)
-	if rec.Code != 200 || !strings.Contains(rec.Body.String(), "Tighten the nuts") {
-		t.Fatalf("admin answer: %d %s", rec.Code, rec.Body.String())
-	}
-	if body := rec.Body.String(); !strings.Contains(body, `class="answer-editor"`) ||
-		!strings.Contains(body, "<summary>Edit answer</summary>") ||
-		!strings.Contains(body, ">Tighten the nuts.</textarea>") ||
-		!strings.Contains(body, `type="reset" class="btn btn-ghost"`) ||
-		!strings.Contains(body, `removeAttribute('open')`) ||
-		strings.Contains(body, `<details class="answer-editor" open`) {
-		t.Fatalf("admin answer editor is not collapsed and populated: %s", body)
-	}
-	if _, err := mem.GetAnswer(context.Background(), q.ID); err != nil {
-		t.Fatal(err)
-	}
-
-	// The public answer is visible to its author, but editing remains admin-only.
-	rec = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodGet, "/questions/"+q.ID, nil)
-	for _, c := range userCookies {
-		req.AddCookie(c)
-	}
-	h.ServeHTTP(rec, req)
-	if rec.Code != 200 || !strings.Contains(rec.Body.String(), "Tighten the nuts.") {
-		t.Fatalf("question author cannot see answer: %d %s", rec.Code, rec.Body.String())
-	}
-	if strings.Contains(rec.Body.String(), `class="answer-editor"`) {
-		t.Fatalf("question author can see admin answer editor: %s", rec.Body.String())
 	}
 
 	// Hide invalid id
@@ -659,8 +609,8 @@ func TestMutationsVoteAnswerHideAndCSRF(t *testing.T) {
 	if rec.Code != http.StatusSeeOther {
 		t.Fatalf("hide %d %s", rec.Code, rec.Body.String())
 	}
-	hidden, err := mem.GetQuestion(context.Background(), q.ID, admin.ID)
+	hidden, err := mem.GetPost(context.Background(), q.ID)
-	if err != nil || !hidden.Hidden {
+	if err != nil || hidden.PostState != store.PostStateHidden {
 		t.Fatalf("question not hidden: %+v %v", hidden, err)
 	}
 }
@@ -713,113 +663,6 @@ func TestRegisterRequiresEmail(t *testing.T) {
 	}
 }
 
-func TestAnswerNotifyFirstOnly(t *testing.T) {
-	recMail := &mail.Recording{}
-	srv, mem := newTestServer(t, Config{Mail: recMail})
-	h := srv.Handler()
-	adminName := uniq("adm")
-	askName := uniq("ask")
-	admin := seedUser(t, mem, adminName, "hunter22", store.RoleAdmin)
-	asker := seedUser(t, mem, askName, "hunter22", store.RoleUser)
-	adminCookies := loginUser(t, h, adminName, "hunter22")
-
-	q := &store.RankedQuestion{
-		AuthorID: asker.ID,
-		Title:    "Leaky sink",
-		Body:     "Drip",
-		City:     "Oakland",
-		HuntDate: pacific.Today(),
-	}
-	if err := mem.CreateQuestion(context.Background(), q); err != nil {
-		t.Fatal(err)
-	}
-
-	postAnswer := func(body string) {
-		t.Helper()
-		w := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodGet, "/questions/"+q.ID, nil)
-		for _, c := range adminCookies {
-			req.AddCookie(c)
-		}
-		h.ServeHTTP(w, req)
-		csrf := csrfFrom(w.Body.String())
-		form := strings.NewReader("_csrf=" + csrf + "&body=" + body)
-		req = httptest.NewRequest(http.MethodPost, "/questions/"+q.ID+"/answer", form)
-		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-		req.Header.Set("HX-Request", "true")
-		for _, c := range adminCookies {
-			req.AddCookie(c)
-		}
-		w = httptest.NewRecorder()
-		h.ServeHTTP(w, req)
-		if w.Code != 200 {
-			t.Fatalf("answer %d %s", w.Code, w.Body.String())
-		}
-	}
-
-	postAnswer("First+reply")
-	deadline := time.Now().Add(2 * time.Second)
-	var msgs []mail.QuestionAnswered
-	for time.Now().Before(deadline) {
-		msgs = recMail.Snapshot()
-		if len(msgs) > 0 {
-			break
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	if len(msgs) != 1 {
-		t.Fatalf("first answer notifies once, got %d", len(msgs))
-	}
-	if msgs[0].ToEmail != asker.Email || msgs[0].QuestionID != q.ID {
-		t.Fatalf("unexpected notify: %+v", msgs[0])
-	}
-	if msgs[0].AnswerBody != "First reply" {
-		t.Fatalf("answer body %q", msgs[0].AnswerBody)
-	}
-
-	postAnswer("Edited+reply")
-	time.Sleep(50 * time.Millisecond)
-	if recMail.Len() != 1 {
-		t.Fatalf("edit must not notify again, got %d", recMail.Len())
-	}
-
-	// Author without email is skipped
-	recMail2 := &mail.Recording{}
-	srv2, mem2 := newTestServer(t, Config{Mail: recMail2})
-	h2 := srv2.Handler()
-	admin2 := seedUser(t, mem2, uniq("adm2"), "hunter22", store.RoleAdmin)
-	noMail := &store.User{Username: uniq("silent"), PasswordHash: admin.PasswordHash, Role: store.RoleUser, Email: ""}
-	hash, _ := bcrypt.GenerateFromPassword([]byte("hunter22"), bcrypt.MinCost)
-	noMail.PasswordHash = string(hash)
-	if err := mem2.CreateUser(context.Background(), noMail); err != nil {
-		t.Fatal(err)
-	}
-	q2 := &store.RankedQuestion{AuthorID: noMail.ID, Title: "Quiet", Body: "x", HuntDate: pacific.Today()}
-	if err := mem2.CreateQuestion(context.Background(), q2); err != nil {
-		t.Fatal(err)
-	}
-	cookies := loginUser(t, h2, admin2.Username, "hunter22")
-	w := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodGet, "/questions/"+q2.ID, nil)
-	for _, c := range cookies {
-		req.AddCookie(c)
-	}
-	h2.ServeHTTP(w, req)
-	csrf := csrfFrom(w.Body.String())
-	form := strings.NewReader("_csrf=" + csrf + "&body=Hello")
-	req = httptest.NewRequest(http.MethodPost, "/questions/"+q2.ID+"/answer", form)
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	for _, c := range cookies {
-		req.AddCookie(c)
-	}
-	w = httptest.NewRecorder()
-	h2.ServeHTTP(w, req)
-	time.Sleep(50 * time.Millisecond)
-	if recMail2.Len() != 0 {
-		t.Fatalf("empty email must skip notify, got %d", recMail2.Len())
-	}
-}
-
 // TestRegisterThrottleUsesTCPPeerThroughRouter ensures forged X-Forwarded-For
 // cannot bypass rate limits when the direct peer is outside TrustedProxies.
 // This must go through Handler() so middleware ordering bugs are caught.

schema.sql

@@ -14,34 +14,6 @@ CREATE UNIQUE INDEX IF NOT EXISTS users_email_lower_uidx
   ON users (lower(email))
   WHERE email <> '';
 
-CREATE TABLE IF NOT EXISTS questions (
-  id TEXT PRIMARY KEY,
-  author_id TEXT NOT NULL REFERENCES users(id),
-  title TEXT NOT NULL,
-  body TEXT NOT NULL,
-  city TEXT NOT NULL DEFAULT '',
-  hunt_date TEXT NOT NULL,
-  hidden INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL
-);
-
-CREATE INDEX IF NOT EXISTS idx_questions_hunt_date ON questions(hunt_date, hidden);
-
-CREATE TABLE IF NOT EXISTS votes (
-  user_id TEXT NOT NULL REFERENCES users(id),
-  question_id TEXT NOT NULL REFERENCES questions(id) ON DELETE CASCADE,
-  value INTEGER NOT NULL CHECK (value IN (-1, 1)),
-  PRIMARY KEY (user_id, question_id)
-);
-
-CREATE TABLE IF NOT EXISTS answers (
-  question_id TEXT PRIMARY KEY REFERENCES questions(id) ON DELETE CASCADE,
-  author_id TEXT NOT NULL REFERENCES users(id),
-  body TEXT NOT NULL,
-  created_at TEXT NOT NULL,
-  updated_at TEXT NOT NULL
-);
-
 CREATE TABLE IF NOT EXISTS posts (
   id TEXT PRIMARY KEY,
   parent_id TEXT REFERENCES posts(id) ON DELETE CASCADE,
@@ -63,6 +35,9 @@ CREATE TABLE IF NOT EXISTS posts (
 CREATE INDEX IF NOT EXISTS idx_posts_parent_created
   ON posts(parent_id, created_at, id);
 
+CREATE INDEX IF NOT EXISTS idx_posts_author_created
+  ON posts(author_id, created_at DESC, id DESC);
+
 CREATE INDEX IF NOT EXISTS idx_posts_root_date
   ON posts(post_date, post_state)
   WHERE parent_id IS NULL;

static/app.css

@@ -41,6 +41,31 @@ body {
   background-size: 100% 100%, 48px 48px;
 }
 
+.submit-progress {
+  position: fixed;
+  inset: 0 0 auto;
+  z-index: 100;
+  height: 3px;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.submit-progress[hidden] { display: none; }
+
+.submit-progress-bar {
+  display: block;
+  width: 35%;
+  height: 100%;
+  background: var(--signal);
+  box-shadow: 0 0 12px var(--signal);
+  animation: submit-progress 900ms ease-in-out infinite;
+}
+
+@keyframes submit-progress {
+  from { transform: translateX(-100%); }
+  to { transform: translateX(300%); }
+}
+
 img, svg { display: block; }
 
 a {
@@ -253,6 +278,12 @@ a {
 
 .btn-primary:hover { filter: brightness(1.08); }
 
+.btn:disabled {
+  cursor: wait;
+  opacity: 0.65;
+  filter: none;
+}
+
 .btn-ghost {
   background: transparent;
   color: var(--ink);
@@ -552,12 +583,14 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
   padding: 18px 14px;
 }
 
+.post-content { min-width: 0; }
+
 .question-page h1 {
   font-size: clamp(1.5rem, 3.5vw, 2.1rem);
   line-height: 1.15;
 }
 
-.q-body, .answer-body {
+.post-body {
   white-space: pre-wrap;
   margin: 14px 0 0;
   text-wrap: pretty;
@@ -574,18 +607,7 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
 }
 .crumb a:hover { color: var(--signal); }
 
-.answer {
+.post-kicker {
-  margin-top: 16px;
-  padding: 20px 18px;
-  background: var(--panel);
-  border: 1px solid var(--line);
-}
-
-.answer.is-in {
-  border-color: var(--signal);
-}
-
-.answer-kicker {
   margin: 0 0 6px;
   font-family: var(--mono);
   text-transform: uppercase;
@@ -595,27 +617,99 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
   color: var(--signal);
 }
 
-.answer h2 {
+.conversation {
-  margin: 0;
+  margin-top: 32px;
-  font-size: 1.15rem;
-  font-weight: 500;
-  letter-spacing: 0.04em;
-  text-transform: uppercase;
 }
 
-.byline {
+.conversation-head {
+  margin-bottom: 12px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid var(--line);
+}
+
+.conversation h2 {
+  margin: 0;
+  font-size: 1.25rem;
+  font-weight: 500;
+}
+
+.conversation-head .eyebrow {
+  margin-bottom: 5px;
+}
+
+.thread {
+  display: grid;
+  gap: 12px;
+}
+
+.thread-post {
+  position: relative;
+  padding: 16px;
+  background: var(--panel);
+  border: 1px solid var(--line);
+  border-left: 2px solid var(--zinc);
+  overflow-wrap: anywhere;
+}
+
+.thread-post.is-shop {
+  border-left-color: var(--signal);
+}
+
+.thread-post:target,
+.q-detail:target {
+  outline: 2px solid var(--signal);
+  outline-offset: 3px;
+}
+
+.thread-post-branch,
+.thread-post-deep {
+  margin-left: clamp(12px, 4vw, 28px);
+}
+
+.thread-post-deep .thread-post-deep {
+  margin-left: 0;
+}
+
+.post-replies {
+  display: grid;
+  gap: 12px;
+  margin-top: 12px;
+}
+
+.post-meta {
   margin: 6px 0 0;
   color: var(--muted);
   font-family: var(--mono);
   font-size: 0.72rem;
 }
 
-.answer-editor {
+.edited {
-  margin-top: 16px;
+  display: inline-block;
+  margin-left: 8px;
+  color: var(--zinc);
+  font-size: 0.65rem;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+}
+
+.post-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  gap: 0 16px;
+  margin-top: 10px;
   border-top: 1px solid var(--line);
 }
 
-.answer-editor summary {
+.post-composer {
+  min-width: 0;
+}
+
+.post-composer[open] {
+  flex: 1 0 100%;
+}
+
+.post-composer summary {
   display: flex;
   width: fit-content;
   min-height: 44px;
@@ -630,23 +724,39 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
   list-style: none;
 }
 
-.answer-editor summary::-webkit-details-marker { display: none; }
+.post-composer summary::-webkit-details-marker { display: none; }
-.answer-editor summary:hover,
+.post-composer summary::marker { content: ""; }
-.answer-editor[open] summary { color: var(--signal); }
+.post-composer summary:hover,
-.answer-editor summary:focus-visible {
+.post-composer[open] summary { color: var(--signal); }
+.post-composer summary:focus-visible {
   outline: 2px solid var(--signal);
   outline-offset: 2px;
 }
 
-.answer-editor .answer-form { margin-top: 4px; }
+.post-form {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  width: 100%;
+  margin: 0 0 14px;
+}
 
-.answer-form-actions {
+.post-form-actions {
   display: flex;
   flex-wrap: wrap;
   gap: 8px;
 }
 
-.answer-form-actions .btn { flex: 1 1 10rem; }
+.post-form-actions .btn { flex: 1 1 10rem; }
+
+.post-permalink {
+  display: inline-flex;
+  align-items: center;
+}
+
+.post-hide {
+  margin: 0;
+}
 
 .waiting { color: var(--muted); margin: 0; font-family: var(--mono); font-size: 0.8rem; }
 
@@ -689,6 +799,10 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
 
 @media (prefers-reduced-motion: reduce) {
   .btn-primary:hover { filter: none; }
+  .submit-progress-bar {
+    width: 100%;
+    animation: none;
+  }
 }
 
 .admin-users { margin-top: 20px; overflow-x: auto; }

static/app.js

@@ -0,0 +1,58 @@
+(() => {
+  const formSelector = "form[data-submit-once]";
+
+  function progressIndicator() {
+    return document.getElementById("submit-progress");
+  }
+
+  function resetForm(form) {
+    form.removeAttribute("aria-busy");
+    delete form.dataset.submitting;
+
+    const button = form.querySelector("[data-submit-button]");
+    if (!button) {
+      return;
+    }
+    button.disabled = false;
+    button.removeAttribute("aria-disabled");
+    if (button.dataset.idleLabel) {
+      button.textContent = button.dataset.idleLabel;
+      delete button.dataset.idleLabel;
+    }
+  }
+
+  document.addEventListener("submit", (event) => {
+    const form = event.target.closest(formSelector);
+    if (!form) {
+      return;
+    }
+    if (form.dataset.submitting === "true") {
+      event.preventDefault();
+      return;
+    }
+
+    form.dataset.submitting = "true";
+    form.setAttribute("aria-busy", "true");
+
+    const button = event.submitter || form.querySelector("[data-submit-button]");
+    if (button) {
+      button.dataset.idleLabel = button.textContent;
+      button.textContent = form.dataset.submittingLabel || "Posting…";
+      button.disabled = true;
+      button.setAttribute("aria-disabled", "true");
+    }
+
+    const progress = progressIndicator();
+    if (progress) {
+      progress.hidden = false;
+    }
+  });
+
+  window.addEventListener("pageshow", () => {
+    document.querySelectorAll(formSelector).forEach(resetForm);
+    const progress = progressIndicator();
+    if (progress) {
+      progress.hidden = true;
+    }
+  });
+})();

templates/base.html

@@ -11,8 +11,13 @@
   <link href="https://fonts.googleapis.com/css2?family=Archivo:ital,wght@0,400;0,500;0,600;1,400&family=IBM+Plex+Mono:wght@400;500;600&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="/static/app.css">
   <script src="/static/htmx.min.js" defer></script>
+  <script src="/static/app.js" defer></script>
 </head>
 <body>
+  <div id="submit-progress" class="submit-progress" role="progressbar"
+    aria-label="Posting" aria-valuetext="Posting" hidden>
+    <span class="submit-progress-bar"></span>
+  </div>
   <a class="skip" href="#main">Skip to content</a>
   <header class="top">
     <div class="top-inner">

templates/partials/_answer.html

@@ -1,28 +0,0 @@
-{{define "answer"}}
-<section id="answer-block" class="answer{{if .Answer}} is-in{{end}}">
-  {{if .Answer}}
-    <p class="answer-kicker">Shop response</p>
-    <h2>Answer</h2>
-    <p class="byline">{{.Answer.AuthorName}} · 22 years, Bay Area</p>
-    <p class="answer-body">{{.Answer.Body}}</p>
-    {{if isAdmin .User}}
-      <details class="answer-editor">
-        <summary>Edit answer</summary>
-        <form class="answer-form" method="post" action="/questions/{{.Answer.QuestionID}}/answer"
-          hx-post="/questions/{{.Answer.QuestionID}}/answer" hx-target="#answer-block" hx-swap="outerHTML">
-          <input type="hidden" name="_csrf" value="{{.CSRF}}">
-          <label for="answer-body">Edit answer</label>
-          <textarea id="answer-body" name="body" rows="8" required maxlength="12000">{{.Answer.Body}}</textarea>
-          <div class="answer-form-actions">
-            <button type="submit" class="btn btn-primary">Save answer</button>
-            <button type="reset" class="btn btn-ghost"
-              onclick="this.closest('details').removeAttribute('open')">Cancel</button>
-          </div>
-        </form>
-      </details>
-    {{end}}
-  {{else}}
-    <p class="waiting">No answer yet. Check back after the hunt.</p>
-  {{end}}
-</section>
-{{end}}

templates/partials/_list.html

@@ -1,6 +1,6 @@
 {{define "leaderboard"}}
 <ol id="leaderboard" class="board" start="1">
-  {{if not .Questions}}
+  {{if not .Posts}}
     <li class="empty">
       {{if eq .Date .Today}}
         <p class="empty-kicker">Queue empty</p>
@@ -10,20 +10,20 @@
       {{end}}
     </li>
   {{else}}
-    {{range $i, $q := .Questions}}
+    {{range $i, $post := .Posts}}
       <li class="row">
         <span class="rank" aria-hidden="true">{{rank $i}}</span>
-        {{template "vote" (voteCtx $.User $.CSRF "list" $.Date $q)}}
+        {{template "vote" (voteCtx $.User $.CSRF "list" $.Date $post)}}
         <div class="row-body">
-          <a class="q-title" href="/questions/{{$q.ID}}">{{$q.Title}}</a>
+          <a class="q-title" href="/questions/{{$post.ID}}">{{$post.Title}}</a>
           <p class="meta">
-            <span>{{$q.AuthorName}}</span>
+            <span>{{$post.AuthorName}}</span>
-            {{if $q.City}}<span class="dot" aria-hidden="true">·</span><span>{{$q.City}}</span>{{end}}
+            {{if $post.City}}<span class="dot" aria-hidden="true">·</span><span>{{$post.City}}</span>{{end}}
-            {{if $q.Answered}}<span class="badge">Answered</span>{{end}}
+            {{if $post.Answered}}<span class="badge">Answered</span>{{end}}
           </p>
           {{if isAdmin $.User}}
-            <form class="inline-hide" method="post" action="/questions/{{$q.ID}}/hide"
+            <form class="inline-hide" method="post" action="/questions/{{$post.ID}}/hide"
-              hx-post="/questions/{{$q.ID}}/hide" hx-target="#leaderboard" hx-swap="outerHTML">
+              hx-post="/questions/{{$post.ID}}/hide" hx-target="#leaderboard" hx-swap="outerHTML">
               <input type="hidden" name="_csrf" value="{{$.CSRF}}">
               <input type="hidden" name="view" value="list">
               <button type="submit" class="linkish">Hide</button>

templates/partials/_post.html

@@ -0,0 +1,71 @@
+{{define "postActions"}}
+<div class="post-actions">
+  {{if canReply .User .Root}}
+    <details class="post-composer">
+      <summary>Reply</summary>
+      <form class="post-form" method="post" action="/posts"
+        data-submit-once data-submitting-label="Posting…">
+        <input type="hidden" name="_csrf" value="{{.CSRF}}">
+        <input type="hidden" name="parent_id" value="{{.Post.ID}}">
+        <label for="reply-{{.Post.ID}}">Reply to {{.Post.AuthorName}}</label>
+        <textarea id="reply-{{.Post.ID}}" name="body" rows="5" required maxlength="12000"></textarea>
+        <div class="post-form-actions">
+          <button type="submit" class="btn btn-primary" data-submit-button>Post reply</button>
+          <button type="reset" class="btn btn-ghost"
+            onclick="this.closest('details').removeAttribute('open')">Cancel</button>
+        </div>
+      </form>
+    </details>
+  {{end}}
+  {{if canEditPost .User .Post}}
+    <details class="post-composer">
+      <summary>Edit</summary>
+      <form class="post-form" method="post" action="/posts/{{.Post.ID}}/edit">
+        <input type="hidden" name="_csrf" value="{{.CSRF}}">
+        <label for="edit-{{.Post.ID}}">Edit post</label>
+        <textarea id="edit-{{.Post.ID}}" name="body" rows="5" required
+          maxlength="12000">{{.Post.Body}}</textarea>
+        <div class="post-form-actions">
+          <button type="submit" class="btn btn-primary">Save changes</button>
+          <button type="reset" class="btn btn-ghost"
+            onclick="this.closest('details').removeAttribute('open')">Cancel</button>
+        </div>
+      </form>
+    </details>
+  {{end}}
+  <a class="linkish post-permalink"
+    href="/questions/{{.Root.ID}}#post-{{.Post.ID}}"
+    aria-label="Permanent link to post by {{.Post.AuthorName}}">Permalink</a>
+  {{if and (not .Post.ParentID) (isAdmin .User)}}
+    <form class="post-hide" method="post" action="/questions/{{.Post.ID}}/hide">
+      <input type="hidden" name="_csrf" value="{{.CSRF}}">
+      <button type="submit" class="linkish">Hide</button>
+    </form>
+  {{end}}
+</div>
+{{end}}
+
+{{define "threadReply"}}
+{{$ctx := .}}
+<article id="post-{{.Post.ID}}"
+  class="thread-post thread-post-{{postDepth .Depth}}{{if eq .Post.AuthorRole "admin"}} is-shop{{end}}">
+  <header class="post-head">
+    <p class="post-kicker">{{postLabel .Post}}</p>
+    <p class="post-meta">
+      <span>{{.Post.AuthorName}}</span>
+      <span class="dot" aria-hidden="true">·</span>
+      <time datetime="{{.Post.CreatedAt}}">{{postTime .Post.CreatedAt}}</time>
+      {{if isEdited .Post}}<span class="edited">Edited</span>{{end}}
+    </p>
+  </header>
+  <p class="post-body">{{.Post.Body}}</p>
+  {{template "postActions" .}}
+  {{if .Post.Replies}}
+    <div class="post-replies">
+      {{range .Post.Replies}}
+        {{template "threadReply" (postCtx $ctx.User $ctx.CSRF $ctx.Root . (add $ctx.Depth 1))}}
+      {{end}}
+    </div>
+  {{end}}
+</article>
+{{end}}

templates/partials/_vote.html

@@ -1,26 +1,26 @@
 {{define "vote"}}
-<div id="vote-{{.Question.ID}}" class="vote">
+<div id="vote-{{.Post.ID}}" class="vote">
   {{if .User}}
-    <form method="post" action="/questions/{{.Question.ID}}/vote"
+    <form method="post" action="/questions/{{.Post.ID}}/vote"
-      hx-post="/questions/{{.Question.ID}}/vote"
+      hx-post="/questions/{{.Post.ID}}/vote"
-      {{if eq .View "list"}}hx-target="#leaderboard" hx-swap="outerHTML"{{else}}hx-target="#vote-{{.Question.ID}}" hx-swap="outerHTML"{{end}}>
+      {{if eq .View "list"}}hx-target="#leaderboard" hx-swap="outerHTML"{{else}}hx-target="#vote-{{.Post.ID}}" hx-swap="outerHTML"{{end}}>
       <input type="hidden" name="_csrf" value="{{.CSRF}}">
-      {{if eq .Question.UserVote 1}}<input type="hidden" name="value" value="0">{{else}}<input type="hidden" name="value" value="1">{{end}}
+      {{if eq .Post.UserVote 1}}<input type="hidden" name="value" value="0">{{else}}<input type="hidden" name="value" value="1">{{end}}
       <input type="hidden" name="view" value="{{.View}}">
       <input type="hidden" name="date" value="{{.Date}}">
-      <button type="submit" class="vote-btn{{if eq .Question.UserVote 1}} is-up{{end}}" aria-label="Upvote" aria-pressed="{{if eq .Question.UserVote 1}}true{{else}}false{{end}}">
+      <button type="submit" class="vote-btn{{if eq .Post.UserVote 1}} is-up{{end}}" aria-label="Upvote" aria-pressed="{{if eq .Post.UserVote 1}}true{{else}}false{{end}}">
         <svg width="18" height="18" viewBox="0 0 18 18" aria-hidden="true"><path d="M9 3.5 15 12H3z" fill="currentColor"/></svg>
       </button>
     </form>
-    <span class="score" aria-label="Net score {{.Question.Score}}">{{.Question.Score}}</span>
+    <span class="score" aria-label="Net score {{.Post.Score}}">{{.Post.Score}}</span>
-    <form method="post" action="/questions/{{.Question.ID}}/vote"
+    <form method="post" action="/questions/{{.Post.ID}}/vote"
-      hx-post="/questions/{{.Question.ID}}/vote"
+      hx-post="/questions/{{.Post.ID}}/vote"
-      {{if eq .View "list"}}hx-target="#leaderboard" hx-swap="outerHTML"{{else}}hx-target="#vote-{{.Question.ID}}" hx-swap="outerHTML"{{end}}>
+      {{if eq .View "list"}}hx-target="#leaderboard" hx-swap="outerHTML"{{else}}hx-target="#vote-{{.Post.ID}}" hx-swap="outerHTML"{{end}}>
       <input type="hidden" name="_csrf" value="{{.CSRF}}">
-      {{if eq .Question.UserVote -1}}<input type="hidden" name="value" value="0">{{else}}<input type="hidden" name="value" value="-1">{{end}}
+      {{if eq .Post.UserVote -1}}<input type="hidden" name="value" value="0">{{else}}<input type="hidden" name="value" value="-1">{{end}}
       <input type="hidden" name="view" value="{{.View}}">
       <input type="hidden" name="date" value="{{.Date}}">
-      <button type="submit" class="vote-btn{{if eq .Question.UserVote -1}} is-down{{end}}" aria-label="Downvote" aria-pressed="{{if eq .Question.UserVote -1}}true{{else}}false{{end}}">
+      <button type="submit" class="vote-btn{{if eq .Post.UserVote -1}} is-down{{end}}" aria-label="Downvote" aria-pressed="{{if eq .Post.UserVote -1}}true{{else}}false{{end}}">
         <svg width="18" height="18" viewBox="0 0 18 18" aria-hidden="true"><path d="M9 14.5 3 6h12z" fill="currentColor"/></svg>
       </button>
     </form>
@@ -28,7 +28,7 @@
     <a class="vote-btn" href="/login" hx-get="/auth/prompt" hx-target="#flash" aria-label="Sign in to upvote">
       <svg width="18" height="18" viewBox="0 0 18 18" aria-hidden="true"><path d="M9 3.5 15 12H3z" fill="currentColor"/></svg>
     </a>
-    <span class="score" aria-label="Net score {{.Question.Score}}">{{.Question.Score}}</span>
+    <span class="score" aria-label="Net score {{.Post.Score}}">{{.Post.Score}}</span>
     <a class="vote-btn" href="/login" hx-get="/auth/prompt" hx-target="#flash" aria-label="Sign in to downvote">
       <svg width="18" height="18" viewBox="0 0 18 18" aria-hidden="true"><path d="M9 14.5 3 6h12z" fill="currentColor"/></svg>
     </a>

templates/profile.html

@@ -43,12 +43,12 @@
 
   <section class="profile-questions" aria-labelledby="profile-q-heading">
     <h2 id="profile-q-heading">{{.QuestionsLabel}}</h2>
-    {{if .Questions}}
+    {{if .Posts}}
       <ul class="profile-q-list">
-        {{range .Questions}}
+        {{range .Posts}}
           <li>
             <a href="/questions/{{.ID}}">{{.Title}}</a>
-            <span class="meta">{{.HuntDate}}</span>
+            <span class="meta">{{.PostDate}}</span>
           </li>
         {{end}}
       </ul>

templates/question.html

@@ -1,37 +1,41 @@
 {{define "question"}}
 {{template "header" .}}
 <main id="main" class="wrap question-page">
-  <p class="crumb"><a href="{{if eq .Question.HuntDate .Today}}/{{else}}/hunt/{{.Question.HuntDate}}{{end}}">← {{pacificLabel .Question.HuntDate}}</a></p>
+  <p class="crumb"><a href="{{if eq .Question.PostDate .Today}}/{{else}}/hunt/{{.Question.PostDate}}{{end}}">← {{pacificLabel .Question.PostDate}}</a></p>
-  <article class="q-detail">
+  <article id="post-{{.Question.ID}}" class="q-detail">
-    {{template "vote" (voteCtx .User .CSRF "question" .Question.HuntDate .Question)}}
+    {{template "vote" (voteCtx .User .CSRF "question" .Question.PostDate .Question)}}
-    <div>
+    <div class="post-content">
+      <p class="post-kicker">Question</p>
       <h1>{{.Question.Title}}</h1>
       <p class="meta">
         <span>{{.Question.AuthorName}}</span>
         {{if .Question.City}}<span class="dot" aria-hidden="true">·</span><span>{{.Question.City}}</span>{{end}}
         <span class="dot" aria-hidden="true">·</span>
-        <a href="{{if eq .Question.HuntDate .Today}}/{{else}}/hunt/{{.Question.HuntDate}}{{end}}">{{.Question.HuntDate}}</a>
+        <a href="{{if eq .Question.PostDate .Today}}/{{else}}/hunt/{{.Question.PostDate}}{{end}}">{{.Question.PostDate}}</a>
+        {{if eq .Question.PostState "locked"}}<span class="badge">Locked</span>{{end}}
+        {{if eq .Question.PostState "hidden"}}<span class="badge">Hidden</span>{{end}}
+        {{if isEdited .Question}}<span class="edited">Edited</span>{{end}}
       </p>
-      <p class="q-body">{{.Question.Body}}</p>
+      <p class="post-body">{{.Question.Body}}</p>
-      {{if isAdmin .User}}
+      {{template "postActions" (postCtx .User .CSRF .Question .Question 0)}}
-        <form method="post" action="/questions/{{.Question.ID}}/hide"
-          hx-post="/questions/{{.Question.ID}}/hide" hx-target="body">
-          <input type="hidden" name="_csrf" value="{{.CSRF}}">
-          <button type="submit" class="linkish">Hide this question</button>
-        </form>
-      {{end}}
     </div>
   </article>
-  {{template "answer" .}}
+  <section class="conversation" aria-labelledby="conversation-heading">
-  {{if and (isAdmin .User) (not .Answer)}}
+    <div class="conversation-head">
-    <form class="answer-form" method="post" action="/questions/{{.Question.ID}}/answer"
+      <p class="eyebrow">Thread</p>
-      hx-post="/questions/{{.Question.ID}}/answer" hx-target="#answer-block" hx-swap="outerHTML">
+      <h2 id="conversation-heading">Conversation</h2>
-      <input type="hidden" name="_csrf" value="{{.CSRF}}">
+    </div>
-      <label for="answer-body">Write the answer</label>
+    {{if .Question.Replies}}
-      <textarea id="answer-body" name="body" rows="8" required maxlength="12000"></textarea>
+      <div class="thread">
-      <button type="submit" class="btn btn-primary">Save answer</button>
+        {{$page := .}}
-    </form>
+        {{range .Question.Replies}}
-  {{end}}
+          {{template "threadReply" (postCtx $page.User $page.CSRF $page.Question . 1)}}
+        {{end}}
+      </div>
+    {{else}}
+      <p class="waiting">No replies yet.</p>
+    {{end}}
+  </section>
 </main>
 {{template "footer" .}}
 {{end}}

templates/submit.html

@@ -4,7 +4,8 @@
   <h1>Ask a question</h1>
   <p class="lede">It lands on today’s hunt (Pacific time). People vote; the ranking resets at midnight PT.</p>
   {{if .Error}}<p class="banner error" role="alert">{{.Error}}</p>{{end}}
-  <form class="ask" method="post" action="/submit">
+  <form class="ask" method="post" action="/submit"
+    data-submit-once data-submitting-label="Posting…">
     <input type="hidden" name="_csrf" value="{{.CSRF}}">
     <label for="title">Title</label>
     <input id="title" name="title" type="text" required maxlength="120" value="{{.TitleVal}}" placeholder="Water heater popping after showers">
@@ -12,7 +13,7 @@
     <textarea id="body" name="body" rows="8" required maxlength="8000" placeholder="Age of the house, what you already tried, where you are in the Bay if it helps.">{{.BodyVal}}</textarea>
     <label for="city">City <span class="optional">(optional)</span></label>
     <input id="city" name="city" type="text" maxlength="80" value="{{.CityVal}}" placeholder="Oakland">
-    <button type="submit" class="btn btn-primary">Submit to today’s hunt</button>
+    <button type="submit" class="btn btn-primary" data-submit-button>Submit to today’s hunt</button>
   </form>
 </main>
 {{template "footer" .}}