Add post video upload.

cmd/server/main.go

@@ -38,7 +38,6 @@ func main() {
 	}
 	bus := events.New()
 	mail.Subscribe(bus, store.NewPostgres(db), notifier)
-	events.SubscribeRelease(bus)
 	bot, err := discord.FromEnv(store.NewDiscordLinks(db), bus, store.NewPostgres(db))
 	if err != nil {
 		log.Fatalf("discord: %v", err)
@@ -46,7 +45,7 @@ func main() {
 	if bot != nil {
 		defer bot.Close()
 	}
-	handler := newHandler(db, sessions, uploader, bus, bot != nil)
+	handler := newHandler(db, sessions, uploader, bus)
 	run(&http.Server{
 		Addr:              listenAddr(),
 		Handler:           handler,
@@ -70,15 +69,14 @@ func openDB() (*sql.DB, *store.SessionStore) {
 	return db, sessions
 }
 
-func newHandler(db *sql.DB, sessions *store.SessionStore, uploader blob.Uploader, bus events.Publisher, holdUploads bool) http.Handler {
+func newHandler(db *sql.DB, sessions *store.SessionStore, uploader blob.Uploader, bus events.Publisher) http.Handler {
 	srv, err := web.New(store.NewPostgres(db), sessions.Store(), plumber.TemplateFS, plumber.StaticFS, web.Config{
-		AdminSetupSecret:       strings.TrimSpace(os.Getenv("ADMIN_SETUP_SECRET")),
+		AdminSetupSecret: strings.TrimSpace(os.Getenv("ADMIN_SETUP_SECRET")),
-		SecureCookie:           secureCookieFromEnv(),
+		SecureCookie:     secureCookieFromEnv(),
-		TrustedProxies:         parseTrustedProxies(os.Getenv("TRUSTED_PROXY_CIDRS")),
+		TrustedProxies:   parseTrustedProxies(os.Getenv("TRUSTED_PROXY_CIDRS")),
-		Blob:                   uploader,
+		Blob:             uploader,
-		Events:                 bus,
+		Events:           bus,
-		BaseURL:                strings.TrimRight(strings.TrimSpace(os.Getenv("APP_BASE_URL")), "/"),
+		BaseURL:          strings.TrimRight(strings.TrimSpace(os.Getenv("APP_BASE_URL")), "/"),
-		HoldUploadUntilDiscord: holdUploads,
 	})
 	if err != nil {
 		log.Fatalf("server: %v", err)

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/aws/aws-sdk-go-v2 v1.43.7
 	github.com/aws/aws-sdk-go-v2/credentials v1.19.37
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.107.3
-	github.com/aws/smithy-go v1.27.8
 	github.com/bwmarrin/discordgo v0.29.0
 	github.com/go-chi/chi/v5 v5.3.1
 	github.com/google/uuid v1.6.0
@@ -28,6 +27,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.38 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.39 // indirect
+	github.com/aws/smithy-go v1.27.8 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect

internal/blob/spaces.go

@@ -8,11 +8,9 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/aws/smithy-go/middleware"
 )
 
 // Uploader stores public avatar objects.
@@ -80,26 +78,13 @@ func NewSpaces(cfg SpacesConfig) Uploader {
 		return Disabled{}
 	}
 	client := s3.New(s3.Options{
-		Region:                     cfg.Region,
+		Region:       cfg.Region,
-		Credentials:                credentials.NewStaticCredentialsProvider(cfg.Key, cfg.Secret, ""),
+		Credentials:  credentials.NewStaticCredentialsProvider(cfg.Key, cfg.Secret, ""),
-		BaseEndpoint:               aws.String(cfg.Endpoint),
+		BaseEndpoint: aws.String(cfg.Endpoint),
-		RequestChecksumCalculation: aws.RequestChecksumCalculationWhenRequired,
-		APIOptions: []func(*middleware.Stack) error{
-			spacesUnsignedPayload,
-		},
 	})
 	return &spaces{client: client, cfg: cfg}
 }
 
-// spacesUnsignedPayload signs Spaces PUTs as UNSIGNED-PAYLOAD so the client
-// can stream the body without hashing it first.
-func spacesUnsignedPayload(stack *middleware.Stack) error {
-	if err := v4.SwapComputePayloadSHA256ForUnsignedPayloadMiddleware(stack); err != nil {
-		return v4.AddUnsignedPayloadMiddleware(stack)
-	}
-	return nil
-}
-
 func (s *spaces) Enabled() bool { return true }
 
 func (s *spaces) Upload(ctx context.Context, obj FileUpload) (string, error) {

internal/discord/api.go

@@ -2,7 +2,6 @@ package discord
 
 import (
 	"context"
-	"strings"
 
 	"github.com/bwmarrin/discordgo"
 )
@@ -64,27 +63,14 @@ func (s *sessionAPI) Close() error {
 }
 
 func toMessageSend(msg Message) *discordgo.MessageSend {
-	var files []*discordgo.File
-	for _, f := range msg.Files {
-		files = append(files, &discordgo.File{
-			Name:        f.Name,
-			ContentType: f.ContentType,
-			Reader:      f.Reader,
-		})
-	}
 	return &discordgo.MessageSend{
 		Content:         messageContent(msg),
 		Embeds:          toEmbeds(msg),
-		Files:           files,
 		AllowedMentions: &discordgo.MessageAllowedMentions{},
 	}
 }
 
 func toEmbeds(msg Message) []*discordgo.MessageEmbed {
-	imageURLs := embedImageURLs(msg)
-	if msg.Title == "" && msg.Description == "" && msg.City == "" && msg.Author == "" && len(imageURLs) == 0 {
-		return nil
-	}
 	main := &discordgo.MessageEmbed{
 		Title:       msg.Title,
 		URL:         publicURL(msg.URL),
@@ -106,7 +92,7 @@ func toEmbeds(msg Message) []*discordgo.MessageEmbed {
 		})
 	}
 	embeds := []*discordgo.MessageEmbed{main}
-	for i, url := range imageURLs {
+	for i, url := range msg.ImageURLs {
 		if i == 0 {
 			main.Image = &discordgo.MessageEmbedImage{URL: url}
 			continue
@@ -118,16 +104,3 @@ func toEmbeds(msg Message) []*discordgo.MessageEmbed {
 	}
 	return embeds
 }
-
-func embedImageURLs(msg Message) []string {
-	var attached []string
-	for _, f := range msg.Files {
-		if strings.HasPrefix(f.ContentType, "image/") {
-			attached = append(attached, "attachment://"+f.Name)
-		}
-	}
-	if len(attached) > 0 {
-		return attached
-	}
-	return msg.ImageURLs
-}

internal/discord/bot.go

@@ -16,7 +16,7 @@ import (
 	"plumber/internal/store"
 )
 
-const discordTimeout = 60 * time.Second
+const discordTimeout = 15 * time.Second
 
 // Bot posts site events to a Discord channel and owns post-to-message links.
 type Bot struct {
@@ -91,27 +91,13 @@ func (b *Bot) Handle(_ context.Context, ev any) {
 	defer cancel()
 	switch e := ev.(type) {
 	case events.PostCreated:
-		defer b.publishPosted(e)
+		b.onCreated(ctx, e.PostEvent)
-		b.onCreated(ctx, e)
 	case events.PostUpdated:
 		b.onUpdated(ctx, e.PostEvent)
 	}
 }
 
-func (b *Bot) publishPosted(e events.PostCreated) {
+func (b *Bot) onCreated(ctx context.Context, ev events.PostEvent) {
-	if e.Release == nil {
-		return
-	}
-	done := events.PostedToDiscord{PostID: e.PostID, Release: e.Release}
-	if b.bus == nil {
-		e.Release()
-		return
-	}
-	b.bus.Publish(context.Background(), done)
-}
-
-func (b *Bot) onCreated(ctx context.Context, e events.PostCreated) {
-	ev := e.PostEvent
 	_, err := b.links.GetByPostID(ctx, ev.PostID)
 	if err == nil {
 		return
@@ -121,17 +107,17 @@ func (b *Bot) onCreated(ctx context.Context, e events.PostCreated) {
 		return
 	}
 	if isRoot(ev) {
-		b.createRoot(ctx, e)
+		b.createRoot(ctx, ev)
 		return
 	}
-	b.createReply(ctx, e)
+	b.createReply(ctx, ev)
 }
 
 func (b *Bot) onUpdated(ctx context.Context, ev events.PostEvent) {
 	link, err := b.links.GetByPostID(ctx, ev.PostID)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			b.onCreated(ctx, events.PostCreated{PostEvent: ev})
+			b.onCreated(ctx, ev)
 			return
 		}
 		log.Printf("discord: load link %s: %v", ev.PostID, err)
@@ -149,95 +135,56 @@ func (b *Bot) onUpdated(ctx context.Context, ev events.PostEvent) {
 	log.Printf("discord: edited %s", ev.PostID)
 }
 
-func (b *Bot) createRoot(ctx context.Context, e events.PostCreated) {
+func (b *Bot) createRoot(ctx context.Context, ev events.PostEvent) {
-	msg := formatCreated(e)
+	msg := formatMessage(ev)
 	threadID, err := b.api.StartThread(ctx, b.channelID, msg.ThreadName)
 	if err != nil {
-		log.Printf("discord: start thread %s: %v", e.PostID, err)
+		log.Printf("discord: start thread %s: %v", ev.PostID, err)
 		return
 	}
-	messageID, err := b.sendCreated(ctx, threadID, msg)
+	messageID, err := b.api.SendToThread(ctx, threadID, msg)
 	if err != nil {
-		log.Printf("discord: send root %s: %v", e.PostID, err)
+		log.Printf("discord: send root %s: %v", ev.PostID, err)
 		return
 	}
 	if err := b.links.Upsert(ctx, store.DiscordLink{
-		PostID:    e.PostID,
+		PostID:    ev.PostID,
 		MessageID: messageID,
 		ThreadID:  threadID,
 	}); err != nil {
-		log.Printf("discord: save root link %s: %v", e.PostID, err)
+		log.Printf("discord: save root link %s: %v", ev.PostID, err)
 		return
 	}
-	log.Printf("discord: posted root %s", e.PostID)
+	log.Printf("discord: posted root %s", ev.PostID)
 }
 
-func (b *Bot) createReply(ctx context.Context, e events.PostCreated) {
+func (b *Bot) createReply(ctx context.Context, ev events.PostEvent) {
-	root, err := b.links.GetByPostID(ctx, e.RootID)
+	root, err := b.links.GetByPostID(ctx, ev.RootID)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			log.Printf("discord: skip reply %s: no root thread", e.PostID)
+			log.Printf("discord: skip reply %s: no root thread", ev.PostID)
 			return
 		}
-		log.Printf("discord: load root link %s: %v", e.RootID, err)
+		log.Printf("discord: load root link %s: %v", ev.RootID, err)
 		return
 	}
 	if strings.TrimSpace(root.ThreadID) == "" {
-		log.Printf("discord: skip reply %s: no root thread", e.PostID)
+		log.Printf("discord: skip reply %s: no root thread", ev.PostID)
 		return
 	}
-	messageID, err := b.sendCreated(ctx, root.ThreadID, formatCreated(e))
+	messageID, err := b.api.SendToThread(ctx, root.ThreadID, formatMessage(ev))
 	if err != nil {
-		log.Printf("discord: send reply %s: %v", e.PostID, err)
+		log.Printf("discord: send reply %s: %v", ev.PostID, err)
 		return
 	}
 	if err := b.links.Upsert(ctx, store.DiscordLink{
-		PostID:    e.PostID,
+		PostID:    ev.PostID,
 		MessageID: messageID,
 	}); err != nil {
-		log.Printf("discord: save reply link %s: %v", e.PostID, err)
+		log.Printf("discord: save reply link %s: %v", ev.PostID, err)
 		return
 	}
-	log.Printf("discord: posted reply %s", e.PostID)
+	log.Printf("discord: posted reply %s", ev.PostID)
-}
-
-func (b *Bot) sendCreated(ctx context.Context, threadID string, msg Message) (string, error) {
-	_, videos := splitAttachments(msg.Files)
-	msg.Files = nil
-	if len(videos) > 0 {
-		msg.VideoURLs = nil
-	}
-	messageID, err := b.send(ctx, threadID, msg)
-	if err != nil {
-		return "", err
-	}
-	for _, video := range videos {
-		if _, err := b.send(ctx, threadID, Message{Files: []Attachment{video}}); err != nil {
-			log.Printf("discord: send video %s: %v", threadID, err)
-		}
-	}
-	return messageID, nil
-}
-
-func splitAttachments(files []Attachment) (images, videos []Attachment) {
-	for _, f := range files {
-		if strings.HasPrefix(f.ContentType, "video/") || f.Kind == "video" {
-			videos = append(videos, f)
-			continue
-		}
-		images = append(images, f)
-	}
-	return images, videos
-}
-
-func (b *Bot) send(ctx context.Context, threadID string, msg Message) (string, error) {
-	messageID, err := b.api.SendToThread(ctx, threadID, msg)
-	if err != nil && len(msg.Files) > 0 {
-		log.Printf("discord: send with files %s: %v; retrying without files", threadID, err)
-		msg.Files = nil
-		return b.api.SendToThread(ctx, threadID, msg)
-	}
-	return messageID, err
 }
 
 func (b *Bot) editChannel(ctx context.Context, ev events.PostEvent, link *store.DiscordLink) (string, error) {

internal/discord/bot_test.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"sync"
 	"testing"
-	"time"
 
 	"plumber/internal/events"
 	"plumber/internal/store"
@@ -210,125 +209,6 @@ func TestOutboundUpdateWithoutLinkCreates(t *testing.T) {
 	}
 }
 
-func TestOutboundAttachesVideoFile(t *testing.T) {
-	t.Parallel()
-
-	bus := events.New()
-	defer bus.Close()
-	events.SubscribeRelease(bus)
-	links := newMemoryLinks()
-	api := &fakeAPI{}
-	bot := New("channel-1", links, api)
-	bot.bus = bus
-
-	released := make(chan struct{})
-	bot.Handle(context.Background(), events.PostCreated{
-		PostEvent: events.PostEvent{
-			PostID:     "root-1",
-			RootID:     "root-1",
-			Title:      "Valve clip",
-			Body:       "Watch the handle.",
-			AuthorName: "sam",
-			Permalink:  "https://www.askaplumberfirst.com/questions/root-1#post-root-1",
-			Images:     []events.Image{{URL: "https://cdn.example/clip.mp4", Kind: "video"}},
-		},
-		Media: []events.Media{{
-			Name:        "clip.mp4",
-			ContentType: "video/mp4",
-			Kind:        "video",
-			Bytes:       []byte("fake-mp4"),
-		}},
-		Release: func() { close(released) },
-	})
-
-	if len(api.sends) != 3 ||
-		api.sends[1].Kind != "thread-msg" ||
-		api.sends[2].Kind != "thread-msg" {
-		t.Fatalf("sends = %+v", api.sends)
-	}
-	if len(api.sends[1].Msg.Files) != 0 {
-		t.Fatalf("text message files = %+v", api.sends[1].Msg.Files)
-	}
-	files := api.sends[2].Msg.Files
-	if len(files) != 1 || files[0].Name != "clip.mp4" || files[0].ContentType != "video/mp4" {
-		t.Fatalf("video files = %+v", files)
-	}
-	content := messageContent(api.sends[1].Msg)
-	if strings.Contains(content, "https://cdn.example/clip.mp4") {
-		t.Fatalf("content still has video URL: %q", content)
-	}
-	select {
-	case <-released:
-	case <-time.After(time.Second):
-		t.Fatal("PostedToDiscord did not release")
-	}
-}
-
-func TestOutboundPhotosThenVideo(t *testing.T) {
-	t.Parallel()
-
-	api := &fakeAPI{}
-	bot := New("channel-1", newMemoryLinks(), api)
-	bot.Handle(context.Background(), events.PostCreated{
-		PostEvent: events.PostEvent{
-			PostID:     "root-1",
-			RootID:     "root-1",
-			Title:      "Valve clip",
-			Body:       "Photo and video.",
-			AuthorName: "sam",
-			Images: []events.Image{
-				{URL: "https://cdn.example/a.jpg"},
-				{URL: "https://cdn.example/clip.mp4", Kind: "video"},
-			},
-		},
-		Media: []events.Media{
-			{Name: "still.jpg", ContentType: "image/jpeg", Kind: "image", Bytes: []byte("jpeg")},
-			{Name: "clip.mp4", ContentType: "video/mp4", Kind: "video", Bytes: []byte("mp4")},
-		},
-	})
-	if len(api.sends) != 3 ||
-		api.sends[1].Kind != "thread-msg" ||
-		api.sends[2].Kind != "thread-msg" {
-		t.Fatalf("sends = %+v", api.sends)
-	}
-	photos := api.sends[1].Msg.Files
-	if len(photos) != 0 {
-		t.Fatalf("text message should not attach files: %+v", photos)
-	}
-	if got := api.sends[1].Msg.ImageURLs; len(got) != 1 || got[0] != "https://cdn.example/a.jpg" {
-		t.Fatalf("text message images = %v", got)
-	}
-	if embeds := toEmbeds(api.sends[1].Msg); len(embeds) == 0 || embeds[0].Image == nil || embeds[0].Image.URL != "https://cdn.example/a.jpg" {
-		t.Fatalf("text embeds = %+v", toEmbeds(api.sends[1].Msg))
-	}
-	videos := api.sends[2].Msg.Files
-	if len(videos) != 1 || videos[0].Name != "clip.mp4" {
-		t.Fatalf("video files = %+v", videos)
-	}
-}
-
-func TestOutboundReleasesWhenAlreadyLinked(t *testing.T) {
-	t.Parallel()
-
-	links := newMemoryLinks()
-	if err := links.Upsert(context.Background(), store.DiscordLink{
-		PostID:    "root-1",
-		MessageID: "d-root",
-		ThreadID:  "thread-1",
-	}); err != nil {
-		t.Fatal(err)
-	}
-	released := false
-	bot := New("channel-1", links, &fakeAPI{})
-	bot.Handle(context.Background(), events.PostCreated{
-		PostEvent: events.PostEvent{PostID: "root-1", RootID: "root-1", Title: "Already posted"},
-		Release:   func() { released = true },
-	})
-	if !released {
-		t.Fatal("skipped send did not release held upload")
-	}
-}
-
 func TestFormatMessage(t *testing.T) {
 	t.Parallel()
 
@@ -338,10 +218,7 @@ func TestFormatMessage(t *testing.T) {
 		City:       "Oakland",
 		AuthorName: "sam",
 		Permalink:  "https://example.com/q",
-		Images: []events.Image{
+		Images:     []events.Image{{URL: "https://cdn.example/a.jpg", Description: "ignored"}},
-			{URL: "https://cdn.example/a.jpg", Description: "ignored"},
-			{URL: "https://cdn.example/clip.mp4", Kind: "video"},
-		},
 	})
 	if got.Title != "Leaky sink" ||
 		got.Description != "It drips." ||
@@ -349,8 +226,7 @@ func TestFormatMessage(t *testing.T) {
 		got.Author != "sam" ||
 		got.URL != "https://example.com/q" ||
 		got.ThreadName != "sam asks: Leaky sink" ||
-		len(got.ImageURLs) != 1 || got.ImageURLs[0] != "https://cdn.example/a.jpg" ||
+		len(got.ImageURLs) != 1 {
-		len(got.VideoURLs) != 1 || got.VideoURLs[0] != "https://cdn.example/clip.mp4" {
 		t.Fatalf("format = %+v", got)
 	}
 
@@ -361,9 +237,7 @@ func TestFormatMessage(t *testing.T) {
 	content := messageContent(got)
 	if strings.Contains(content, "Leaky sink") ||
 		!strings.Contains(content, "It drips.") ||
-		!strings.Contains(content, "Oakland") ||
+		!strings.Contains(content, "Oakland") {
-		!strings.Contains(content, "https://cdn.example/a.jpg") ||
-		!strings.Contains(content, "https://cdn.example/clip.mp4") {
 		t.Fatalf("content = %q", content)
 	}
 	if publicURL("/questions/x") != "" || publicURL("http://localhost:8080/q") != "" {

internal/discord/format.go

@@ -1,8 +1,6 @@
 package discord
 
 import (
-	"bytes"
-	"io"
 	"strings"
 
 	"plumber/internal/events"
@@ -15,14 +13,6 @@ const (
 	embedColor            = 0xe96a26
 )
 
-// Attachment is a local file Discord should upload with the message.
-type Attachment struct {
-	Name        string
-	ContentType string
-	Kind        string
-	Reader      io.Reader
-}
-
 // Message is a Discord-ready snapshot of a site post event.
 type Message struct {
 	Title       string
@@ -31,76 +21,36 @@ type Message struct {
 	City        string
 	Author      string
 	ImageURLs   []string
-	VideoURLs   []string
-	Files       []Attachment
 	ThreadName  string
 }
 
 func formatMessage(ev events.PostEvent) Message {
-	return formatCreated(events.PostCreated{PostEvent: ev})
+	title := strings.TrimSpace(ev.Title)
-}
-
-func formatCreated(e events.PostCreated) Message {
-	title := strings.TrimSpace(e.Title)
 	if title == "" {
 		title = "Reply"
 	}
-	author := strings.TrimSpace(e.AuthorName)
+	author := strings.TrimSpace(ev.AuthorName)
 	if author == "" {
 		author = "Someone"
 	}
 	msg := Message{
 		Title:       truncateRunes(title, embedTitleLimit),
-		URL:         strings.TrimSpace(e.Permalink),
+		URL:         strings.TrimSpace(ev.Permalink),
-		Description: truncateRunes(strings.TrimSpace(e.Body), embedDescriptionLimit),
+		Description: truncateRunes(strings.TrimSpace(ev.Body), embedDescriptionLimit),
-		City:        strings.TrimSpace(e.City),
+		City:        strings.TrimSpace(ev.City),
 		Author:      author,
-		ThreadName:  threadName(author, e.Title),
+		ThreadName:  threadName(author, ev.Title),
-		Files:       filesFromMedia(e.Media),
 	}
-	for _, img := range e.Images {
+	for _, img := range ev.Images {
 		url := strings.TrimSpace(img.URL)
 		if url == "" {
 			continue
 		}
-		if img.Kind == "video" {
-			msg.VideoURLs = append(msg.VideoURLs, url)
-			continue
-		}
 		msg.ImageURLs = append(msg.ImageURLs, url)
 	}
 	return msg
 }
 
-func filesFromMedia(media []events.Media) []Attachment {
-	if len(media) == 0 {
-		return nil
-	}
-	files := make([]Attachment, 0, len(media))
-	for _, m := range media {
-		var r io.Reader
-		switch {
-		case len(m.Bytes) > 0:
-			r = bytes.NewReader(m.Bytes)
-		case m.Body != nil:
-			r = m.Body
-		default:
-			continue
-		}
-		name := strings.TrimSpace(m.Name)
-		if name == "" {
-			name = "upload"
-		}
-		files = append(files, Attachment{
-			Name:        name,
-			ContentType: m.ContentType,
-			Kind:        m.Kind,
-			Reader:      r,
-		})
-	}
-	return files
-}
-
 func threadName(author, title string) string {
 	author = strings.TrimSpace(author)
 	if author == "" {
@@ -146,18 +96,6 @@ func messageContent(msg Message) string {
 	if u := publicURL(msg.URL); u != "" {
 		parts = append(parts, u)
 	}
-	if len(msg.Files) == 0 {
-		for _, mediaURL := range msg.ImageURLs {
-			if u := publicURL(mediaURL); u != "" {
-				parts = append(parts, u)
-			}
-		}
-		for _, mediaURL := range msg.VideoURLs {
-			if u := publicURL(mediaURL); u != "" {
-				parts = append(parts, u)
-			}
-		}
-	}
 	return truncateRunes(strings.Join(parts, "\n"), 2000)
 }
 

internal/events/bus.go

@@ -40,14 +40,12 @@ func newBus(buffer int, start bool) *Bus {
 // Publish enqueues ev. It never blocks the caller; a full buffer is dropped.
 func (b *Bus) Publish(_ context.Context, ev any) {
 	if b == nil {
-		CallRelease(ev)
 		return
 	}
 	select {
 	case b.ch <- ev:
 	default:
 		log.Printf("events: dropped %T", ev)
-		CallRelease(ev)
 	}
 }
 

internal/events/bus_test.go

@@ -102,44 +102,3 @@ func TestBusDropsWhenFull(t *testing.T) {
 	default:
 	}
 }
-
-func TestNopReleasesPostCreated(t *testing.T) {
-	t.Parallel()
-
-	released := false
-	Nop{}.Publish(context.Background(), PostCreated{Release: func() { released = true }})
-	if !released {
-		t.Fatal("Nop.Publish did not release held upload")
-	}
-}
-
-func TestBusDropReleasesPostCreated(t *testing.T) {
-	t.Parallel()
-
-	bus := newBus(1, false)
-	bus.Publish(context.Background(), "kept")
-	released := false
-	bus.Publish(context.Background(), PostCreated{Release: func() { released = true }})
-	if !released {
-		t.Fatal("dropped PostCreated did not release held upload")
-	}
-}
-
-func TestSubscribeReleasePostedToDiscord(t *testing.T) {
-	t.Parallel()
-
-	bus := New()
-	defer bus.Close()
-	SubscribeRelease(bus)
-
-	released := make(chan struct{})
-	bus.Publish(context.Background(), PostedToDiscord{
-		PostID:  "post-1",
-		Release: func() { close(released) },
-	})
-	select {
-	case <-released:
-	case <-time.After(time.Second):
-		t.Fatal("PostedToDiscord did not release")
-	}
-}

internal/events/event.go

@@ -1,27 +1,14 @@
 package events
 
 import (
-	"io"
 	"net/url"
 	"strings"
 )
 
-// Image is a public photo or video already attached to a site post.
+// Image is a public photo already attached to a site post.
 type Image struct {
 	URL         string
 	Description string
-	Kind        string
-}
-
-// Media is a local upload still held from the create request so Discord can
-// attach the bytes. Photos carry re-encoded Bytes; videos carry an open Body.
-type Media struct {
-	Name        string
-	ContentType string
-	Kind        string
-	Size        int64
-	Body        io.ReadCloser
-	Bytes       []byte
 }
 
 // PostEvent is a Discord-free snapshot of a site post after a successful write.
@@ -42,8 +29,6 @@ type PostEvent struct {
 // PostCreated is emitted after a successful site create.
 type PostCreated struct {
 	PostEvent
-	Media   []Media `json:"-"`
-	Release func()  `json:"-"`
 }
 
 // PostUpdated is emitted after a successful site edit.
@@ -51,13 +36,6 @@ type PostUpdated struct {
 	PostEvent
 }
 
-// PostedToDiscord is emitted after the Discord subscriber finishes with a
-// PostCreated (sent, skipped, or failed). Release deletes held upload files.
-type PostedToDiscord struct {
-	PostID  string
-	Release func() `json:"-"`
-}
-
 // Permalink builds /questions/{root}#post-{id}, prefixed by baseURL when set.
 func Permalink(baseURL, rootID, postID string) string {
 	path := "/questions/" + url.PathEscape(rootID) + "#post-" + url.PathEscape(postID)

internal/events/nop.go

@@ -5,7 +5,5 @@ import "context"
 // Nop is a Publisher used when nothing is subscribed.
 type Nop struct{}
 
-// Publish discards ev after releasing any held upload.
+// Publish discards ev.
-func (Nop) Publish(_ context.Context, ev any) {
+func (Nop) Publish(context.Context, any) {}
-	CallRelease(ev)
-}

internal/events/release.go

@@ -1,41 +0,0 @@
-package events
-
-import (
-	"context"
-	"sync"
-)
-
-// Once returns fn wrapped so it runs at most once.
-func Once(fn func()) func() {
-	if fn == nil {
-		return func() {}
-	}
-	var once sync.Once
-	return func() { once.Do(fn) }
-}
-
-// CallRelease runs Release on PostCreated or PostedToDiscord when set.
-func CallRelease(ev any) {
-	switch e := ev.(type) {
-	case PostCreated:
-		if e.Release != nil {
-			e.Release()
-		}
-	case PostedToDiscord:
-		if e.Release != nil {
-			e.Release()
-		}
-	}
-}
-
-// SubscribeRelease runs PostedToDiscord.Release on the worker.
-func SubscribeRelease(bus *Bus) {
-	if bus == nil {
-		return
-	}
-	bus.Subscribe(func(_ context.Context, ev any) {
-		if _, ok := ev.(PostedToDiscord); ok {
-			CallRelease(ev)
-		}
-	})
-}

internal/web/events.go

@@ -7,26 +7,8 @@ import (
 	"plumber/internal/store"
 )
 
-func (s *Server) publishPostCreated(post, root *store.Post, author *store.User, media []events.Media, cleanup func()) {
+func (s *Server) publishPostCreated(post, root *store.Post, author *store.User) {
-	release := events.Once(func() {
+	s.publishPost(events.PostCreated{PostEvent: s.postEvent(post, root, author)}, root)
-		closeHeldMedia(media)
-		if cleanup != nil {
-			cleanup()
-		}
-	})
-	if root != nil && root.PostState == store.PostStateHidden {
-		release()
-		return
-	}
-	ev := events.PostCreated{PostEvent: s.postEvent(post, root, author)}
-	if s.cfg.HoldUploadUntilDiscord && len(media) > 0 {
-		ev.Media = media
-		ev.Release = release
-		s.cfg.Events.Publish(context.Background(), ev)
-		return
-	}
-	release()
-	s.cfg.Events.Publish(context.Background(), events.PostCreated{PostEvent: ev.PostEvent})
 }
 
 func (s *Server) publishPostUpdated(post, root *store.Post, author *store.User) {
@@ -73,10 +55,12 @@ func (s *Server) postEvent(post, root *store.Post, author *store.User) events.Po
 	if n := len(post.Images); n > 0 {
 		ev.Images = make([]events.Image, 0, n)
 		for _, img := range post.Images {
+			if img.Kind == store.MediaKindVideo {
+				continue
+			}
 			ev.Images = append(ev.Images, events.Image{
 				URL:         img.PublicURL,
 				Description: img.Description,
-				Kind:        img.Kind,
 			})
 		}
 	}

internal/web/events_test.go

@@ -1,10 +1,8 @@
 package web
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
-	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -239,72 +237,20 @@ func assertPostEvent(t *testing.T, got, want events.PostEvent) {
 	}
 }
 
-func TestPostEventIncludesPhotosAndVideos(t *testing.T) {
+func TestPostEventOmitsVideos(t *testing.T) {
 	t.Parallel()
 
 	srv, _ := newTestServer(t, Config{})
 	got := srv.postEvent(&store.Post{
-		ID:    "root-1",
+		ID:     "root-1",
-		Title: "Clip",
+		Title:  "Clip",
-		Body:  "Photo and video.",
+		Body:   "Photo and video.",
 		Images: []store.PostImage{
 			{PublicURL: "https://cdn.example/a.jpg", Description: "Still", Kind: store.MediaKindImage},
 			{PublicURL: "https://cdn.example/a.mp4", Description: "Walkthrough", Kind: store.MediaKindVideo},
 		},
 	}, nil, nil)
-	if len(got.Images) != 2 ||
+	if len(got.Images) != 1 || got.Images[0].URL != "https://cdn.example/a.jpg" {
-		got.Images[0].URL != "https://cdn.example/a.jpg" || got.Images[0].Kind != store.MediaKindImage ||
-		got.Images[1].URL != "https://cdn.example/a.mp4" || got.Images[1].Kind != store.MediaKindVideo {
 		t.Fatalf("event images = %+v", got.Images)
 	}
 }
-
-func TestCreatePostHoldsVideoUntilRelease(t *testing.T) {
-	t.Parallel()
-
-	rec := &events.Recording{}
-	blobs := &recordingImageBlob{}
-	srv, mem := newTestServer(t, Config{
-		Events:                 rec,
-		Blob:                   blobs,
-		HoldUploadUntilDiscord: true,
-	})
-	handler := srv.Handler()
-	user := seedUser(t, mem, uniq("hold-video"), "hunter22", store.RoleUser)
-	cookies := loginUser(t, handler, user.Username, "hunter22")
-	csrf := csrfForCookies(t, handler, cookies)
-	clip := tinyMP4()
-
-	res := multipartPost(t, handler, "/submit", map[string][]string{
-		"_csrf": {csrf},
-		"title": {"Valve clip"},
-		"body":  {"Watch the handle."},
-		"city":  {"Oakland"},
-	}, []multipartTestFile{{name: "walk.mp4", body: clip}}, cookies)
-	if res.Code != http.StatusSeeOther {
-		t.Fatalf("submit status = %d: %s", res.Code, res.Body.String())
-	}
-
-	got := rec.Snapshot()
-	if len(got) != 1 {
-		t.Fatalf("published %d events, want 1: %#v", len(got), got)
-	}
-	created, ok := got[0].(events.PostCreated)
-	if !ok {
-		t.Fatalf("event %T, want PostCreated", got[0])
-	}
-	if len(created.Media) != 1 ||
-		created.Media[0].Kind != store.MediaKindVideo ||
-		created.Media[0].ContentType != "video/mp4" ||
-		created.Media[0].Body == nil {
-		t.Fatalf("held media = %+v", created.Media)
-	}
-	if created.Release == nil {
-		t.Fatal("missing Release")
-	}
-	body, err := io.ReadAll(created.Media[0].Body)
-	if err != nil || !bytes.Equal(body, clip) {
-		t.Fatalf("held video body = %d bytes err=%v", len(body), err)
-	}
-	created.Release()
-}

internal/web/post_images.go

@@ -22,7 +22,6 @@ import (
 	_ "golang.org/x/image/webp"
 
 	"plumber/internal/blob"
-	"plumber/internal/events"
 	"plumber/internal/store"
 )
 
@@ -110,18 +109,18 @@ func (s *Server) postImagesFromForm(
 	r *http.Request,
 	postID string,
 	existing []store.PostImage,
-) ([]store.PostImage, []string, []events.Media, error) {
+) ([]store.PostImage, []string, error) {
 	if r.MultipartForm == nil {
-		return append([]store.PostImage(nil), existing...), nil, nil, nil
+		return append([]store.PostImage(nil), existing...), nil, nil
 	}
 	retained, err := retainedPostImages(r.MultipartForm, existing)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 	files := r.MultipartForm.File["images"]
 	descriptions := r.MultipartForm.Value["image_description"]
 	if len(descriptions) > len(files) {
-		return nil, nil, nil, invalidPostImage("Image descriptions do not match selected images.", nil)
+		return nil, nil, invalidPostImage("Image descriptions do not match selected images.", nil)
 	}
 	kinds := make([]string, len(files))
 	newImages, newVideos := 0, 0
@@ -135,13 +134,13 @@ func (s *Server) postImagesFromForm(
 	}
 	retainedImages, retainedVideos := countPostMedia(retained)
 	if retainedImages+newImages > store.MaxPostImages {
-		return nil, nil, nil, invalidPostImage("You can attach up to 4 images.", nil)
+		return nil, nil, invalidPostImage("You can attach up to 4 images.", nil)
 	}
 	if retainedVideos+newVideos > store.MaxPostVideos {
-		return nil, nil, nil, invalidPostImage("You can attach one video.", nil)
+		return nil, nil, invalidPostImage("You can attach one video.", nil)
 	}
 	if len(files) > 0 && !s.cfg.Blob.Enabled() {
-		return nil, nil, nil, &postImageRequestError{
+		return nil, nil, &postImageRequestError{
 			status:  http.StatusServiceUnavailable,
 			message: "Image uploads are not configured on this server.",
 		}
@@ -149,28 +148,24 @@ func (s *Server) postImagesFromForm(
 
 	images := append([]store.PostImage(nil), retained...)
 	newKeys := make([]string, 0, len(files))
-	held := make([]events.Media, 0, len(files))
 	for i, header := range files {
 		description := ""
 		if i < len(descriptions) {
 			description = strings.TrimSpace(descriptions[i])
 		}
 		if len([]rune(description)) > store.MaxImageDescriptionRunes {
-			closeHeldMedia(held)
 			s.deletePostImageObjects(newKeys)
-			return nil, nil, nil, invalidPostImage("Image descriptions must be 500 characters or fewer.", nil)
+			return nil, nil, invalidPostImage("Image descriptions must be 500 characters or fewer.", nil)
 		}
-		item, objectKey, media, err := s.uploadPostMedia(ctx, postID, header, kinds[i], description)
+		item, objectKey, err := s.uploadPostMedia(ctx, postID, header, kinds[i], description)
 		if err != nil {
-			closeHeldMedia(held)
 			s.deletePostImageObjects(newKeys)
-			return nil, nil, nil, err
+			return nil, nil, err
 		}
 		newKeys = append(newKeys, objectKey)
 		images = append(images, item)
-		held = append(held, media)
 	}
-	return images, newKeys, held, nil
+	return images, newKeys, nil
 }
 
 func countPostMedia(items []store.PostImage) (images, videos int) {
@@ -184,57 +179,32 @@ func countPostMedia(items []store.PostImage) (images, videos int) {
 	return images, videos
 }
 
-func closeHeldMedia(media []events.Media) {
-	for i := range media {
-		if media[i].Body != nil {
-			_ = media[i].Body.Close()
-			media[i].Body = nil
-		}
-	}
-}
-
 func (s *Server) uploadPostMedia(
 	ctx context.Context,
 	postID string,
 	header *multipart.FileHeader,
 	kind, description string,
-) (store.PostImage, string, events.Media, error) {
+) (store.PostImage, string, error) {
 	if kind == store.MediaKindVideo {
 		prepared, err := preparePostVideo(header)
 		if err != nil {
-			return store.PostImage{}, "", events.Media{}, err
+			return store.PostImage{}, "", err
 		}
 		mediaID := uuid.NewString()
 		objectKey := path.Join("post-videos", postID, mediaID+prepared.extension)
 		publicURL, err := s.cfg.Blob.Upload(ctx, blob.FileUpload{
 			Key:         objectKey,
-			Body:        prepared.body,
+			Body:        bytes.NewReader(prepared.body),
 			ContentType: prepared.contentType,
-			Size:        prepared.size,
+			Size:        int64(len(prepared.body)),
 		})
 		if err != nil {
-			_ = prepared.body.Close()
+			return store.PostImage{}, "", &postImageRequestError{
-			return store.PostImage{}, "", events.Media{}, &postImageRequestError{
 				status:  http.StatusServiceUnavailable,
 				message: "Could not upload video. Try again later.",
 				cause:   err,
 			}
 		}
-		media := events.Media{
-			Name:        mediaID + prepared.extension,
-			ContentType: prepared.contentType,
-			Kind:        store.MediaKindVideo,
-			Size:        prepared.size,
-		}
-		if seeker, ok := prepared.body.(io.Seeker); ok {
-			if _, err := seeker.Seek(0, io.SeekStart); err == nil {
-				media.Body = prepared.body
-			} else {
-				_ = prepared.body.Close()
-			}
-		} else {
-			_ = prepared.body.Close()
-		}
 		return store.PostImage{
 			ID:          mediaID,
 			PostID:      postID,
@@ -242,11 +212,11 @@ func (s *Server) uploadPostMedia(
 			PublicURL:   publicURL,
 			Description: description,
 			Kind:        store.MediaKindVideo,
-		}, objectKey, media, nil
+		}, objectKey, nil
 	}
 	prepared, err := preparePostImage(header)
 	if err != nil {
-		return store.PostImage{}, "", events.Media{}, err
+		return store.PostImage{}, "", err
 	}
 	imageID := uuid.NewString()
 	objectKey := path.Join("post-images", postID, imageID+prepared.extension)
@@ -257,28 +227,22 @@ func (s *Server) uploadPostMedia(
 		Size:        int64(len(prepared.body)),
 	})
 	if err != nil {
-		return store.PostImage{}, "", events.Media{}, &postImageRequestError{
+		return store.PostImage{}, "", &postImageRequestError{
 			status:  http.StatusServiceUnavailable,
 			message: "Could not upload image. Try again later.",
 			cause:   err,
 		}
 	}
 	return store.PostImage{
-			ID:          imageID,
+		ID:          imageID,
-			PostID:      postID,
+		PostID:      postID,
-			ObjectKey:   objectKey,
+		ObjectKey:   objectKey,
-			PublicURL:   publicURL,
+		PublicURL:   publicURL,
-			Description: description,
+		Description: description,
-			Kind:        store.MediaKindImage,
+		Kind:        store.MediaKindImage,
-			Width:       prepared.width,
+		Width:       prepared.width,
-			Height:      prepared.height,
+		Height:      prepared.height,
-		}, objectKey, events.Media{
+	}, objectKey, nil
-			Name:        imageID + prepared.extension,
-			ContentType: prepared.contentType,
-			Kind:        store.MediaKindImage,
-			Size:        int64(len(prepared.body)),
-			Bytes:       prepared.body,
-		}, nil
 }
 
 func retainedPostImages(form *multipart.Form, existing []store.PostImage) ([]store.PostImage, error) {
@@ -441,8 +405,7 @@ func isWebM(raw []byte) bool {
 }
 
 type preparedPostVideo struct {
-	body        io.ReadCloser
+	body        []byte
-	size        int64
 	extension   string
 	contentType string
 }
@@ -451,9 +414,6 @@ func preparePostVideo(header *multipart.FileHeader) (preparedPostVideo, error) {
 	if header == nil {
 		return preparedPostVideo{}, invalidPostImage("Select a valid video.", nil)
 	}
-	if header.Size == 0 {
-		return preparedPostVideo{}, invalidPostImage("Videos cannot be empty.", nil)
-	}
 	if header.Size > postVideoMaxFileBytes {
 		return preparedPostVideo{}, &postImageRequestError{
 			status:  http.StatusRequestEntityTooLarge,
@@ -464,28 +424,27 @@ func preparePostVideo(header *multipart.FileHeader) (preparedPostVideo, error) {
 	if err != nil {
 		return preparedPostVideo{}, invalidPostImage("Could not read video.", err)
 	}
-	peek := make([]byte, 512)
+	defer file.Close()
-	n, err := io.ReadFull(file, peek)
+	raw, err := io.ReadAll(io.LimitReader(file, postVideoMaxFileBytes+1))
-	if err != nil && !errors.Is(err, io.ErrUnexpectedEOF) && !errors.Is(err, io.EOF) {
+	if err != nil {
-		file.Close()
 		return preparedPostVideo{}, invalidPostImage("Could not read video.", err)
 	}
-	if n == 0 {
+	if len(raw) == 0 {
-		file.Close()
 		return preparedPostVideo{}, invalidPostImage("Videos cannot be empty.", nil)
 	}
-	switch mediaKindFromBytes(peek[:n]) {
+	if int64(len(raw)) > postVideoMaxFileBytes {
+		return preparedPostVideo{}, &postImageRequestError{
+			status:  http.StatusRequestEntityTooLarge,
+			message: "Each video must be 25 MB or smaller.",
+		}
+	}
+	switch mediaKindFromBytes(raw) {
 	case store.MediaKindVideo:
 	default:
-		file.Close()
 		return preparedPostVideo{}, invalidPostImage("Videos must be MP4 or WebM.", nil)
 	}
-	if _, err := file.Seek(0, io.SeekStart); err != nil {
+	result := preparedPostVideo{body: raw}
-		file.Close()
+	if isWebM(raw) {
-		return preparedPostVideo{}, invalidPostImage("Could not read video.", err)
-	}
-	result := preparedPostVideo{body: file, size: header.Size}
-	if isWebM(peek[:n]) {
 		result.extension = ".webm"
 		result.contentType = "video/webm"
 		return result, nil

internal/web/post_images_test.go

@@ -60,34 +60,20 @@ func TestPreparePostImage(t *testing.T) {
 func TestPreparePostVideo(t *testing.T) {
 	t.Parallel()
 
-	mp4 := tinyMP4()
+	prepared, err := preparePostVideoHeader(t, "clip.mp4", tinyMP4())
-	prepared, err := preparePostVideoHeader(t, "clip.mp4", mp4)
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer prepared.body.Close()
+	if prepared.extension != ".mp4" || prepared.contentType != "video/mp4" || len(prepared.body) == 0 {
-	got, err := io.ReadAll(prepared.body)
+		t.Fatalf("prepared MP4 = %+v", prepared)
+	}
+	prepared, err = preparePostVideoHeader(t, "clip.webm", tinyWebM())
 	if err != nil {
 		t.Fatal(err)
 	}
-	if prepared.extension != ".mp4" || prepared.contentType != "video/mp4" ||
+	if prepared.extension != ".webm" || prepared.contentType != "video/webm" {
-		prepared.size != int64(len(mp4)) || !bytes.Equal(got, mp4) {
-		t.Fatalf("prepared MP4 = %+v len(body)=%d", prepared, len(got))
-	}
-
-	webm := tinyWebM()
-	prepared, err = preparePostVideoHeader(t, "clip.webm", webm)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer prepared.body.Close()
-	if prepared.extension != ".webm" || prepared.contentType != "video/webm" ||
-		prepared.size != int64(len(webm)) {
 		t.Fatalf("prepared WebM = %+v", prepared)
 	}
-	if _, err := preparePostVideoHeader(t, "empty.mp4", nil); err == nil {
-		t.Fatal("empty video unexpectedly succeeded")
-	}
 	if _, err := preparePostVideoHeader(t, "notes.txt", []byte("not a video")); err == nil {
 		t.Fatal("text video upload unexpectedly succeeded")
 	}
@@ -283,30 +269,6 @@ func TestPostVideoMultipartLifecycle(t *testing.T) {
 		!strings.HasPrefix(root.Images[1].ObjectKey, "post-videos/") {
 		t.Fatalf("root media = %+v", root.Images)
 	}
-	clip := tinyMP4()
-	var streamed recordedImageUpload
-	for _, upload := range blobs.recordedUploads() {
-		if strings.HasPrefix(upload.key, "post-videos/") {
-			streamed = upload
-			break
-		}
-	}
-	if streamed.size != int64(len(clip)) || !bytes.Equal(streamed.body, clip) {
-		t.Fatalf("streamed video upload = %+v", streamed)
-	}
-
-	rec = httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodGet, "/questions/"+root.ID, nil)
-	for _, cookie := range cookies {
-		req.AddCookie(cookie)
-	}
-	handler.ServeHTTP(rec, req)
-	page := rec.Body.String()
-	if rec.Code != http.StatusOK ||
-		!strings.Contains(page, `<video src="`+root.Images[1].PublicURL) ||
-		!strings.Contains(page, `data-existing-video`) {
-		t.Fatalf("question page missing video player: %d %s", rec.Code, page)
-	}
 
 	rec = multipartPost(t, handler, "/posts/"+root.ID+"/edit", map[string][]string{
 		"_csrf":                      {csrf},
@@ -551,7 +513,6 @@ func solidJPEG(t *testing.T, width, height int) []byte {
 type recordedImageUpload struct {
 	key         string
 	contentType string
-	size        int64
 	body        []byte
 }
 
@@ -579,7 +540,6 @@ func (b *recordingImageBlob) Upload(_ context.Context, object blob.FileUpload) (
 	b.uploads = append(b.uploads, recordedImageUpload{
 		key:         object.Key,
 		contentType: object.ContentType,
-		size:        object.Size,
 		body:        body,
 	})
 	return "https://cdn.example/" + object.Key, nil
@@ -593,13 +553,9 @@ func (b *recordingImageBlob) Delete(_ context.Context, key string) error {
 }
 
 func (b *recordingImageBlob) uploadCount() int {
-	return len(b.recordedUploads())
-}
-
-func (b *recordingImageBlob) recordedUploads() []recordedImageUpload {
 	b.mu.Lock()
 	defer b.mu.Unlock()
-	return append([]recordedImageUpload(nil), b.uploads...)
+	return len(b.uploads)
 }
 
 func (b *recordingImageBlob) deletedKeys() []string {

internal/web/posts.go

@@ -12,7 +12,6 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 
-	"plumber/internal/events"
 	"plumber/internal/store"
 )
 
@@ -23,14 +22,7 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 	if !ok {
 		return
 	}
-	var media []events.Media
+	defer cleanup()
-	held := false
-	defer func() {
-		if !held {
-			closeHeldMedia(media)
-			cleanup()
-		}
-	}()
 	if !s.requireCSRF(w, r) {
 		return
 	}
@@ -83,7 +75,7 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 		root = threadRoot
 	}
 
-	images, newKeys, media, err := s.postImagesFromForm(r.Context(), r, post.ID, nil)
+	images, newKeys, err := s.postImagesFromForm(r.Context(), r, post.ID, nil)
 	if err != nil {
 		writePostImageRequestError(w, err)
 		return
@@ -101,8 +93,7 @@ func (s *Server) handleCreatePost(w http.ResponseWriter, r *http.Request) {
 	if root == nil {
 		root = post
 	}
-	s.publishPostCreated(post, root, user, media, cleanup)
+	s.publishPostCreated(post, root, user)
-	held = true
 	http.Redirect(
 		w,
 		r,
@@ -148,12 +139,11 @@ func (s *Server) handleEditPost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	previousImages := append([]store.PostImage(nil), post.Images...)
-	images, newKeys, media, err := s.postImagesFromForm(r.Context(), r, post.ID, previousImages)
+	images, newKeys, err := s.postImagesFromForm(r.Context(), r, post.ID, previousImages)
 	if err != nil {
 		writePostImageRequestError(w, err)
 		return
 	}
-	closeHeldMedia(media)
 	post.Body = truncateRunes(body, 12000)
 	post.Images = images
 	if err := s.store.UpdatePost(r.Context(), post); err != nil {

internal/web/posts_test.go

@@ -484,19 +484,16 @@ func TestQuestionPageRendersNestedPostControls(t *testing.T) {
 		`data-submit-button`,
 		`enctype="multipart/form-data"`,
 		`data-image-picker`,
-		`accept="image/jpeg,image/png,image/webp,video/mp4,video/webm,.mp4,.webm"`,
+		`accept="image/jpeg,image/png,image/webp"`,
 		`aria-live="polite"`,
 		`name="existing_image_id" value="root-photo"`,
 		`name="existing_image_id" value="reply-photo"`,
-		`data-image-zoom`,
-		`href="https://cdn.example/root-photo.jpg"`,
 		`src="https://cdn.example/root-photo.jpg"`,
 		`alt="Water pooling below the shutoff valve"`,
 		`src="https://cdn.example/reply-photo.png"`,
 		`alt="Photo attached to this post"`,
 		`src="https://cdn.example/admin-photo.webp"`,
 		`loading="lazy" decoding="async"`,
-		`data-image-zoom-dialog`,
 		`<figcaption>Replacement cartridge orientation</figcaption>`,
 		`action="/posts/` + root.ID + `/edit"`,
 		`action="/posts/` + homeownerReply.ID + `/edit"`,
@@ -559,9 +556,6 @@ func TestImagePickerAssetsAreServed(t *testing.T) {
 			path: "/static/app.js",
 			wants: []string{
 				`const pickerSelector = "[data-image-picker]"`,
-				`video/mp4`,
-				`video/webm`,
-				`showModal`,
 				`new DataTransfer()`,
 				`addEventListener("drop"`,
 				`resetImagePicker`,
@@ -575,8 +569,6 @@ func TestImagePickerAssetsAreServed(t *testing.T) {
 				`.image-dropzone:focus-within`,
 				`.image-preview-list`,
 				`.post-image-grid`,
-				`.post-video`,
-				`.image-zoom`,
 				`@media (max-width: 520px)`,
 			},
 		},

internal/web/server.go

@@ -37,8 +37,6 @@ type Config struct {
 	Blob           blob.Uploader
 	Events         events.Publisher
 	BaseURL        string
-	// HoldUploadUntilDiscord keeps create-post temp files until PostedToDiscord.
-	HoldUploadUntilDiscord bool
 }
 
 type Server struct {
@@ -109,27 +107,7 @@ type threadPostCtx struct {
 
 type imagePickerCtx struct {
 	ID     string
-	Video  *store.PostImage
+	Images []store.PostImage
-	Photos []store.PostImage
-}
-
-func splitPickerMedia(images []store.PostImage) (*store.PostImage, []store.PostImage) {
-	photos := make([]store.PostImage, 0, len(images))
-	var video *store.PostImage
-	for i := range images {
-		if images[i].Kind == store.MediaKindVideo {
-			img := images[i]
-			video = &img
-			continue
-		}
-		photos = append(photos, images[i])
-	}
-	return video, photos
-}
-
-func postPhotos(images []store.PostImage) []store.PostImage {
-	_, photos := splitPickerMedia(images)
-	return photos
 }
 
 func New(st store.Store, sessionStore scs.Store, templateFS fs.FS, staticFS fs.FS, cfg Config) (*Server, error) {
@@ -147,13 +125,11 @@ func New(st store.Store, sessionStore scs.Store, templateFS fs.FS, staticFS fs.F
 			return threadPostCtx{User: user, CSRF: csrf, Root: root, Post: post, Depth: depth}
 		},
 		"imagePicker": func(id string, images []store.PostImage) imagePickerCtx {
-			video, photos := splitPickerMedia(images)
+			return imagePickerCtx{ID: id, Images: images}
-			return imagePickerCtx{ID: id, Video: video, Photos: photos}
 		},
 		"newImagePicker": func(id string) imagePickerCtx {
 			return imagePickerCtx{ID: id}
 		},
-		"postPhotos":  postPhotos,
 		"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() },
@@ -372,14 +348,7 @@ func (s *Server) handleSubmit(w http.ResponseWriter, r *http.Request) {
 	if !ok {
 		return
 	}
-	var media []events.Media
+	defer cleanup()
-	held := false
-	defer func() {
-		if !held {
-			closeHeldMedia(media)
-			cleanup()
-		}
-	}()
 	if !s.requireCSRF(w, r) {
 		return
 	}
@@ -417,7 +386,7 @@ func (s *Server) handleSubmit(w http.ResponseWriter, r *http.Request) {
 		Body:     body,
 		City:     city,
 	}
-	images, newKeys, media, err := s.postImagesFromForm(r.Context(), r, post.ID, nil)
+	images, newKeys, err := s.postImagesFromForm(r.Context(), r, post.ID, nil)
 	if err != nil {
 		writePostImageRequestError(w, err)
 		return
@@ -428,8 +397,7 @@ func (s *Server) handleSubmit(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "could not save question", http.StatusInternalServerError)
 		return
 	}
-	s.publishPostCreated(post, post, u, media, cleanup)
+	s.publishPostCreated(post, post, u)
-	held = true
 	http.Redirect(w, r, "/questions/"+url.PathEscape(post.ID), http.StatusSeeOther)
 }
 

internal/web/server_test.go

@@ -176,10 +176,8 @@ func TestRegisterLoginAsk(t *testing.T) {
 		`enctype="multipart/form-data"`,
 		`data-image-picker`,
 		`id="submit-images"`,
-		`accept="image/jpeg,image/png,image/webp,video/mp4,video/webm,.mp4,.webm"`,
+		`accept="image/jpeg,image/png,image/webp"`,
-		`Add up to 4 JPEG, PNG, or WebP images (5 MB each) and one MP4 or WebM video (25 MB).`,
+		`Add up to 4 JPEG, PNG, or WebP images.`,
-		`Drop photos or a video here`,
-		`data-video-slot`,
 	} {
 		if !strings.Contains(rec.Body.String(), want) {
 			t.Fatalf("submit form missing %q: %s", want, rec.Body.String())

static/app.css

@@ -854,55 +854,6 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
   font-size: 0.72rem;
 }
 
-.video-picker-slot:not(:empty) {
-  margin-bottom: 10px;
-}
-
-.video-preview {
-  min-width: 0;
-  display: grid;
-  grid-template-rows: auto 1fr;
-  border: 1px solid var(--line);
-  border-radius: 3px;
-  overflow: hidden;
-  background: #141516;
-}
-
-.video-preview[hidden] { display: none; }
-
-.video-preview-media {
-  position: relative;
-  background: var(--bg);
-}
-
-.video-preview-media video,
-.post-video video {
-  display: block;
-  width: 100%;
-  max-height: 20rem;
-  background: #000;
-}
-
-.post-video {
-  margin: 16px 0 0;
-  overflow: hidden;
-  border: 1px solid var(--line);
-  border-radius: 3px;
-  background: #141516;
-}
-
-.post-video video { max-height: 32rem; }
-
-.post-video figcaption {
-  padding: 8px 10px;
-  border-top: 1px solid var(--line);
-  color: var(--muted);
-  font-family: var(--mono);
-  font-size: 0.7rem;
-  line-height: 1.45;
-  overflow-wrap: anywhere;
-}
-
 .image-preview-list {
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -1011,18 +962,6 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
   background: #141516;
 }
 
-.post-image-zoom {
-  display: block;
-  color: inherit;
-  text-decoration: none;
-  cursor: zoom-in;
-}
-
-.post-image-zoom:focus-visible {
-  outline: 2px solid var(--signal);
-  outline-offset: 2px;
-}
-
 .post-image img {
   width: 100%;
   height: 100%;
@@ -1037,68 +976,6 @@ input:focus, textarea:focus, .btn:focus-visible, .chip:focus-visible, .vote-btn:
   object-fit: contain;
 }
 
-.image-zoom {
-  width: min(100vw - 24px, 1100px);
-  max-width: none;
-  height: min(100vh - 24px, 100dvh);
-  max-height: none;
-  margin: auto;
-  padding: 12px;
-  border: 1px solid var(--line);
-  border-radius: 4px;
-  background: #101113;
-  color: var(--ink);
-}
-
-.image-zoom::backdrop {
-  background: rgba(10, 11, 12, 0.88);
-}
-
-.image-zoom-bar {
-  display: flex;
-  justify-content: flex-end;
-  margin: 0 0 8px;
-}
-
-.image-zoom-close {
-  min-height: 44px;
-  padding: 0 12px;
-  border: 1px solid var(--line);
-  border-radius: 3px;
-  background: var(--panel);
-  color: var(--ink);
-  font-family: var(--mono);
-  font-size: 0.72rem;
-  letter-spacing: 0.06em;
-  text-transform: uppercase;
-  cursor: pointer;
-}
-
-.image-zoom-close:hover { border-color: var(--zinc); }
-
-.image-zoom-close:focus-visible {
-  outline: 2px solid var(--signal);
-  outline-offset: 2px;
-}
-
-.image-zoom img {
-  display: block;
-  width: 100%;
-  height: calc(100% - 4.5rem);
-  max-height: calc(100dvh - 8rem);
-  object-fit: contain;
-  background: #000;
-}
-
-.image-zoom-caption {
-  margin: 8px 0 0;
-  color: var(--muted);
-  font-family: var(--mono);
-  font-size: 0.72rem;
-  line-height: 1.45;
-  overflow-wrap: anywhere;
-}
-
 .post-image figcaption {
   padding: 8px 10px;
   border-top: 1px solid var(--line);

static/app.js

@@ -2,9 +2,7 @@
   const formSelector = "form[data-submit-once]";
   const pickerSelector = "[data-image-picker]";
   const allowedImageTypes = new Set(["image/jpeg", "image/png", "image/webp"]);
-  const allowedVideoTypes = new Set(["video/mp4", "video/webm"]);
   const maxImageBytes = 5 * 1024 * 1024;
-  const maxVideoBytes = 25 * 1024 * 1024;
   const pickerStates = new WeakMap();
 
   function progressIndicator() {
@@ -31,20 +29,12 @@
     return picker.querySelectorAll("[data-existing-image]:not([hidden])").length;
   }
 
-  function existingVideoCount(picker) {
-    return picker.querySelectorAll("[data-existing-video]:not([hidden])").length;
-  }
-
   function updateImageCount(picker, state) {
-    const photos = existingImageCount(picker) + state.entries.length;
+    const count = existingImageCount(picker) + state.entries.length;
-    const videos = existingVideoCount(picker) + (state.video ? 1 : 0);
     const status = picker.querySelector("[data-image-count]");
-    if (!status) {
+    if (status) {
-      return;
+      status.textContent = `${count} of ${state.max}`;
     }
-    status.textContent = videos
-      ? `${photos} of ${state.max} · 1 video`
-      : `${photos} of ${state.max}`;
   }
 
   function showImageError(picker, message) {
@@ -66,16 +56,6 @@
     return /\.(jpe?g|png|webp)$/i.test(file.name);
   }
 
-  function videoFileAllowed(file) {
-    if (allowedVideoTypes.has(file.type)) {
-      return true;
-    }
-    if (file.type) {
-      return false;
-    }
-    return /\.(mp4|webm)$/i.test(file.name);
-  }
-
   function sameImageFile(left, right) {
     return left.name === right.name &&
       left.size === right.size &&
@@ -84,9 +64,6 @@
 
   function syncImageInput(state) {
     const transfer = new DataTransfer();
-    if (state.video) {
-      transfer.items.add(state.video.file);
-    }
     state.entries.forEach((entry) => transfer.items.add(entry.file));
     state.input.files = transfer.files;
   }
@@ -104,108 +81,54 @@
     updateImageCount(picker, state);
   }
 
-  function removeNewVideo(picker, state) {
-    if (!state.video) {
-      return;
-    }
-    URL.revokeObjectURL(state.video.previewURL);
-    state.video.card.remove();
-    state.video = null;
-    syncImageInput(state);
-    showImageError(picker, "");
-    updateImageCount(picker, state);
-  }
-
-  function addNewImage(picker, state, file) {
-    const fragment = state.template.content.cloneNode(true);
-    const card = fragment.querySelector("[data-new-image]");
-    const preview = fragment.querySelector("[data-image-preview]");
-    const name = fragment.querySelector("[data-image-name]");
-    const previewURL = URL.createObjectURL(file);
-    preview.src = previewURL;
-    if (name) {
-      name.textContent = file.name;
-    }
-    const entry = { file, card, previewURL };
-    const removeButton = card.querySelector("[data-remove-image]");
-    removeButton.setAttribute("aria-label", `Remove selected image: ${file.name}`);
-    removeButton.addEventListener("click", () => {
-      removeNewImage(picker, state, entry);
-    });
-    state.list.appendChild(fragment);
-    state.entries.push(entry);
-  }
-
-  function addNewVideo(picker, state, file) {
-    const fragment = state.videoTemplate.content.cloneNode(true);
-    const card = fragment.querySelector("[data-new-video]");
-    const preview = fragment.querySelector("[data-video-preview]");
-    const name = fragment.querySelector("[data-image-name]");
-    const previewURL = URL.createObjectURL(file);
-    preview.src = previewURL;
-    preview.setAttribute("aria-label", file.name);
-    if (name) {
-      name.textContent = file.name;
-    }
-    const entry = { file, card, previewURL };
-    const removeButton = card.querySelector("[data-remove-image]");
-    removeButton.setAttribute("aria-label", `Remove selected video: ${file.name}`);
-    removeButton.addEventListener("click", () => {
-      removeNewVideo(picker, state);
-    });
-    state.videoSlot.appendChild(fragment);
-    state.video = entry;
-  }
-
   function addImageFiles(picker, state, files) {
     showImageError(picker, "");
     const uniqueFiles = files.filter((file) =>
-      !state.entries.some((entry) => sameImageFile(entry.file, file)) &&
+      !state.entries.some((entry) => sameImageFile(entry.file, file))
-      !(state.video && sameImageFile(state.video.file, file))
     );
-    const videos = uniqueFiles.filter(videoFileAllowed);
+    const available = state.max - existingImageCount(picker) - state.entries.length;
-    const images = uniqueFiles.filter(imageFileAllowed);
+    if (uniqueFiles.length > available) {
-    if (videos.length + images.length !== uniqueFiles.length) {
-      showImageError(picker, "Use JPEG, PNG, or WebP photos and one MP4 or WebM video.");
-      syncImageInput(state);
-      return;
-    }
-    const availablePhotos = state.max - existingImageCount(picker) - state.entries.length;
-    if (images.length > availablePhotos) {
       showImageError(
         picker,
-        availablePhotos > 0
+        available > 0
-          ? `You can add ${availablePhotos} more ${availablePhotos === 1 ? "image" : "images"}.`
+          ? `You can add ${available} more ${available === 1 ? "image" : "images"}.`
           : "You already have 4 images selected."
       );
       syncImageInput(state);
       return;
     }
-    const availableVideos = state.maxVideos - existingVideoCount(picker) - (state.video ? 1 : 0);
+    for (const file of uniqueFiles) {
-    if (videos.length > availableVideos) {
+      if (!imageFileAllowed(file)) {
-      showImageError(
+        showImageError(picker, "Images must be JPEG, PNG, or WebP.");
-        picker,
+        syncImageInput(state);
-        availableVideos > 0 ? "You can attach one video." : "You already have a video selected."
+        return;
-      );
+      }
-      syncImageInput(state);
-      return;
-    }
-    for (const file of images) {
       if (file.size > maxImageBytes) {
         showImageError(picker, `${file.name} is larger than 5 MB.`);
         syncImageInput(state);
         return;
       }
     }
-    for (const file of videos) {
+
-      if (file.size > maxVideoBytes) {
+    uniqueFiles.forEach((file) => {
-        showImageError(picker, `${file.name} is larger than 25 MB.`);
+      const fragment = state.template.content.cloneNode(true);
-        syncImageInput(state);
+      const card = fragment.querySelector("[data-new-image]");
-        return;
+      const preview = fragment.querySelector("[data-image-preview]");
+      const name = fragment.querySelector("[data-image-name]");
+      const previewURL = URL.createObjectURL(file);
+      preview.src = previewURL;
+      if (name) {
+        name.textContent = file.name;
       }
-    }
+      const entry = { file, card, previewURL };
-    videos.forEach((file) => addNewVideo(picker, state, file));
+      const removeButton = card.querySelector("[data-remove-image]");
-    images.forEach((file) => addNewImage(picker, state, file));
+      removeButton.setAttribute("aria-label", `Remove selected image: ${file.name}`);
+      removeButton.addEventListener("click", () => {
+        removeNewImage(picker, state, entry);
+      });
+      state.list.appendChild(fragment);
+      state.entries.push(entry);
+    });
     syncImageInput(state);
     updateImageCount(picker, state);
   }
@@ -220,13 +143,8 @@
       entry.card.remove();
     });
     state.entries = [];
-    if (state.video) {
-      URL.revokeObjectURL(state.video.previewURL);
-      state.video.card.remove();
-      state.video = null;
-    }
     state.input.value = "";
-    picker.querySelectorAll("[data-existing-image], [data-existing-video]").forEach((card) => {
+    picker.querySelectorAll("[data-existing-image]").forEach((card) => {
       card.hidden = false;
       card.querySelectorAll("input").forEach((input) => {
         input.disabled = false;
@@ -248,21 +166,15 @@
     const dropzone = picker.querySelector("[data-image-dropzone]");
     const list = picker.querySelector("[data-image-list]");
     const template = picker.querySelector("[data-image-template]");
-    const videoSlot = picker.querySelector("[data-video-slot]");
+    if (!input || !dropzone || !list || !template) {
-    const videoTemplate = picker.querySelector("[data-video-template]");
-    if (!input || !dropzone || !list || !template || !videoSlot || !videoTemplate) {
       return;
     }
     const state = {
       input,
       list,
       template,
-      videoSlot,
-      videoTemplate,
       entries: [],
-      video: null,
       max: Number.parseInt(picker.dataset.maxImages, 10) || 4,
-      maxVideos: Number.parseInt(picker.dataset.maxVideos, 10) || 1,
     };
     pickerStates.set(picker, state);
     updateImageCount(picker, state);
@@ -270,7 +182,7 @@
     input.addEventListener("change", () => {
       addImageFiles(picker, state, Array.from(input.files));
     });
-    picker.querySelectorAll("[data-existing-image], [data-existing-video]").forEach((card) => {
+    picker.querySelectorAll("[data-existing-image]").forEach((card) => {
       card.querySelector("[data-remove-image]").addEventListener("click", () => {
         card.hidden = true;
         card.querySelectorAll("input").forEach((existingInput) => {
@@ -330,9 +242,6 @@
   window.addEventListener("pageshow", () => {
     document.querySelectorAll(formSelector).forEach(resetForm);
     document.querySelectorAll(pickerSelector).forEach(resetImagePicker);
-    if (zoomDialog?.open) {
-      zoomDialog.close();
-    }
     const progress = progressIndicator();
     if (progress) {
       progress.hidden = true;
@@ -340,53 +249,4 @@
   });
 
   document.querySelectorAll(pickerSelector).forEach(initializeImagePicker);
-
-  const zoomDialog = document.querySelector("[data-image-zoom-dialog]");
-  const zoomImage = zoomDialog?.querySelector("[data-image-zoom-img]");
-  const zoomCaption = zoomDialog?.querySelector("[data-image-zoom-caption]");
-  let zoomTrigger = null;
-
-  function openImageZoom(link) {
-    if (!zoomDialog || !zoomImage || typeof zoomDialog.showModal !== "function") {
-      return false;
-    }
-    const photo = link.querySelector("img");
-    if (!photo) {
-      return false;
-    }
-    zoomTrigger = link;
-    zoomImage.src = link.href;
-    zoomImage.alt = photo.alt || "";
-    if (zoomCaption) {
-      zoomCaption.textContent = photo.alt || "";
-    }
-    if (!zoomDialog.open) {
-      zoomDialog.showModal();
-    }
-    return true;
-  }
-
-  document.addEventListener("click", (event) => {
-    const link = event.target.closest("[data-image-zoom]");
-    if (!link) {
-      return;
-    }
-    if (openImageZoom(link)) {
-      event.preventDefault();
-    }
-  });
-
-  zoomDialog?.addEventListener("click", (event) => {
-    if (event.target === zoomDialog) {
-      zoomDialog.close();
-    }
-  });
-
-  zoomDialog?.addEventListener("close", () => {
-    if (zoomImage) {
-      zoomImage.removeAttribute("src");
-    }
-    zoomTrigger?.focus();
-    zoomTrigger = null;
-  });
 })();

templates/base.html

@@ -73,13 +73,6 @@
   <footer class="site-footer">
     <p>This site is not a substitute for a licensed plumber. Advice is general and based on the question as written. If you have a gas leak, flooding, or another emergency, leave the area if needed and call 911.</p>
   </footer>
-  <dialog class="image-zoom" data-image-zoom-dialog aria-labelledby="image-zoom-caption">
-    <form method="dialog" class="image-zoom-bar">
-      <button class="image-zoom-close" value="close">Close</button>
-    </form>
-    <img data-image-zoom-img alt="">
-    <p id="image-zoom-caption" class="image-zoom-caption" data-image-zoom-caption></p>
-  </dialog>
 </body>
 </html>
 {{end}}

templates/partials/_image_picker.html

@@ -1,50 +1,26 @@
 {{define "imagePicker"}}
-<fieldset class="image-picker" data-image-picker data-max-images="4" data-max-videos="1">
+<fieldset class="image-picker" data-image-picker data-max-images="4">
-  <legend>Photos and video <span class="optional">(optional)</span></legend>
+  <legend>Photos <span class="optional">(optional)</span></legend>
   <p id="{{.ID}}-hint" class="image-picker-hint">
-    Add up to 4 JPEG, PNG, or WebP images (5 MB each) and one MP4 or WebM video (25 MB).
+    Add up to 4 JPEG, PNG, or WebP images. Each image can be up to 5 MB.
   </p>
-  <div class="video-picker-slot" data-video-slot>
-    {{if .Video}}
-      <article class="video-preview" data-video-card data-existing-video>
-        <div class="video-preview-media">
-          <video src="{{.Video.PublicURL}}" controls playsinline preload="metadata"
-            {{if .Video.Description}}aria-label="{{.Video.Description}}"{{else}}aria-label="Saved video"{{end}}></video>
-          <span class="image-preview-tag">Saved</span>
-        </div>
-        <div class="image-preview-fields">
-          <input type="hidden" name="existing_image_id" value="{{.Video.ID}}">
-          <label for="{{.ID}}-video-description-{{.Video.ID}}">
-            Video description <span class="optional">(optional)</span>
-          </label>
-          <input id="{{.ID}}-video-description-{{.Video.ID}}" type="text"
-            name="existing_image_description" maxlength="500"
-            value="{{.Video.Description}}" placeholder="What should people notice?">
-          <button class="image-remove" type="button" data-remove-image
-            aria-label="Remove video{{if .Video.Description}}: {{.Video.Description}}{{end}}">
-            Remove
-          </button>
-        </div>
-      </article>
-    {{end}}
-  </div>
   <div class="image-dropzone" data-image-dropzone>
     <input id="{{.ID}}" class="image-input" type="file" name="images"
-      accept="image/jpeg,image/png,image/webp,video/mp4,video/webm,.mp4,.webm" multiple
+      accept="image/jpeg,image/png,image/webp" multiple
       aria-describedby="{{.ID}}-hint {{.ID}}-status {{.ID}}-error"
       data-image-input>
     <label class="image-dropzone-label" for="{{.ID}}">
-      <strong>Drop photos or a video here</strong>
+      <strong>Drop photos here</strong>
       <span>or click to browse</span>
     </label>
     <span id="{{.ID}}-status" class="image-picker-count" role="status"
-      aria-live="polite" data-image-count>{{len .Photos}} of 4{{if .Video}} · 1 video{{end}}</span>
+      aria-live="polite" data-image-count>{{len .Images}} of 4</span>
   </div>
   <p id="{{.ID}}-error" class="image-picker-error" role="alert"
     data-image-error hidden></p>
 
   <div class="image-preview-list" data-image-list>
-    {{range .Photos}}
+    {{range .Images}}
       <article class="image-preview" data-image-card data-existing-image>
         <div class="image-preview-media">
           <img src="{{.PublicURL}}" alt="" width="{{.Width}}" height="{{.Height}}">
@@ -87,26 +63,6 @@
       </div>
     </article>
   </template>
-  <template data-video-template>
-    <article class="video-preview" data-video-card data-new-video>
-      <div class="video-preview-media">
-        <video controls playsinline preload="metadata" data-video-preview></video>
-        <span class="image-preview-tag">New</span>
-      </div>
-      <div class="image-preview-fields">
-        <p class="image-preview-name" data-image-name></p>
-        <label>
-          Video description <span class="optional">(optional)</span>
-          <input type="text" name="image_description" maxlength="500"
-            placeholder="What should people notice?">
-        </label>
-        <button class="image-remove" type="button" data-remove-image
-          aria-label="Remove selected video">
-          Remove
-        </button>
-      </div>
-    </article>
-  </template>
   <noscript>
     <p class="image-picker-hint">Image previews and removal while editing require JavaScript.</p>
   </noscript>
@@ -114,25 +70,13 @@
 {{end}}
 
 {{define "postImages"}}
-{{range .Images}}
+{{if .Images}}
-  {{if eq .Kind "video"}}
+  <div class="post-image-grid post-image-grid-{{len .Images}}">
-    <figure class="post-video">
+    {{range .Images}}
-      <video src="{{.PublicURL}}" controls playsinline preload="metadata"
-        {{if .Description}}aria-label="{{.Description}}"{{else}}aria-label="Video attached to this post"{{end}}></video>
-      {{if .Description}}<figcaption>{{.Description}}</figcaption>{{end}}
-    </figure>
-  {{end}}
-{{end}}
-{{$photos := postPhotos .Images}}
-{{if $photos}}
-  <div class="post-image-grid post-image-grid-{{len $photos}}">
-    {{range $photos}}
       <figure class="post-image">
-        <a class="post-image-zoom" href="{{.PublicURL}}" data-image-zoom>
+        <img src="{{.PublicURL}}" width="{{.Width}}" height="{{.Height}}"
-          <img src="{{.PublicURL}}" width="{{.Width}}" height="{{.Height}}"
+          alt="{{if .Description}}{{.Description}}{{else}}Photo attached to this post{{end}}"
-            alt="{{if .Description}}{{.Description}}{{else}}Photo attached to this post{{end}}"
+          loading="lazy" decoding="async">
-            loading="lazy" decoding="async">
-        </a>
         {{if .Description}}<figcaption>{{.Description}}</figcaption>{{end}}
       </figure>
     {{end}}