Release 2026.07.31-1

First release of the Go rewrite: invite-only membership, the submission
pipeline for uploads and YouTube, the queue and review loop with the reveal
rule, stats, profiles, avatars and palaute.

.env.example

@@ -1,4 +1,5 @@
-# Copy to .env and edit. The admin password has no default.
+# Copy to .env and edit. Neither password has a default.
+POSTGRES_PASSWORD=
 ADMIN_USER=admin
 ADMIN_PASSWORD=
 

.gitignore

@@ -1,4 +1,5 @@
 /levyraati
 /levyraati26-go
 /storage/
+/pgdata/
 .env

Dockerfile

@@ -10,9 +10,7 @@ RUN CGO_ENABLED=0 go build -ldflags "-X main.version=${VERSION}" -o /levyraati .
 FROM alpine:3.24
 # yt-dlp rots against YouTube. Alpine's active branch tracks it closely (3.24 carries the current
 # release), so a rebuild is the update — and this avoids python3 + pip in the image entirely.
-# sqlite is the CLI only — the app links its own pure-Go copy. It is here so `.backup` and a shell
-# are reachable with docker compose exec, which is the whole of database operations now.
-RUN apk add --no-cache ffmpeg yt-dlp ca-certificates sqlite
+RUN apk add --no-cache ffmpeg yt-dlp ca-certificates
 COPY --from=build /levyraati /usr/local/bin/levyraati
 ENV STORAGE_DIR=/storage
 EXPOSE 8080

README.md

@@ -45,12 +45,10 @@ Members have an address because it is their login and because mail is a planned
 
 ## Stack
 
-Go, SQLite, `html/template`, HTMX + Alpine. Audio is converted with ffmpeg and downloaded with
-yt-dlp. One binary, one origin, one container — there is no separate frontend and no database server
-to deploy.
+Go, Postgres, `html/template`, HTMX + Alpine. Audio is converted with ffmpeg and downloaded with
+yt-dlp. One binary, one origin — there is no separate frontend to deploy.
 
-Go dependencies: `modernc.org/sqlite` and `golang.org/x/crypto`. The SQLite driver is pure Go, so the
-build stays `CGO_ENABLED=0`. No Node, no npm, no bundler.
+Go dependencies: `pgx/v5` and `golang.org/x/crypto`. No Node, no npm, no bundler.
 
 ## Running it
 
@@ -66,7 +64,8 @@ creates no users: log into the admin panel and mint an invite.
 
 | Variable | Default | Notes |
 |---|---|---|
-| `DB_PATH` | `$STORAGE_DIR/levyraati.db` | The SQLite file. Created on first start |
+| `POSTGRES_PASSWORD` | — | **Required by Compose.** Used to build `DATABASE_URL` for the app |
+| `DATABASE_URL` | — | `postgres://user:pass@postgres:5432/levyraati` |
 | `ADMIN_USER` | `admin` | Admin panel username |
 | `ADMIN_PASSWORD` | — | **Required.** No default; the app refuses to start without it |
 | `ADDR` | `:8080` | Member-facing listener |
@@ -78,14 +77,16 @@ creates no users: log into the admin panel and mint an invite.
 ### Local development
 
 ```sh
+docker compose up -d postgres
+export DATABASE_URL="postgres://levyraati:$POSTGRES_PASSWORD@localhost:5432/levyraati"
 export ADMIN_PASSWORD=dev SECURE_COOKIES=false
 go run .
 ```
 
-Requires Go 1.25+, plus `ffmpeg`, `ffprobe`, and `yt-dlp` on `PATH`. There is nothing to start first:
-the database is a file under `./storage`, created on the first run.
+Requires Go 1.24+, plus `ffmpeg`, `ffprobe`, and `yt-dlp` on `PATH`.
 
-Tests get a fresh database file in a temp directory each, so they need no setup and touch nothing:
+Tests that need a database are skipped unless `TEST_DATABASE_URL` points at a throwaway one — the
+migration test drops and recreates the `public` schema, so never point it at anything you care about.
 
 ```sh
 go test ./...
@@ -135,22 +136,23 @@ JSON to stdout, nothing else. There is no log table and no log viewer in the app
 
 ### Backups
 
-`./storage` holds everything: audio files, avatars, and `levyraati.db`. It is a bind mount, so a copy
-of that one directory is the whole backup. `storage/tmp/` is in-flight conversions and is safe to
-skip; it's cleared on startup anyway.
+Two paths hold everything:
 
-Copying the file while the app is running is not a backup — WAL means the latest writes live in a
-sidecar file. Ask SQLite for a consistent snapshot instead:
+- `./pgdata` — the database. Postgres 18 stores it under a version subdirectory (`18/docker`), so
+  the mount is `/var/lib/postgresql`, not `/var/lib/postgresql/data`
+- `./storage` — audio files and avatars
+
+Both are bind mounts. `storage/tmp/` is in-flight conversions and is safe to skip; it's cleared on
+startup anyway.
 
 ```sh
-docker compose exec app sqlite3 /storage/levyraati.db ".backup '/storage/tmp/backup.db'"
-gzip -c storage/tmp/backup.db > backup-$(date +%F).db.gz && rm storage/tmp/backup.db
+docker compose exec postgres pg_dump -U levyraati levyraati | gzip > backup-$(date +%F).sql.gz
 ```
 
 ### Database shell
 
 ```sh
-docker compose exec app sqlite3 /storage/levyraati.db
+docker compose exec postgres psql -U levyraati levyraati
 ```
 
 ## Layout

admin.go

@@ -41,12 +41,12 @@ func (a *app) adminDashboard(w http.ResponseWriter, r *http.Request) {
 
 	// Unused invites are the ones with a job to do; spent ones are counted, not listed. Truncating
 	// a list silently reads as "that's all of them".
-	if err := a.db.QueryRowContext(r.Context(),
-		`select count(*) from invites where not is_valid`).Scan(&d.SpentCount); err != nil {
+	if err := a.pool.QueryRow(r.Context(),
+		`select count(*)::int from invites where not is_valid`).Scan(&d.SpentCount); err != nil {
 		adminError(w, "invites", err)
 		return
 	}
-	rows, err := a.db.QueryContext(r.Context(),
+	rows, err := a.pool.Query(r.Context(),
 		`select id, code, is_valid, created_at from invites where is_valid order by created_at desc`)
 	if err != nil {
 		adminError(w, "invites", err)
@@ -67,7 +67,7 @@ func (a *app) adminDashboard(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	rows, err = a.db.QueryContext(r.Context(),
+	rows, err = a.pool.Query(r.Context(),
 		`select id, name, email, banned, created_at from users order by created_at`)
 	if err != nil {
 		adminError(w, "users", err)
@@ -91,8 +91,8 @@ func (a *app) adminDashboard(w http.ResponseWriter, r *http.Request) {
 		adminError(w, "songs", err)
 		return
 	}
-	if err := a.db.QueryRowContext(r.Context(),
-		`select count(*) from reports where resolved_at is null`).Scan(&d.OpenCount); err != nil {
+	if err := a.pool.QueryRow(r.Context(),
+		`select count(*)::int from reports where resolved_at is null`).Scan(&d.OpenCount); err != nil {
 		adminError(w, "reports", err)
 		return
 	}
@@ -116,7 +116,7 @@ func (a *app) inviteLink(code string) string {
 
 func (a *app) createInvite(w http.ResponseWriter, r *http.Request) {
 	code := inviteCode()
-	if _, err := a.db.ExecContext(r.Context(), `insert into invites (code) values ($1)`, code); err != nil {
+	if _, err := a.pool.Exec(r.Context(), `insert into invites (code) values ($1)`, code); err != nil {
 		adminError(w, "invites", err)
 		return
 	}
@@ -136,14 +136,14 @@ func (a *app) toggleBan(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var banned bool
-	err = a.db.QueryRowContext(r.Context(),
+	err = a.pool.QueryRow(r.Context(),
 		`update users set banned = not banned where id = $1 returning banned`, id).Scan(&banned)
 	if err != nil {
 		adminError(w, "users", err)
 		return
 	}
 	if banned {
-		if _, err := a.db.ExecContext(r.Context(), `delete from sessions where user_id = $1`, id); err != nil {
+		if _, err := a.pool.Exec(r.Context(), `delete from sessions where user_id = $1`, id); err != nil {
 			adminError(w, "users", err)
 			return
 		}
@@ -173,12 +173,12 @@ func (a *app) resetPassword(w http.ResponseWriter, r *http.Request) {
 		adminError(w, "auth", err)
 		return
 	}
-	if _, err := a.db.ExecContext(r.Context(),
+	if _, err := a.pool.Exec(r.Context(),
 		`update users set password_hash = $2 where id = $1`, id, string(hash)); err != nil {
 		adminError(w, "auth", err)
 		return
 	}
-	if _, err := a.db.ExecContext(r.Context(), `delete from sessions where user_id = $1`, id); err != nil {
+	if _, err := a.pool.Exec(r.Context(), `delete from sessions where user_id = $1`, id); err != nil {
 		adminError(w, "auth", err)
 		return
 	}

auth.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"crypto/rand"
-	"database/sql"
 	"encoding/hex"
 	"errors"
 	"log/slog"
@@ -11,8 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/jackc/pgx/v5"
 	"golang.org/x/crypto/bcrypt"
-	"modernc.org/sqlite"
 )
 
 const (
@@ -80,9 +79,9 @@ func (a *app) startSession(ctx context.Context, userID int64, remember bool) (st
 	}
 	tok := token()
 	expires := time.Now().Add(ttl)
-	_, err := a.db.ExecContext(ctx,
+	_, err := a.pool.Exec(ctx,
 		`insert into sessions (token, user_id, idle_ttl, expires_at) values ($1, $2, $3, $4)`,
-		tok, userID, int64(ttl.Seconds()), expires)
+		tok, userID, ttl, expires)
 	return tok, expires, err
 }
 
@@ -104,29 +103,29 @@ func (a *app) session(w http.ResponseWriter, r *http.Request) *member {
 		m         member
 		expires   time.Time
 		ttl       time.Duration
-		ttlSeconds int64
+		ttlMicros int64
 	)
-	err := a.db.QueryRowContext(r.Context(), `
-		select s.expires_at, s.idle_ttl,
+	err := a.pool.QueryRow(r.Context(), `
+		select s.expires_at, extract(epoch from s.idle_ttl) * 1000000,
 		       u.id, u.name, u.email, u.avatar, u.banned, u.created_at
 		  from sessions s join users u on u.id = s.user_id
-		 where s.token = $1 and s.expires_at > datetime('now')`, tok).
-		Scan(&expires, &ttlSeconds, &m.ID, &m.Name, &m.Email, &m.Avatar, &m.Banned, &m.CreatedAt)
+		 where s.token = $1 and s.expires_at > now()`, tok).
+		Scan(&expires, &ttlMicros, &m.ID, &m.Name, &m.Email, &m.Avatar, &m.Banned, &m.CreatedAt)
 	if err != nil {
-		if !errors.Is(err, sql.ErrNoRows) {
+		if !errors.Is(err, pgx.ErrNoRows) {
 			slog.Error("session lookup", "ctx", "auth", "error", err)
 		}
 		return nil
 	}
 	if m.Banned {
 		// Banning deletes sessions, so this is belt and braces for a row that outlived one.
-		a.db.ExecContext(r.Context(), `delete from sessions where user_id = $1`, m.ID)
+		a.pool.Exec(r.Context(), `delete from sessions where user_id = $1`, m.ID)
 		return nil
 	}
-	ttl = time.Duration(ttlSeconds) * time.Second
+	ttl = time.Duration(ttlMicros) * time.Microsecond
 	if time.Until(expires) < ttl-extendAfter {
 		newExpiry := time.Now().Add(ttl)
-		if _, err := a.db.ExecContext(r.Context(),
+		if _, err := a.pool.Exec(r.Context(),
 			`update sessions set expires_at = $2 where token = $1`, tok, newExpiry); err == nil {
 			a.setSessionCookie(w, tok, newExpiry)
 		}
@@ -179,7 +178,7 @@ func (a *app) login(w http.ResponseWriter, r *http.Request) {
 		hash   string
 		banned bool
 	)
-	err := a.db.QueryRowContext(r.Context(),
+	err := a.pool.QueryRow(r.Context(),
 		`select id, password_hash, banned from users where email = $1`, email).Scan(&id, &hash, &banned)
 	if err != nil || bcrypt.CompareHashAndPassword([]byte(hash), []byte(r.FormValue("password"))) != nil {
 		a.logins.fail(email)
@@ -209,7 +208,7 @@ func (a *app) login(w http.ResponseWriter, r *http.Request) {
 
 func (a *app) logout(w http.ResponseWriter, r *http.Request) {
 	if tok := sessionToken(r); tok != "" {
-		a.db.ExecContext(r.Context(), `delete from sessions where token = $1`, tok)
+		a.pool.Exec(r.Context(), `delete from sessions where token = $1`, tok)
 	}
 	http.SetCookie(w, &http.Cookie{
 		Name: sessionCookie, Value: "", Path: "/", MaxAge: -1,
@@ -260,19 +259,19 @@ func (a *app) register(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tx, err := a.db.BeginTx(r.Context(), nil)
+	tx, err := a.pool.Begin(r.Context())
 	if err != nil {
 		slog.Error("begin", "ctx", "auth", "error", err)
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	defer tx.Rollback()
+	defer tx.Rollback(r.Context())
 
 	var inviteID int64
-	err = tx.QueryRowContext(r.Context(),
-		`update invites set is_valid = 0 where code = $1 and is_valid returning id`,
+	err = tx.QueryRow(r.Context(),
+		`update invites set is_valid = false where code = $1 and is_valid returning id`,
 		form.Code).Scan(&inviteID)
-	if errors.Is(err, sql.ErrNoRows) {
+	if errors.Is(err, pgx.ErrNoRows) {
 		form.Errors["code"] = "Kutsukoodi ei kelpaa."
 		a.render(w, r, http.StatusUnprocessableEntity, "register.html", page{Title: "Liity", Narrow: true, Data: form})
 		return
@@ -283,7 +282,7 @@ func (a *app) register(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var userID int64
-	err = tx.QueryRowContext(r.Context(),
+	err = tx.QueryRow(r.Context(),
 		`insert into users (name, email, password_hash) values ($1, $2, $3) returning id`,
 		form.Name, form.Email, string(hash)).Scan(&userID)
 	if isUnique(err) {
@@ -296,7 +295,7 @@ func (a *app) register(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	if err := tx.Commit(); err != nil {
+	if err := tx.Commit(r.Context()); err != nil {
 		slog.Error("commit registration", "ctx", "auth", "error", err)
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
@@ -314,15 +313,7 @@ func (a *app) register(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, "/", http.StatusSeeOther)
 }
 
-// SQLITE_CONSTRAINT_UNIQUE and SQLITE_CONSTRAINT_PRIMARYKEY, spelled out rather than pulled in from
-// modernc.org/sqlite/lib — that package is the whole generated amalgamation, for two integers.
-const (
-	sqliteConstraintUnique     = 2067
-	sqliteConstraintPrimaryKey = 1555
-)
-
 func isUnique(err error) bool {
-	var e *sqlite.Error
-	return errors.As(err, &e) &&
-		(e.Code() == sqliteConstraintUnique || e.Code() == sqliteConstraintPrimaryKey)
+	var pgErr interface{ SQLState() string }
+	return errors.As(err, &pgErr) && pgErr.SQLState() == "23505"
 }

auth_test.go

@@ -6,26 +6,34 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"path/filepath"
+	"os"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-// A fresh database file per test, thrown away with the temp dir. No server to point at, so these
-// run everywhere rather than only where someone remembered to set an env var.
+// Set TEST_DATABASE_URL to a throwaway database — these drop and recreate the public schema.
 func testApp(t *testing.T) *app {
 	t.Helper()
+	dbURL := os.Getenv("TEST_DATABASE_URL")
+	if dbURL == "" {
+		t.Skip("TEST_DATABASE_URL not set")
+	}
 	ctx := context.Background()
-	db, err := openDB(filepath.Join(t.TempDir(), "test.db"))
+	pool, err := pgxpool.New(ctx, dbURL)
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Cleanup(func() { db.Close() })
-	if err := migrate(ctx, db); err != nil {
+	t.Cleanup(pool.Close)
+	if _, err := pool.Exec(ctx, `drop schema public cascade; create schema public`); err != nil {
 		t.Fatal(err)
 	}
-	return &app{cfg: config{adminUser: "admin", adminPass: "s3cret"}, db: db}
+	if err := migrate(ctx, pool); err != nil {
+		t.Fatal(err)
+	}
+	return &app{cfg: config{adminUser: "admin", adminPass: "s3cret"}, pool: pool}
 }
 
 func post(t *testing.T, h http.Handler, path string, form url.Values) *httptest.ResponseRecorder {
@@ -40,7 +48,7 @@ func post(t *testing.T, h http.Handler, path string, form url.Values) *httptest.
 func (a *app) inviteValid(t *testing.T, code string) bool {
 	t.Helper()
 	var valid bool
-	if err := a.db.QueryRowContext(context.Background(),
+	if err := a.pool.QueryRow(context.Background(),
 		`select is_valid from invites where code = $1`, code).Scan(&valid); err != nil {
 		t.Fatal(err)
 	}
@@ -53,10 +61,10 @@ func TestInviteIsSpentOnlyBySuccess(t *testing.T) {
 	ctx := context.Background()
 	mux := a.withMember(a.memberMux())
 
-	if _, err := a.db.ExecContext(ctx, `insert into invites (code) values ('kutsu1')`); err != nil {
+	if _, err := a.pool.Exec(ctx, `insert into invites (code) values ('kutsu1')`); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := a.db.ExecContext(ctx,
+	if _, err := a.pool.Exec(ctx,
 		`insert into users (name, email, password_hash) values ('Esa', '[email protected]', 'x')`); err != nil {
 		t.Fatal(err)
 	}
@@ -123,7 +131,7 @@ func TestLoginHandlerRefusesAfterTooManyFailures(t *testing.T) {
 func (a *app) seedMember(t *testing.T, email string) int64 {
 	t.Helper()
 	var id int64
-	err := a.db.QueryRowContext(context.Background(),
+	err := a.pool.QueryRow(context.Background(),
 		`insert into users (name, email, password_hash) values ('Esa', $1, 'x') returning id`,
 		email).Scan(&id)
 	if err != nil {
@@ -153,8 +161,8 @@ func TestSessionIdleTimeout(t *testing.T) {
 	}
 
 	// Age it past the idle window: the timeout is what expiry means, so this is the whole rule.
-	if _, err := a.db.ExecContext(ctx,
-		`update sessions set expires_at = datetime('now', '-1 second') where token = $1`, live); err != nil {
+	if _, err := a.pool.Exec(ctx,
+		`update sessions set expires_at = now() - interval '1 second' where token = $1`, live); err != nil {
 		t.Fatal(err)
 	}
 	if m := a.sessionFor(t, live); m != nil {
@@ -166,15 +174,15 @@ func TestSessionIdleTimeout(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := a.db.ExecContext(ctx,
-		`update sessions set expires_at = datetime('now', '+1 hour') where token = $1`, fresh); err != nil {
+	if _, err := a.pool.Exec(ctx,
+		`update sessions set expires_at = now() + interval '1 hour' where token = $1`, fresh); err != nil {
 		t.Fatal(err)
 	}
 	if m := a.sessionFor(t, fresh); m == nil {
 		t.Fatal("session inside the window did not resolve")
 	}
 	var expires time.Time
-	if err := a.db.QueryRowContext(ctx,
+	if err := a.pool.QueryRow(ctx,
 		`select expires_at from sessions where token = $1`, fresh).Scan(&expires); err != nil {
 		t.Fatal(err)
 	}
@@ -188,7 +196,7 @@ func TestBanDropsSessionsAndBlocksLogin(t *testing.T) {
 	ctx := context.Background()
 	mux := a.withMember(a.memberMux())
 
-	if _, err := a.db.ExecContext(ctx, `insert into invites (code) values ('kutsu2')`); err != nil {
+	if _, err := a.pool.Exec(ctx, `insert into invites (code) values ('kutsu2')`); err != nil {
 		t.Fatal(err)
 	}
 	w := post(t, mux, "/register", url.Values{
@@ -198,7 +206,7 @@ func TestBanDropsSessionsAndBlocksLogin(t *testing.T) {
 		t.Fatalf("registration: status = %d, want 303", w.Code)
 	}
 	var id int64
-	if err := a.db.QueryRowContext(ctx, `select id from users where email = '[email protected]'`).Scan(&id); err != nil {
+	if err := a.pool.QueryRow(ctx, `select id from users where email = '[email protected]'`).Scan(&id); err != nil {
 		t.Fatal(err)
 	}
 
@@ -208,7 +216,7 @@ func TestBanDropsSessionsAndBlocksLogin(t *testing.T) {
 	}
 
 	var sessions int
-	if err := a.db.QueryRowContext(ctx,
+	if err := a.pool.QueryRow(ctx,
 		`select count(*) from sessions where user_id = $1`, id).Scan(&sessions); err != nil {
 		t.Fatal(err)
 	}

docker-compose.yml

@@ -1,10 +1,28 @@
 services:
+  postgres:
+    image: postgres:18-alpine
+    environment:
+      POSTGRES_USER: levyraati
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD in .env}
+      POSTGRES_DB: levyraati
+    volumes:
+      # Postgres 18 keeps its data in /var/lib/postgresql/<version>/docker, so the mount is the
+      # parent directory, not the old /var/lib/postgresql/data.
+      - ./pgdata:/var/lib/postgresql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U levyraati"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+    restart: unless-stopped
+
   app:
     build:
       context: .
       args:
         VERSION: ${VERSION:-dev}
     environment:
+      DATABASE_URL: postgres://levyraati:${POSTGRES_PASSWORD}@postgres:5432/levyraati
       ADMIN_USER: ${ADMIN_USER:-admin}
       ADMIN_PASSWORD: ${ADMIN_PASSWORD:?set ADMIN_PASSWORD in .env}
       ADDR: ":8080"
@@ -13,10 +31,12 @@ services:
       ADMIN_ADDR: ":8081"
       SECURE_COOKIES: ${SECURE_COOKIES:-true}
       PUBLIC_URL: ${PUBLIC_URL:-}
-    # The SQLite file sits in here beside the audio, so this one mount is the whole backup.
     volumes:
       - ./storage:/storage
     ports:
       - "8080:8080"
       - "8081:8081"
+    depends_on:
+      postgres:
+        condition: service_healthy
     restart: unless-stopped

docs/decisions.md

@@ -191,48 +191,3 @@ says so.
     starting at 1, for the second attempt at a release. The string lives in a git tag and reaches
     the binary through `-ldflags`, so no file in the repo has to be bumped and a local build
     honestly reports `dev`. It surfaces in the footer, the startup log and `/healthz`.
-45. **Lyrics are suggested at submission, and stay editable forever.** Four decisions in one, taken
-    2026-07-31 while scoping the feature in [later.md](./later.md):
-    - **Suggested, never imposed.** The worker attempts one LRCLIB lookup after conversion, and the
-      waiting page carries a *Hae sanoitukset* button that re-queries with whatever title and artist
-      are currently typed. The button exists because our metadata comes from ID3 tags and YouTube
-      uploaders, so the automatic attempt misses exactly the songs with messy names — and would look
-      broken rather than absent. Neither path overwrites text the submitter has typed.
-    - **Lyrics live on the submission, not just the song**, and are copied across at publish, because
-      they are part of preparing a song rather than something bolted on afterwards.
-    - **No migration 002.** Nothing has launched, so the column goes into `001_init.sql` and the
-      database is recreated. The schema has no legacy to respect until there is data worth keeping.
-    - **The lock does not cover lyrics.** It exists so the thing people reviewed stops changing under
-      them, and nobody reviewed the lyrics — the rule is now *the lock freezes what the song claims
-      to be; lyrics are an attachment to it.* This also allows pasting lyrics for an old song, which
-      is when the feature is worth most.
-
-    The coverage assumption that shaped the earlier sketch was wrong and is corrected in `later.md`:
-    LRCLIB has synced lyrics for a good share of Finnish rock, not almost none.
-46. **SQLite instead of Postgres — this reverses entries 1 and 3** (2026-08-02). Ten members and a
-    handful of songs a week never needed a database server, and the server was the last thing making
-    this a two-container deployment. `modernc.org/sqlite` is pure Go, so `CGO_ENABLED=0` survives and
-    the dependency count does not change: `pgx` out, `sqlite` in. What it buys: one container, one
-    bind mount that is the entire backup, no `pgdata`, no healthcheck-gated `depends_on`, no startup
-    retry loop, and tests that run anywhere instead of skipping without `TEST_DATABASE_URL`.
-
-    The port was smaller than expected, because the driver matches `$1`-style placeholders against
-    argument ordinals exactly as pgx does — so no query needed rewriting for parameters. What did
-    change:
-    - **`timestamptz` → `timestamp` holding UTC `YYYY-MM-DD HH:MM:SS`.** The declared type is what
-      makes the driver return `time.Time`; the fixed-width UTC string is what makes `order by
-      created_at` and `expires_at > datetime('now')` mean what they say. `_time_format=datetime` and
-      `_timezone=UTC` on the DSN make Go write exactly the shape `datetime('now')` produces, so the
-      two sources of a timestamp are comparable.
-    - **`interval` has no equivalent.** `sessions.idle_ttl` is seconds as an integer, and the review
-      edit window travels as a SQLite date modifier string (`-1800 seconds`).
-    - **No `stddev_pop`.** The divisive and unified boards use the population formula written out,
-      guarded with `max(0.0, …)` because floating-point cancellation returns a tiny negative when
-      every score is identical, and `sqrt` of that is null.
-    - **`foreign_keys` is off by default in SQLite**, so every `on delete cascade` in the schema is
-      decoration without the pragma. It is set on the DSN alongside WAL, `busy_timeout` and
-      `_txlock=immediate`.
-
-    Taken while there was still no data: the tables were recreated rather than converted, same as
-    entry 45. What would reverse this: enough concurrent writers that one writer is a real limit, or
-    wanting the database on a different box from the audio files.

docs/later.md

@@ -21,59 +21,27 @@ Two things to remember when it happens:
 
 ## Lyrics with scaled autoscroll
 
-Fetch lyrics and scroll them in time with the audio. Designed and decided (decisions 45), not built.
+Fetch lyrics and scroll them in time with the audio.
 
-**Coverage, measured 2026-07-31** rather than assumed. An earlier version of this page guessed
-LRCLIB would miss nearly all Finnish music. It does not:
-
-| Search | Results | With `syncedLyrics` |
-|---|---|---|
-| Nightwish | 20 | 20 |
-| Eppu Normaali | 20 | 13 |
-| CMX | 15 | 12 |
-| Popeda | 20 | 8 |
-
-**LRCLIB** (`lrclib.net`) needs no API key. `/api/get` matches on artist, track and duration within
-±2 s and returns `syncedLyrics` — real LRC with `[mm:ss.xx]` per line — alongside `plainLyrics`;
-`/api/search?q=` is the looser fallback. Go's side is `net/http` and `encoding/json`, so the
-dependency budget survives, and it is treated exactly like ffmpeg and yt-dlp: a timeout, allowed to
-fail, never blocking anything.
-
-**Where it happens: at submission, as a suggestion.**
-
-- The worker attempts one automatic lookup after conversion, using whatever metadata exists.
-- The waiting page has a **Hae sanoitukset** button that re-queries with whatever is currently typed
-  in the title and artist fields. That is the answer for messy tags — `Sentenced   Noose` from a
-  YouTube upload will not match until the submitter fixes it, and the automatic attempt would
-  otherwise just look broken.
-- Neither ever overwrites text the submitter has typed. They can accept the suggestion, edit it, or
-  leave the field empty.
-
-**Storage:** one nullable `lyrics text` column on both `submissions` and `songs`, copied across at
-publish. LRC or plain is told apart by whether the first line starts with `[`, so no second column
-and no flag. **Nothing has launched, so this goes into `001_init.sql` rather than a migration 002.**
-
-**Lyrics stay editable after the song locks** — the lock exists so the thing people reviewed stops
-changing, and nobody reviewed the lyrics. It also means someone can paste them for an old song a
-year later, which is when this feature is most useful.
-
-**Playback:**
-
-- **Synced hit** → highlight the current line properly, driven by the transport's `timeupdate`.
-- **Plain hit or manual paste** → distribute lines evenly across `duration_seconds` and scroll the
-  block *continuously without highlighting a line*. Highlighting makes every second of drift read as
-  a bug, and drift is guaranteed — intros and outros alone break a uniform mapping.
+- **LRCLIB** (`lrclib.net`) is a community database with no API key, and its responses include
+  `syncedLyrics` — real LRC with `[mm:ss.xx]` per-line timestamps — alongside `plainLyrics`. Query by
+  track, artist and duration, all of which are already on the song row. So a decent share of songs
+  need no faked timing at all.
+- **Synced hit** → highlight the current line properly. **Plain hit or manual paste** → distribute
+  lines evenly across `duration_seconds` and scroll the block *continuously without highlighting a
+  line*. Highlighting makes every second of drift read as a bug, and drift is guaranteed — intros and
+  outros alone break a uniform mapping.
 - The Web Animations API does the whole thing including seeking: build the scroll animation with
   `duration_seconds`, `pause()` it, and bind `play`/`pause`/`seeked` on the audio element. No timers,
   no drift accumulation.
 - **Leave a nudge knob** — a ±10 s offset slider, remembered per song in `localStorage`. Uniform
   distribution models a song no real song obeys, and one drag while listening beats any heuristic.
-
-**Still open:** where the panel lives on the song page. That page's job is now *listen and write*,
-and a scrolling lyrics panel competes with the review textarea for both space and attention — a
-collapsed panel under the player is the starting guess, not a decision.
-
-Copyright posture is the same as the YouTube note: private app, ten people, written down
+- Storage: one nullable `lyrics text` column. LRC or plain — tell them apart by whether the first
+  line starts with `[`, so no second column and no flag. Fetched best-effort in the publish worker.
+- **Add a paste box to the submitter's edit form.** The genre list contains *Finnish*,
+  *Experimental* and *Just Plain Weird*; LRCLIB will miss nearly all of it, and for those songs the
+  textarea is the entire feature.
+- Copyright posture is the same as the YouTube note: private app, ten people, written down
   deliberately.
 
 ---
@@ -84,7 +52,7 @@ The constraint that shapes every idea: **E2B-class multimodal models are speech
 encoder targets ASR and spoken-audio QA. Music is out of distribution — genre calls are near
 coin-flips, "describe this track" produces beige copy, and singing over instrumentation is a worst
 case for ASR. Encoders also work in ~30 s windows, so a four-minute song is a chunk loop, and on CPU
-beside ffmpeg that is minutes per submission.
+beside Postgres and ffmpeg that is minutes per submission.
 
 So the ideas that use the model to be *correct* are the weak ones, and the idea that uses it to be
 *entertaining* is the strong one:

docs/spec.md

@@ -327,13 +327,12 @@ and the average.
 Always public, ignores the reveal rule. Minimum **3 reviews** for a song to qualify for any ranking;
 `min_reviews` is published, not hardcoded in a client.
 
-- Songs: Top 10 all-time, Bottom 10, Most Divisive (highest score spread), Most Unified (lowest),
+- Songs: Top 10 all-time, Bottom 10, Most Divisive (highest `stddev_pop`), Most Unified (lowest),
   Most Reviewed.
 - Reviewers: Harshest Critic (lowest average given), Most Generous, Most Active, Most Prolific
   Submitter.
-- SQL does all of it: `avg()`, `count()`, `HAVING count(*) >= 3`. Order and limit in SQL, never in
-  Go. SQLite has no `stddev_pop`, so the divisive/unified boards spell the population formula out —
-  see `stddevPop` in `stats.go`.
+- Postgres does all of it: `avg()`, `count()`, `stddev_pop()`, `HAVING count(*) >= 3`. Order and
+  limit in SQL, never in Go.
 - **Every leaderboard needs a deterministic tie-break** — `ORDER BY value DESC, review_count DESC,
   id ASC`. Ties are common in a ten-person club, and without one the list reshuffles between reloads
   for no reason.
@@ -386,7 +385,7 @@ func requireAdmin(next http.Handler) http.Handler {
 ```
 
 No bcrypt here: hashing protects *stored* passwords against a database leak, and this one lives in
-the env file already. The constant-time compare is the part that
+the env file next to the Postgres password already. The constant-time compare is the part that
 matters. **Fatal at startup if `ADMIN_PASSWORD` is unset** — an admin panel that silently opens is
 worse than one that will not boot.
 
@@ -520,7 +519,7 @@ the first endpoint is one line over a data function that already exists.
 - `snake_case` field names, matching the SQL columns.
 - Timestamps are RFC 3339 UTC strings (`2026-08-01T10:00:00Z`). Never preformatted, never a locale
   string, never a unix int.
-- Ids are JSON numbers (SQLite rowids, safely under 2⁵³).
+- Ids are JSON numbers (`bigserial`, safely under 2⁵³).
 - Nullable fields are present and `null`. **No `omitempty`** — a stable key set is worth more than a
   few bytes, and "missing" versus "null" is a distinction clients get wrong.
 - Scores are integers, averages are floats.
@@ -643,41 +642,33 @@ reason the count-based lists stay until they are proven useless.
 
 ## 9. Data model
 
-Ids are `integer primary key autoincrement` — never reused, because `storage/audio/<song_id>.ogg` is
-named after one. Session tokens stay random — those are secrets, ids are not, and enumerable ids are
-not a threat model for a login-walled app for ten friends.
-
-Timestamps are declared `timestamp` and hold UTC `YYYY-MM-DD HH:MM:SS`: the declared type is what
-makes the driver return `time.Time`, and the fixed-width UTC string is what makes ordering and
-comparison against `datetime('now')` mean what they say. Booleans are `integer`, 0 or 1.
+Ids are `bigserial`. Session tokens stay random — those are secrets, ids are not, and enumerable ids
+are not a threat model for a login-walled app for ten friends.
 
 ```sql
-users       (id pk, name, email unique, password_hash, avatar, banned, created_at)
-sessions    (token pk, user_id fk not null, idle_ttl integer not null,   -- seconds
+users       (id bigserial pk, name, email unique, password_hash, avatar, banned, created_at)
+sessions    (token pk, user_id fk not null, idle_ttl interval not null,
              expires_at, created_at)          -- token: 32 random bytes, hex
-songs       (id pk, title, artist, genre, description, lyrics, audio_file,
-             duration_seconds integer,
+songs       (id bigserial pk, title, artist, genre, description, audio_file,
+             duration_seconds int,
              source_url,          -- nullable, for YouTube submissions
              submitted_by fk users, created_at)
-submissions (id pk, user_id fk not null,
+submissions (id bigserial pk, user_id fk not null,
              status text not null default 'queued',   -- queued|downloading|converting|ready|failed
              status_msg text,
              source_url, tmp_path,
-             title, artist, genre, description, lyrics,
+             title, artist, genre, description,
              created_at)
-reviews     (id pk, song_id fk on delete cascade, reviewer_id fk users,
-             score integer, text, created_at, updated_at,
+reviews     (id bigserial pk, song_id fk on delete cascade, reviewer_id fk users,
+             score int, text, created_at, updated_at,
              unique (song_id, reviewer_id))
-invites     (id pk, code unique, is_valid integer, created_at)
-reports     (id pk, user_id fk not null, body text not null,
+invites     (id bigserial pk, code unique, is_valid bool, created_at)
+reports     (id bigserial pk, user_id fk not null, body text not null,
              page text, user_agent text,
-             resolved_at timestamp,   -- null = open
+             resolved_at timestamptz,   -- null = open
              created_at)
 ```
 
-`foreign_keys` is off by default in SQLite, so the cascades above only exist because the pragma is
-set on every connection — see `openDB` in `main.go`.
-
 No `role` column (§6). No `status` on `songs` (§4).
 
 Also: `CHECK (score BETWEEN 1 AND 100)`, `NOT NULL` on everything required, an index on
@@ -728,8 +719,8 @@ Everything else is forms and `INSERT`s. No framework, no fixtures beyond a test
 Each step leaves something runnable. Registration needs an invite and invites come from the admin
 panel, so the admin surface comes first — before a single member can exist.
 
-1. **Skeleton** — `main.go`, embedded migrations at startup, `database/sql`, slog, Docker Compose,
-   the two listeners.
+1. **Skeleton** — `main.go`, embedded migrations at startup, pgxpool, slog, Docker Compose, the two
+   listeners.
 2. **Admin, invites, auth** — Basic Auth listener, mint an invite, register, log in, sessions, ban.
 3. **Submission pipeline, upload path only** — submit, convert, waiting page, publish. No yt-dlp yet,
    so the hard parts (worker, publish transaction, restart recovery) are proven without a network

go.mod

@@ -1,20 +1,14 @@
 module git.kessinen.com/kessinen/levyraati26-go
 
-go 1.25.0
+go 1.24
+
+require github.com/jackc/pgx/v5 v5.7.2
 
 require (
-	golang.org/x/crypto v0.32.0
-	modernc.org/sqlite v1.54.0
-)
-
-require (
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/ncruces/go-strftime v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	golang.org/x/sys v0.46.0 // indirect
-	modernc.org/libc v1.74.1 // indirect
-	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.11.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )

go.sum

@@ -1,10 +1,6 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -13,14 +9,8 @@ github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI=
 github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
-github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -30,21 +20,9 @@ golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
 golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
-golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/libc v1.74.1 h1:bdR4VTKFMC4966QSNZ05XLGI/VwzVa2kTUX51Dm0riQ=
-modernc.org/libc v1.74.1/go.mod h1:uH4t5bOx3G3g9Xcmj10YKlTcVISlRDwv8VoQJG9n8Os=
-modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
-modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
-modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-modernc.org/sqlite v1.54.0 h1:JCxR4qwkJvOaqAoYcgDoO25Nc+ROg6EJ2LfBVzdrgog=
-modernc.org/sqlite v1.54.0/go.mod h1:4ntCLuNmnH8+GNqjka1wNg7KJd5/Hi5FYp8K+XQ7GZw=

lyrics.go

@@ -1,254 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log/slog"
-	"net/http"
-	"net/url"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// LRCLIB is a community lyrics database with no API key. It is treated exactly like ffmpeg and
-// yt-dlp: an outside thing with a timeout, allowed to fail, never blocking anything.
-// A var rather than a const so tests can point it at a local server instead of the real service.
-var lrclibBase = "https://lrclib.net/api"
-
-const (
-	// Identifies the client and nothing else. No URL, no host, no version: this app is private,
-	// and a third party's logs are not the place to learn where it lives.
-	lrclibAgent  = "levyraati"
-	lyricsTimout = 10 * time.Second
-)
-
-type lrclibResult struct {
-	TrackName    string  `json:"trackName"`
-	ArtistName   string  `json:"artistName"`
-	Duration     float64 `json:"duration"`
-	Instrumental bool    `json:"instrumental"`
-	PlainLyrics  string  `json:"plainLyrics"`
-	SyncedLyrics string  `json:"syncedLyrics"`
-}
-
-// best returns the synced version when there is one — timestamps are what make the scroll possible
-// later, and plain text is the fallback rather than the goal.
-func (r lrclibResult) best() string {
-	if r.SyncedLyrics != "" {
-		return r.SyncedLyrics
-	}
-	return r.PlainLyrics
-}
-
-var lyricsClient = &http.Client{Timeout: lyricsTimout}
-
-// LRC timestamps are stored, because the highlight needs them, and stripped for reading, because
-// nobody wants to read [00:11.74] at the start of every line.
-var lrcStamp = regexp.MustCompile(`^(\[\d{1,2}:\d{2}(?:[.:]\d{1,3})?\]\s*)+`)
-
-// A line of synced lyrics: the seconds it starts at, and the words.
-type lyricLine struct {
-	At   float64
-	Text string
-}
-
-var lrcOne = regexp.MustCompile(`\[(\d{1,2}):(\d{2})(?:[.:](\d{1,3}))?\]`)
-
-// parseLRC returns nil for plain text, which is the signal to scroll continuously instead of
-// highlighting: a line-by-line highlight on guessed timings makes every second of drift read as a
-// bug.
-func parseLRC(s string) []lyricLine {
-	if !strings.HasPrefix(strings.TrimSpace(s), "[") {
-		return nil
-	}
-	var out []lyricLine
-	for _, raw := range strings.Split(s, "\n") {
-		stamps := lrcOne.FindAllStringSubmatch(raw, -1)
-		if len(stamps) == 0 {
-			continue
-		}
-		text := strings.TrimSpace(lrcStamp.ReplaceAllString(raw, ""))
-		// One line can carry several timestamps when a refrain repeats.
-		for _, m := range stamps {
-			min, _ := strconv.Atoi(m[1])
-			sec, _ := strconv.Atoi(m[2])
-			at := float64(min*60 + sec)
-			if m[3] != "" {
-				frac, _ := strconv.Atoi(m[3])
-				switch len(m[3]) {
-				case 1:
-					at += float64(frac) / 10
-				case 2:
-					at += float64(frac) / 100
-				default:
-					at += float64(frac) / 1000
-				}
-			}
-			out = append(out, lyricLine{At: at, Text: text})
-		}
-	}
-	sort.Slice(out, func(i, j int) bool { return out[i].At < out[j].At })
-	return out
-}
-
-func stripLRC(s string) string {
-	if !strings.HasPrefix(strings.TrimSpace(s), "[") {
-		return s
-	}
-	lines := strings.Split(s, "\n")
-	for i, line := range lines {
-		lines[i] = strings.TrimRight(lrcStamp.ReplaceAllString(line, ""), " ")
-	}
-	return strings.Join(lines, "\n")
-}
-
-func lrclibGet(ctx context.Context, path string, q url.Values) ([]byte, error) {
-	ctx, cancel := context.WithTimeout(ctx, lyricsTimout)
-	defer cancel()
-
-	req, err := http.NewRequestWithContext(ctx, "GET", lrclibBase+path+"?"+q.Encode(), nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("User-Agent", lrclibAgent)
-	resp, err := lyricsClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("lrclib %s: %s", path, resp.Status)
-	}
-	return io.ReadAll(io.LimitReader(resp.Body, 1<<20))
-}
-
-// fetchLyrics tries the exact match first — artist, track and duration within LRCLIB's ±2 s — and
-// falls back to a search, which is what saves songs whose tags are close but not exact. Returns an
-// empty string when nothing matches, which is a normal outcome rather than an error.
-func fetchLyrics(ctx context.Context, title, artist string, seconds int) (string, error) {
-	title, artist = strings.TrimSpace(title), strings.TrimSpace(artist)
-	if title == "" {
-		return "", nil // nothing to match on; the submitter has not named it yet
-	}
-
-	if artist != "" && seconds > 0 {
-		body, err := lrclibGet(ctx, "/get", url.Values{
-			"track_name":  {title},
-			"artist_name": {artist},
-			"duration":    {fmt.Sprint(seconds)},
-		})
-		if err == nil {
-			var res lrclibResult
-			if json.Unmarshal(body, &res) == nil && !res.Instrumental {
-				if l := res.best(); l != "" {
-					return l, nil
-				}
-			}
-		}
-	}
-
-	// Looser: let LRCLIB do the matching on a free-text query.
-	q := title
-	if artist != "" {
-		q = artist + " " + title
-	}
-	body, err := lrclibGet(ctx, "/search", url.Values{"q": {q}})
-	if err != nil {
-		return "", err
-	}
-	var results []lrclibResult
-	if err := json.Unmarshal(body, &results); err != nil {
-		return "", err
-	}
-	for _, res := range results {
-		if res.Instrumental {
-			continue
-		}
-		// A duration within 5 s is the strongest signal we have that it is the same recording.
-		if seconds > 0 && res.Duration > 0 && abs(int(res.Duration)-seconds) > 5 {
-			continue
-		}
-		if l := res.best(); l != "" {
-			return l, nil
-		}
-	}
-	return "", nil
-}
-
-func abs(n int) int {
-	if n < 0 {
-		return -n
-	}
-	return n
-}
-
-// --- the button on the waiting page ---
-
-// Suggests lyrics for whatever title and artist are currently typed, and never overwrites what the
-// submitter has already put in the field — the response fills the textarea, and they can accept it,
-// edit it or clear it.
-func (a *app) suggestLyrics(w http.ResponseWriter, r *http.Request) {
-	s := a.loadSubmission(w, r)
-	if s == nil {
-		return
-	}
-	title := clean(r.FormValue("title"), maxTitle)
-	artist := clean(r.FormValue("artist"), maxArtist)
-	if title == "" {
-		title, artist = s.Title, s.Artist
-	}
-
-	seconds := 0
-	if meta, err := probe(r.Context(), s.TmpPath); err == nil {
-		seconds = int(meta.Duration.Seconds())
-	}
-
-	lyrics, err := fetchLyrics(r.Context(), title, artist, seconds)
-	if err != nil {
-		slog.Warn("lyrics lookup", "ctx", "submissions", "error", err, "submission", s.ID)
-	}
-
-	// Keep whatever the submitter already typed: a suggestion never overwrites their own words.
-	if existing := cleanLyrics(r.FormValue("lyrics")); existing != "" {
-		lyrics = existing
-	}
-
-	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	data := map[string]any{
-		"ID": s.ID, "Lyrics": lyrics, "Found": lyrics != "", "Searched": true,
-	}
-	if err := pages["submission.html"].ExecuteTemplate(w, "lyricsfield", data); err != nil {
-		slog.Error("render lyrics field", "ctx", "submissions", "error", err)
-	}
-}
-
-// Called from the conversion worker: one automatic attempt, best effort, and only when the
-// submitter has not already pasted something.
-func (a *app) autoFetchLyrics(ctx context.Context, subID int64, title, artist string, seconds int) {
-	if title == "" {
-		return
-	}
-	lyrics, err := fetchLyrics(ctx, title, artist, seconds)
-	if err != nil {
-		slog.Warn("lyrics lookup", "ctx", "submissions", "error", err, "submission", subID)
-		return
-	}
-	if lyrics == "" {
-		return
-	}
-	res, err := a.db.ExecContext(ctx,
-		`update submissions set lyrics = $2 where id = $1 and lyrics is null`,
-		subID, cleanLyrics(lyrics))
-	if err != nil {
-		slog.Error("save lyrics", "ctx", "submissions", "error", err, "submission", subID)
-		return
-	}
-	if affected(res) > 0 {
-		slog.Info("lyrics found", "ctx", "submissions", "submission", subID)
-	}
-}

lyrics_test.go

@@ -1,112 +0,0 @@
-package main
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-)
-
-// Line breaks are the content here — LRC timestamps are per line — so cleanLyrics must not do what
-// clean() does to a title.
-func TestCleanLyrics(t *testing.T) {
-	got := cleanLyrics("  [00:11.74] Rivi yksi\r\n[00:13.99] Rivi\x07 kaksi\r\n\n")
-	want := "[00:11.74] Rivi yksi\n[00:13.99] Rivi kaksi"
-	if got != want {
-		t.Fatalf("cleanLyrics gave %q, want %q", got, want)
-	}
-	if n := len([]rune(cleanLyrics(strings.Repeat("a", maxLyrics+500)))); n != maxLyrics {
-		t.Fatalf("truncated to %d runes, want %d", n, maxLyrics)
-	}
-}
-
-// Plain text must parse to nil: that is the signal to scroll continuously rather than highlight
-// lines on timings nobody measured.
-func TestParseLRC(t *testing.T) {
-	if got := parseLRC("Ihan tavallista tekstiä\ntoinen rivi"); got != nil {
-		t.Fatalf("plain text parsed as synced: %v", got)
-	}
-
-	lines := parseLRC("[00:11.74] Ensimmäinen\n[01:02] Toinen\n[00:05.5] Aikaisempi\nrivi ilman aikaa")
-	if len(lines) != 3 {
-		t.Fatalf("got %d lines, want 3 — untimed lines are dropped", len(lines))
-	}
-	// Sorted by time, whatever order the file had.
-	if lines[0].At != 5.5 || lines[0].Text != "Aikaisempi" {
-		t.Fatalf("first line is %+v, want 5.5s Aikaisempi", lines[0])
-	}
-	if lines[1].At != 11.74 || lines[2].At != 62 {
-		t.Fatalf("timestamps parsed as %v and %v, want 11.74 and 62", lines[1].At, lines[2].At)
-	}
-
-	// A refrain can carry several timestamps on one line, and each is its own occurrence.
-	rep := parseLRC("[00:10.00][01:10.00] Kertosäe")
-	if len(rep) != 2 || rep[0].At != 10 || rep[1].At != 70 {
-		t.Fatalf("repeated stamps gave %+v, want two occurrences", rep)
-	}
-}
-
-// The lookup is a suggestion, so "nothing found" is a normal answer rather than an error, and a
-// synced hit always beats a plain one.
-func TestFetchLyrics(t *testing.T) {
-	var lastPath string
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		lastPath = r.URL.Path
-		w.Header().Set("Content-Type", "application/json")
-		switch {
-		case r.URL.Path == "/get" && r.URL.Query().Get("track_name") == "Paranoid":
-			w.Write([]byte(`{"trackName":"Paranoid","artistName":"Black Sabbath","duration":168,
-			                 "plainLyrics":"plain version","syncedLyrics":"[00:11.74] synced version"}`))
-		case r.URL.Path == "/get":
-			http.Error(w, `{"code":404}`, http.StatusNotFound)
-		case r.URL.Path == "/search" && strings.Contains(r.URL.Query().Get("q"), "Soittorasia"):
-			// An instrumental and a wrong-length take come first: both must be skipped.
-			w.Write([]byte(`[{"trackName":"Soittorasia","duration":200,"instrumental":true,
-			                  "plainLyrics":"","syncedLyrics":"[00:01.00] should be skipped"},
-			                 {"trackName":"Soittorasia","duration":600,
-			                  "plainLyrics":"wrong length take"},
-			                 {"trackName":"Soittorasia","duration":201,
-			                  "plainLyrics":"right one"}]`))
-		default:
-			w.Write([]byte(`[]`))
-		}
-	}))
-	defer srv.Close()
-
-	old := lrclibBase
-	lrclibBase = srv.URL
-	defer func() { lrclibBase = old }()
-
-	ctx := context.Background()
-
-	got, err := fetchLyrics(ctx, "Paranoid", "Black Sabbath", 168)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "[00:11.74] synced version" {
-		t.Fatalf("exact match returned %q, want the synced version", got)
-	}
-
-	got, err = fetchLyrics(ctx, "Soittorasia", "Joku", 200)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "right one" {
-		t.Fatalf("search fallback returned %q — instrumental and wrong-length takes must be skipped", got)
-	}
-	if lastPath != "/search" {
-		t.Fatalf("last request was %s, want the search fallback", lastPath)
-	}
-
-	// Nothing found is not an error: the submitter simply types their own.
-	got, err = fetchLyrics(ctx, "Ei olemassa", "Kukaan", 100)
-	if err != nil || got != "" {
-		t.Fatalf("miss returned %q, %v — want empty and no error", got, err)
-	}
-
-	// No title means nothing to match on, and no request at all.
-	if got, err := fetchLyrics(ctx, "", "Artisti", 100); err != nil || got != "" {
-		t.Fatalf("empty title returned %q, %v", got, err)
-	}
-}

main.go

@@ -3,22 +3,22 @@ package main
 import (
 	"context"
 	"crypto/subtle"
-	"database/sql"
 	"fmt"
 	"log/slog"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
-	_ "modernc.org/sqlite"
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 // Set at build time with -ldflags "-X main.version=…". A local `go build` honestly says dev.
 var version = "dev"
 
 type config struct {
-	dbPath        string
+	databaseURL   string
 	adminUser     string
 	adminPass     string
 	addr          string
@@ -32,6 +32,7 @@ type config struct {
 
 func loadConfig() config {
 	c := config{
+		databaseURL:   os.Getenv("DATABASE_URL"),
 		adminUser:     env("ADMIN_USER", "admin"),
 		adminPass:     os.Getenv("ADMIN_PASSWORD"),
 		addr:          env("ADDR", ":8080"),
@@ -40,8 +41,9 @@ func loadConfig() config {
 		secureCookies: env("SECURE_COOKIES", "true") != "false",
 		publicURL:     strings.TrimRight(os.Getenv("PUBLIC_URL"), "/"),
 	}
-	// The database lives beside the audio, so one volume is the whole backup.
-	c.dbPath = env("DB_PATH", filepath.Join(c.storageDir, "levyraati.db"))
+	if c.databaseURL == "" {
+		fatal("DATABASE_URL is not set")
+	}
 	// An admin panel that silently opens is worse than one that won't boot.
 	if c.adminPass == "" {
 		fatal("ADMIN_PASSWORD is not set")
@@ -63,67 +65,49 @@ func fatal(msg string, args ...any) {
 
 type app struct {
 	cfg    config
-	db     *sql.DB
+	pool   *pgxpool.Pool
 	logins limiter // zero value is ready to use
 }
 
-// openDB opens the file with the pragmas the schema assumes. foreign_keys is off by default in
-// SQLite, so without it every `on delete cascade` is decoration; WAL plus busy_timeout is what lets
-// a conversion goroutine write while a request reads; _txlock=immediate takes the write lock at
-// BEGIN rather than failing partway through a transaction that started out reading.
-//
-// _time_format and _timezone make Go write timestamps in exactly the shape datetime('now')
-// produces, so the two sources of a timestamp sort and compare against each other.
-func openDB(path string) (*sql.DB, error) {
-	return sql.Open("sqlite", "file:"+path+"?"+strings.Join([]string{
-		"_pragma=busy_timeout(5000)",
-		"_pragma=journal_mode(WAL)",
-		"_pragma=foreign_keys(1)",
-		"_pragma=synchronous(NORMAL)",
-		"_time_format=datetime",
-		"_timezone=UTC",
-		"_txlock=immediate",
-	}, "&"))
-}
-
-// database/sql splits the row count off into a second return value. Every caller here only asks
-// whether the statement matched anything, and a driver that could not report a count would already
-// have failed at Exec.
-func affected(res sql.Result) int64 {
-	n, _ := res.RowsAffected()
-	return n
-}
-
 func main() {
 	slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
 	slog.Info("starting", "ctx", "startup", "version", version)
 	cfg := loadConfig()
 
 	ctx := context.Background()
-	// The storage directories come first: the database file lives in one of them.
+	pool, err := pgxpool.New(ctx, cfg.databaseURL)
+	if err != nil {
+		fatal("database connect", "error", err)
+	}
+	defer pool.Close()
+
+	// Wait for Postgres rather than crash-looping past a healthcheck that hasn't gone green yet.
+	for i := 0; ; i++ {
+		pingCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
+		err = pool.Ping(pingCtx)
+		cancel()
+		if err == nil {
+			break
+		}
+		if i == 10 {
+			fatal("database unreachable", "error", err)
+		}
+		time.Sleep(time.Second)
+	}
+
+	if err := migrate(ctx, pool); err != nil {
+		fatal("migrations", "error", err)
+	}
+	if err := sweep(ctx, pool); err != nil {
+		fatal("startup sweep", "error", err)
+	}
 	for _, dir := range []string{"audio", "tmp", "avatars"} {
 		if err := os.MkdirAll(filepath.Join(cfg.storageDir, dir), 0o755); err != nil {
 			fatal("storage dir", "error", err, "dir", dir)
 		}
 	}
 
-	db, err := openDB(cfg.dbPath)
-	if err != nil {
-		fatal("database open", "error", err)
-	}
-	defer db.Close()
-	if err := db.PingContext(ctx); err != nil {
-		fatal("database unreachable", "error", err, "path", cfg.dbPath)
-	}
-
-	if err := migrate(ctx, db); err != nil {
-		fatal("migrations", "error", err)
-	}
-	if err := sweep(ctx, db); err != nil {
-		fatal("startup sweep", "error", err)
-	}
-
-	a := &app{cfg: cfg, db: db}
+	a := &app{cfg: cfg, pool: pool}
 
 	// ponytail: two listeners, one process. Admin is loopback-only — reach it over an SSH tunnel
 	// or the reverse proxy. A separate binary would need its own deploy and would race the
@@ -143,7 +127,7 @@ func (a *app) memberMux() *http.ServeMux {
 	mux.Handle("GET /static/", http.FileServerFS(assetFS))
 
 	mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {
-		if err := a.db.PingContext(r.Context()); err != nil {
+		if err := a.pool.Ping(r.Context()); err != nil {
 			http.Error(w, "db down", http.StatusServiceUnavailable)
 			return
 		}
@@ -162,7 +146,6 @@ func (a *app) memberMux() *http.ServeMux {
 	mux.HandleFunc("GET /songs/{id}", a.requireMember(a.songPage))
 	mux.HandleFunc("POST /songs/{id}", a.requireMember(a.editSong))
 	mux.HandleFunc("POST /songs/{id}/delete", a.requireMember(a.deleteSong))
-	mux.HandleFunc("POST /songs/{id}/lyrics", a.requireMember(a.editLyrics))
 	mux.HandleFunc("GET /audio/{id}", a.requireMember(a.audio))
 	mux.HandleFunc("GET /avatars/{id}", a.avatar) // public: avatars are not secret
 
@@ -184,7 +167,6 @@ func (a *app) memberMux() *http.ServeMux {
 	mux.HandleFunc("GET /submit/{id}/status", a.requireMember(a.submissionStatus))
 	mux.HandleFunc("POST /submit/{id}", a.requireMember(a.saveSubmission))
 	mux.HandleFunc("POST /submit/{id}/publish", a.requireMember(a.publish))
-	mux.HandleFunc("POST /submit/{id}/lyrics", a.requireMember(a.suggestLyrics))
 	mux.HandleFunc("POST /submit/{id}/retry", a.requireMember(a.retry))
 	mux.HandleFunc("POST /submit/{id}/discard", a.requireMember(a.discard))
 	return mux
@@ -211,7 +193,7 @@ func (a *app) adminMux() *http.ServeMux {
 // (close the browser). Add a cookie session if a second admin ever needs one.
 //
 // No bcrypt: hashing protects stored passwords against a database leak, and this one lives in the
-// env file already. The constant-time compare is the part that matters.
+// env file next to the Postgres password already. The constant-time compare is the part that matters.
 func (a *app) requireAdmin(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		u, p, ok := r.BasicAuth()

main_test.go

@@ -4,7 +4,10 @@ import (
 	"context"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
+
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 func TestRequireAdmin(t *testing.T) {
@@ -37,19 +40,33 @@ func TestRequireAdmin(t *testing.T) {
 	}
 }
 
+// Set TEST_DATABASE_URL to run this against a throwaway database.
 func TestMigrateIsIdempotent(t *testing.T) {
-	ctx := context.Background()
-	a := testApp(t) // already migrated once
-
-	if err := migrate(ctx, a.db); err != nil {
-		t.Fatalf("second migrate: %v", err)
+	url := os.Getenv("TEST_DATABASE_URL")
+	if url == "" {
+		t.Skip("TEST_DATABASE_URL not set")
 	}
-	if err := sweep(ctx, a.db); err != nil {
+	ctx := context.Background()
+	pool, err := pgxpool.New(ctx, url)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer pool.Close()
+
+	if _, err := pool.Exec(ctx, `drop schema public cascade; create schema public`); err != nil {
+		t.Fatal(err)
+	}
+	for i := range 2 {
+		if err := migrate(ctx, pool); err != nil {
+			t.Fatalf("migrate run %d: %v", i+1, err)
+		}
+	}
+	if err := sweep(ctx, pool); err != nil {
 		t.Fatalf("sweep: %v", err)
 	}
 
 	var n int
-	if err := a.db.QueryRowContext(ctx, `select count(*) from schema_migrations`).Scan(&n); err != nil {
+	if err := pool.QueryRow(ctx, `select count(*) from schema_migrations`).Scan(&n); err != nil {
 		t.Fatal(err)
 	}
 	if n != 1 {

media.go

@@ -96,29 +96,6 @@ func clean(s string, max int) string {
 	return s
 }
 
-const maxLyrics = 20000
-
-// Lyrics are the one field where line breaks carry meaning — LRC timestamps are per line — so they
-// survive, and only the other control characters go.
-func cleanLyrics(s string) string {
-	s = strings.ReplaceAll(s, "\r\n", "\n")
-	s = strings.ReplaceAll(s, "\r", "\n")
-	s = strings.Map(func(r rune) rune {
-		if r == '\n' || r == '\t' {
-			return r
-		}
-		if r < 0x20 || r == 0x7f {
-			return -1
-		}
-		return r
-	}, s)
-	s = strings.TrimSpace(s)
-	if r := []rune(s); len(r) > maxLyrics {
-		s = strings.TrimSpace(string(r[:maxLyrics]))
-	}
-	return s
-}
-
 // Hosts yt-dlp is allowed to see. Validated before the URL goes anywhere near a subprocess
 // argument list — and it never goes through a shell.
 var allowedHosts = map[string]bool{

migrate.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"context"
-	"database/sql"
 	"embed"
 	"fmt"
 	"log/slog"
 	"sort"
+
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 //go:embed migrations/*.sql
@@ -14,17 +15,17 @@ var migrationFS embed.FS
 
 // migrate applies every migrations/*.sql not yet recorded, in filename order, each in its own
 // transaction. Applied names are the record — a file that changes after it ran is not re-applied.
-func migrate(ctx context.Context, db *sql.DB) error {
-	_, err := db.ExecContext(ctx, `create table if not exists schema_migrations (
+func migrate(ctx context.Context, pool *pgxpool.Pool) error {
+	_, err := pool.Exec(ctx, `create table if not exists schema_migrations (
 		name       text primary key,
-		applied_at timestamp not null default (datetime('now'))
+		applied_at timestamptz not null default now()
 	)`)
 	if err != nil {
 		return fmt.Errorf("create schema_migrations: %w", err)
 	}
 
 	applied := map[string]bool{}
-	rows, err := db.QueryContext(ctx, `select name from schema_migrations`)
+	rows, err := pool.Query(ctx, `select name from schema_migrations`)
 	if err != nil {
 		return fmt.Errorf("read schema_migrations: %w", err)
 	}
@@ -59,19 +60,19 @@ func migrate(ctx context.Context, db *sql.DB) error {
 		if err != nil {
 			return err
 		}
-		tx, err := db.BeginTx(ctx, nil)
+		tx, err := pool.Begin(ctx)
 		if err != nil {
 			return err
 		}
-		if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
-			tx.Rollback()
+		if _, err := tx.Exec(ctx, string(sql)); err != nil {
+			tx.Rollback(ctx)
 			return fmt.Errorf("migration %s: %w", name, err)
 		}
-		if _, err := tx.ExecContext(ctx, `insert into schema_migrations (name) values ($1)`, name); err != nil {
-			tx.Rollback()
+		if _, err := tx.Exec(ctx, `insert into schema_migrations (name) values ($1)`, name); err != nil {
+			tx.Rollback(ctx)
 			return err
 		}
-		if err := tx.Commit(); err != nil {
+		if err := tx.Commit(ctx); err != nil {
 			return fmt.Errorf("migration %s: %w", name, err)
 		}
 		slog.Info("migration applied", "ctx", "startup", "name", name)
@@ -81,31 +82,29 @@ func migrate(ctx context.Context, db *sql.DB) error {
 
 // sweep runs the startup cleanup from docs/spec.md §4.6. An in-process conversion goroutine dies
 // with the process, so without this those rows say "converting" forever.
-func sweep(ctx context.Context, db *sql.DB) error {
-	res, err := db.ExecContext(ctx, `update submissions
+func sweep(ctx context.Context, pool *pgxpool.Pool) error {
+	tag, err := pool.Exec(ctx, `update submissions
 		set status = 'failed', status_msg = 'interrupted by restart'
 		where status in ('queued', 'downloading', 'converting')`)
 	if err != nil {
 		return err
 	}
-	if n := affected(res); n > 0 {
+	if n := tag.RowsAffected(); n > 0 {
 		slog.Warn("submissions interrupted by restart", "ctx", "startup", "count", n)
 	}
 
 	// ponytail: temp files of swept submissions are unlinked with the row in step 3, once the
 	// pipeline exists and there is something to unlink.
-	if _, err := db.ExecContext(ctx,
-		`delete from submissions where created_at < datetime('now', '-7 days')`); err != nil {
+	if _, err := pool.Exec(ctx,
+		`delete from submissions where created_at < now() - interval '7 days'`); err != nil {
 		return err
 	}
-	if _, err := db.ExecContext(ctx,
-		`delete from sessions where expires_at < datetime('now')`); err != nil {
+	if _, err := pool.Exec(ctx, `delete from sessions where expires_at < now()`); err != nil {
 		return err
 	}
 
 	var failed int
-	err = db.QueryRowContext(ctx,
-		`select count(*) from submissions where status = 'failed'`).Scan(&failed)
+	err = pool.QueryRow(ctx, `select count(*) from submissions where status = 'failed'`).Scan(&failed)
 	if err != nil {
 		return err
 	}

migrations/001_init.sql

@@ -1,55 +1,48 @@
--- Timestamps are declared `timestamp` and hold UTC 'YYYY-MM-DD HH:MM:SS': the declared type is what
--- makes the driver hand them back as time.Time, and a fixed-width UTC string is what makes
--- `order by created_at` and `expires_at > datetime('now')` mean what they say.
-
 create table users (
-    id            integer   primary key autoincrement,
+    id            bigserial primary key,
     name          text        not null,
     email         text        not null unique,
     password_hash text        not null,
     avatar        text,
-    banned        integer   not null default 0,
-    created_at    timestamp not null default (datetime('now'))
+    banned        boolean     not null default false,
+    created_at    timestamptz not null default now()
 );
 
 create table sessions (
     token      text        primary key,
-    user_id    integer   not null references users (id) on delete cascade,
-    idle_ttl   integer   not null, -- seconds; SQLite has no interval type
-    expires_at timestamp not null,
-    created_at timestamp not null default (datetime('now'))
+    user_id    bigint      not null references users (id) on delete cascade,
+    idle_ttl   interval    not null,
+    expires_at timestamptz not null,
+    created_at timestamptz not null default now()
 );
 
-create index sessions_user on sessions (user_id);
+create index on sessions (user_id);
 
 create table invites (
-    id         integer   primary key autoincrement,
+    id         bigserial   primary key,
     code       text        not null unique,
-    is_valid   integer   not null default 1,
-    created_at timestamp not null default (datetime('now'))
+    is_valid   boolean     not null default true,
+    created_at timestamptz not null default now()
 );
 
 create table songs (
-    id               integer   primary key autoincrement,
+    id               bigserial   primary key,
     title            text        not null,
     artist           text        not null,
     genre            text        not null,
     description      text,
-    -- LRC or plain text, told apart by whether the first line starts with '['. Not covered by the
-    -- lock: nobody reviewed the lyrics.
-    lyrics           text,
     audio_file       text        not null,
     duration_seconds integer     not null,
     source_url       text,
-    submitted_by     integer   not null references users (id),
-    created_at       timestamp not null default (datetime('now'))
+    submitted_by     bigint      not null references users (id),
+    created_at       timestamptz not null default now()
 );
 
-create index songs_created_at on songs (created_at desc);
+create index on songs (created_at desc);
 
 create table submissions (
-    id          integer   primary key autoincrement,
-    user_id     integer   not null references users (id) on delete cascade,
+    id          bigserial   primary key,
+    user_id     bigint      not null references users (id) on delete cascade,
     status      text        not null default 'queued',
     status_msg  text,
     source_url  text,
@@ -58,38 +51,37 @@ create table submissions (
     artist      text,
     genre       text,
     description text,
-    lyrics      text,
-    created_at  timestamp not null default (datetime('now')),
+    created_at  timestamptz not null default now(),
     constraint submissions_status check (
         status in ('queued', 'downloading', 'converting', 'ready', 'failed')
     )
 );
 
 -- The submission quota (5 per rolling 24h, failures excluded) reads this.
-create index submissions_user_created on submissions (user_id, created_at desc);
+create index on submissions (user_id, created_at desc);
 
 create table reviews (
-    id          integer   primary key autoincrement,
-    song_id     integer   not null references songs (id) on delete cascade,
-    reviewer_id integer   not null references users (id),
+    id          bigserial   primary key,
+    song_id     bigint      not null references songs (id) on delete cascade,
+    reviewer_id bigint      not null references users (id),
     score       integer     not null check (score between 1 and 100),
     text        text        not null,
-    created_at  timestamp not null default (datetime('now')),
-    updated_at  timestamp not null default (datetime('now')),
+    created_at  timestamptz not null default now(),
+    updated_at  timestamptz not null default now(),
     unique (song_id, reviewer_id)
 );
 
-create index reviews_song on reviews (song_id);
+create index on reviews (song_id);
 
 -- The queue asks "songs this member has not reviewed" — that lookup is by reviewer.
-create index reviews_reviewer_song on reviews (reviewer_id, song_id);
+create index on reviews (reviewer_id, song_id);
 
 create table reports (
-    id          integer   primary key autoincrement,
-    user_id     integer   not null references users (id) on delete cascade,
+    id          bigserial   primary key,
+    user_id     bigint      not null references users (id) on delete cascade,
     body        text        not null,
     page        text,
     user_agent  text,
-    resolved_at timestamp,
-    created_at  timestamp not null default (datetime('now'))
+    resolved_at timestamptz,
+    created_at  timestamptz not null default now()
 );

profile.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"database/sql"
 	"errors"
 	"io"
 	"log/slog"
@@ -13,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/jackc/pgx/v5"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -47,12 +47,12 @@ func (a *app) avatarPath(userID int64) string {
 // per-song opinion is gated, whole-history aggregate is public.
 func (a *app) profile(ctx context.Context, viewerID, userID int64) (*profileView, error) {
 	var p profileView
-	err := a.db.QueryRowContext(ctx, `
+	err := a.pool.QueryRow(ctx, `
 		select u.id, u.name, u.email, u.avatar, u.created_at,
 		       (select count(*) from songs s where s.submitted_by = u.id),
 		       (select count(*) from reviews r where r.reviewer_id = u.id),
-		       (select avg(r.score) from reviews r where r.reviewer_id = u.id),
-		       (select avg(r.score) from reviews r
+		       (select avg(r.score)::float from reviews r where r.reviewer_id = u.id),
+		       (select avg(r.score)::float from reviews r
 		          join songs s on s.id = r.song_id where s.submitted_by = u.id)
 		  from users u where u.id = $1`, userID).
 		Scan(&p.ID, &p.Name, &p.Email, &p.Avatar, &p.CreatedAt,
@@ -67,7 +67,7 @@ func (a *app) profile(ctx context.Context, viewerID, userID int64) (*profileView
 	}
 
 	// Their songs, with the viewer's own reveal rule applied to each average.
-	rows, err := a.db.QueryContext(ctx, `select`+songColumns+`
+	rows, err := a.pool.Query(ctx, `select`+songColumns+`
 		  from songs s join users u on u.id = s.submitted_by
 		 where s.submitted_by = $2
 		 order by s.created_at desc`, viewerID, userID)
@@ -90,7 +90,7 @@ func (a *app) profilePage(w http.ResponseWriter, r *http.Request) {
 		id = parsed
 	}
 	p, err := a.profile(r.Context(), me.ID, id)
-	if errors.Is(err, sql.ErrNoRows) {
+	if errors.Is(err, pgx.ErrNoRows) {
 		http.NotFound(w, r)
 		return
 	} else if err != nil {
@@ -120,7 +120,7 @@ func (a *app) editProfile(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if _, err := a.db.ExecContext(r.Context(),
+	if _, err := a.pool.Exec(r.Context(),
 		`update users set name = $2, email = $3 where id = $1`, me.ID, name, email); isUnique(err) {
 		a.flash(w, "Sähköpostiosoite on jo käytössä.")
 		http.Redirect(w, r, "/profile", http.StatusSeeOther)
@@ -153,7 +153,7 @@ func (a *app) editProfile(w http.ResponseWriter, r *http.Request) {
 
 func (a *app) changePassword(w http.ResponseWriter, r *http.Request, userID int64, current, next string) bool {
 	var hash string
-	if err := a.db.QueryRowContext(r.Context(),
+	if err := a.pool.QueryRow(r.Context(),
 		`select password_hash from users where id = $1`, userID).Scan(&hash); err != nil {
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return false
@@ -168,13 +168,13 @@ func (a *app) changePassword(w http.ResponseWriter, r *http.Request, userID int6
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return false
 	}
-	if _, err := a.db.ExecContext(r.Context(),
+	if _, err := a.pool.Exec(r.Context(),
 		`update users set password_hash = $2 where id = $1`, userID, string(newHash)); err != nil {
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return false
 	}
 	// Every other session dies; this browser keeps its own.
-	if _, err := a.db.ExecContext(r.Context(),
+	if _, err := a.pool.Exec(r.Context(),
 		`delete from sessions where user_id = $1 and token <> $2`, userID, sessionToken(r)); err != nil {
 		slog.Error("drop sessions", "ctx", "auth", "error", err, "user", userID)
 	}
@@ -202,7 +202,7 @@ func (a *app) saveAvatar(r *http.Request, userID int64, file io.Reader) error {
 	if err := toAvatarJPEG(r.Context(), tmp, out); err != nil {
 		return err
 	}
-	_, err = a.db.ExecContext(r.Context(),
+	_, err = a.pool.Exec(r.Context(),
 		`update users set avatar = $2 where id = $1`, userID, filepath.Base(out))
 	return err
 }

render.go

@@ -18,8 +18,6 @@ var funcs = template.FuncMap{
 	"fidate": func(t time.Time) string { return t.Local().Format("2.1.2006 15:04") },
 	// Date without the clock: the minute a song was published is noise.
 	"fiday": func(t time.Time) string { return t.Local().Format("2.1.2006") },
-	// Lyrics as they are meant to be read: LRC timestamps belong to the player, not the reader.
-	"lyricstext": stripLRC,
 	"score": func(f *float64) string { return strconv.FormatFloat(*f, 'f', 1, 64) },
 	"value": func(f float64) string { return strconv.FormatFloat(f, 'f', 1, 64) },
 	// Lets one board partial be called with a title and a list, instead of two near-identical
@@ -78,8 +76,8 @@ func (a *app) render(w http.ResponseWriter, r *http.Request, status int, name st
 	p.Version = version
 	if p.Member != nil {
 		// The queue is a worklist, so its size belongs in the nav.
-		a.db.QueryRowContext(r.Context(), `
-			select count(*) from songs s
+		a.pool.QueryRow(r.Context(), `
+			select count(*)::int from songs s
 			 where s.submitted_by <> $1
 			   and not exists (select 1 from reviews r
 			                    where r.song_id = s.id and r.reviewer_id = $1)`,

reports.go

@@ -47,7 +47,7 @@ func (a *app) reportPage(w http.ResponseWriter, r *http.Request) {
 
 // Seeing your own past reports is what stops the same bug arriving four times.
 func (a *app) myReports(ctx context.Context, userID int64) ([]*report, error) {
-	rows, err := a.db.QueryContext(ctx, `
+	rows, err := a.pool.Query(ctx, `
 		select id, body, coalesce(page, ''), resolved_at, created_at
 		  from reports where user_id = $1 order by created_at desc`, userID)
 	if err != nil {
@@ -79,7 +79,7 @@ func (a *app) createReport(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// "Only on my phone" is the most common bug report and this answers it without asking.
-	_, err := a.db.ExecContext(r.Context(), `
+	_, err := a.pool.Exec(r.Context(), `
 		insert into reports (user_id, body, page, user_agent) values ($1, $2, nullif($3, ''), $4)`,
 		me.ID, body, from, clean(r.Header.Get("User-Agent"), 300))
 	if err != nil {
@@ -95,7 +95,7 @@ func (a *app) createReport(w http.ResponseWriter, r *http.Request) {
 // --- admin ---
 
 func (a *app) adminReports(w http.ResponseWriter, r *http.Request) {
-	rows, err := a.db.QueryContext(r.Context(), `
+	rows, err := a.pool.Query(r.Context(), `
 		select rep.id, rep.body, coalesce(rep.page, ''), coalesce(rep.user_agent, ''),
 		       u.name, rep.resolved_at, rep.created_at
 		  from reports rep join users u on u.id = rep.user_id
@@ -130,9 +130,8 @@ func (a *app) resolveReport(w http.ResponseWriter, r *http.Request) {
 		http.NotFound(w, r)
 		return
 	}
-	if _, err := a.db.ExecContext(r.Context(),
-		`update reports set resolved_at = case when resolved_at is null then datetime('now') end
-		  where id = $1`,
+	if _, err := a.pool.Exec(r.Context(),
+		`update reports set resolved_at = case when resolved_at is null then now() end where id = $1`,
 		id); err != nil {
 		adminError(w, "reports", err)
 		return
@@ -148,12 +147,12 @@ func (a *app) adminDeleteSong(w http.ResponseWriter, r *http.Request) {
 		http.NotFound(w, r)
 		return
 	}
-	res, err := a.db.ExecContext(r.Context(), `delete from songs where id = $1`, id)
+	tag, err := a.pool.Exec(r.Context(), `delete from songs where id = $1`, id)
 	if err != nil {
 		adminError(w, "songs", err)
 		return
 	}
-	if affected(res) > 0 {
+	if tag.RowsAffected() > 0 {
 		removeFile(a.audioPath(id))
 		slog.Info("song deleted by admin", "ctx", "songs", "song", id)
 		a.flash(w, "Kappale poistettu.")
@@ -171,9 +170,9 @@ type adminSong struct {
 }
 
 func (a *app) adminSongs(ctx context.Context) ([]adminSong, error) {
-	rows, err := a.db.QueryContext(ctx, `
+	rows, err := a.pool.Query(ctx, `
 		select s.id, s.title, s.artist, u.name,
-		       (select count(*) from reviews r where r.song_id = s.id), s.created_at
+		       (select count(*) from reviews r where r.song_id = s.id)::int, s.created_at
 		  from songs s join users u on u.id = s.submitted_by
 		 order by s.created_at desc`)
 	if err != nil {

reviews.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"context"
-	"database/sql"
 	"errors"
 	"fmt"
 	"log/slog"
 	"net/http"
 	"strconv"
 	"time"
+
+	"github.com/jackc/pgx/v5"
 )
 
 const (
@@ -16,10 +17,6 @@ const (
 	maxReview  = 5000
 )
 
-// The same window as a SQLite date modifier, for the two statements that enforce it. SQLite has no
-// interval type to bind, so the unit travels in the string.
-var editWindowAgo = fmt.Sprintf("-%d seconds", int(editWindow.Seconds()))
-
 type review struct {
 	ID         int64
 	SongID     int64
@@ -43,7 +40,7 @@ func (r *review) Initials() string {
 }
 
 func (a *app) reviewsFor(ctx context.Context, songID, viewerID int64) ([]*review, error) {
-	rows, err := a.db.QueryContext(ctx, `
+	rows, err := a.pool.Query(ctx, `
 		select r.id, r.song_id, r.reviewer_id, u.name, r.score, r.text, r.created_at, r.updated_at,
 		       r.reviewer_id = $2
 		  from reviews r join users u on u.id = r.reviewer_id
@@ -67,13 +64,13 @@ func (a *app) reviewsFor(ctx context.Context, songID, viewerID int64) ([]*review
 
 func (a *app) viewerReview(ctx context.Context, songID, viewerID int64) (*review, error) {
 	var v review
-	err := a.db.QueryRowContext(ctx, `
+	err := a.pool.QueryRow(ctx, `
 		select r.id, r.song_id, r.reviewer_id, u.name, r.score, r.text, r.created_at, r.updated_at, true
 		  from reviews r join users u on u.id = r.reviewer_id
 		 where r.song_id = $1 and r.reviewer_id = $2`, songID, viewerID).
 		Scan(&v.ID, &v.SongID, &v.ReviewerID, &v.Reviewer, &v.Score, &v.Text,
 			&v.CreatedAt, &v.UpdatedAt, &v.Own)
-	if errors.Is(err, sql.ErrNoRows) {
+	if errors.Is(err, pgx.ErrNoRows) {
 		return nil, nil
 	}
 	return &v, err
@@ -108,8 +105,8 @@ func (a *app) createReview(w http.ResponseWriter, r *http.Request) {
 	// You cannot review your own song, and the unique constraint is what stops a second review —
 	// no read-then-write race to lose.
 	var submitter int64
-	err = a.db.QueryRowContext(r.Context(), `select submitted_by from songs where id = $1`, songID).Scan(&submitter)
-	if errors.Is(err, sql.ErrNoRows) {
+	err = a.pool.QueryRow(r.Context(), `select submitted_by from songs where id = $1`, songID).Scan(&submitter)
+	if errors.Is(err, pgx.ErrNoRows) {
 		http.NotFound(w, r)
 		return
 	} else if err != nil {
@@ -122,7 +119,7 @@ func (a *app) createReview(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, err = a.db.ExecContext(r.Context(),
+	_, err = a.pool.Exec(r.Context(),
 		`insert into reviews (song_id, reviewer_id, score, text) values ($1, $2, $3, $4)`,
 		songID, me.ID, score, text)
 	if isUnique(err) {
@@ -156,12 +153,12 @@ func (a *app) editReview(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var songID int64
-	err = a.db.QueryRowContext(r.Context(), `
-		update reviews set score = $3, text = $4, updated_at = datetime('now')
-		 where id = $1 and reviewer_id = $2 and updated_at > datetime('now', $5)
+	err = a.pool.QueryRow(r.Context(), `
+		update reviews set score = $3, text = $4, updated_at = now()
+		 where id = $1 and reviewer_id = $2 and updated_at > now() - $5::interval
 		 returning song_id`,
-		id, memberFrom(r.Context()).ID, score, text, editWindowAgo).Scan(&songID)
-	if errors.Is(err, sql.ErrNoRows) {
+		id, memberFrom(r.Context()).ID, score, text, editWindow.String()).Scan(&songID)
+	if errors.Is(err, pgx.ErrNoRows) {
 		a.flash(w, "Muokkausaika on umpeutunut.")
 		http.Redirect(w, r, r.FormValue("from"), http.StatusSeeOther)
 		return
@@ -183,12 +180,12 @@ func (a *app) deleteReview(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var songID int64
-	err = a.db.QueryRowContext(r.Context(), `
+	err = a.pool.QueryRow(r.Context(), `
 		delete from reviews
-		 where id = $1 and reviewer_id = $2 and updated_at > datetime('now', $3)
+		 where id = $1 and reviewer_id = $2 and updated_at > now() - $3::interval
 		 returning song_id`,
-		id, memberFrom(r.Context()).ID, editWindowAgo).Scan(&songID)
-	if errors.Is(err, sql.ErrNoRows) {
+		id, memberFrom(r.Context()).ID, editWindow.String()).Scan(&songID)
+	if errors.Is(err, pgx.ErrNoRows) {
 		a.flash(w, "Muokkausaika on umpeutunut.")
 		http.Redirect(w, r, r.FormValue("from"), http.StatusSeeOther)
 		return

songs.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"database/sql"
 	"errors"
 	"fmt"
 	"log/slog"
@@ -10,6 +9,8 @@ import (
 	"os"
 	"strconv"
 	"time"
+
+	"github.com/jackc/pgx/v5"
 )
 
 const pageSize = 20
@@ -51,12 +52,12 @@ const songColumns = `
 	(select count(*) from reviews r where r.song_id = s.id),
 	case when s.submitted_by = $1
 	          or exists (select 1 from reviews r where r.song_id = s.id and r.reviewer_id = $1)
-	     then (select avg(r.score) from reviews r where r.song_id = s.id)
+	     then (select avg(r.score)::float from reviews r where r.song_id = s.id)
 	end,
 	s.submitted_by = $1,
 	exists (select 1 from reviews r where r.song_id = s.id and r.reviewer_id = $1)`
 
-func scanSongs(rows *sql.Rows) ([]*songSummary, error) {
+func scanSongs(rows pgx.Rows) ([]*songSummary, error) {
 	defer rows.Close()
 	var out []*songSummary
 	for rows.Next() {
@@ -73,7 +74,7 @@ func scanSongs(rows *sql.Rows) ([]*songSummary, error) {
 // The queue is a worklist: songs you can still review, oldest first, and never your own — you can
 // never act on those, so they would sit at the front forever.
 func (a *app) queue(ctx context.Context, viewerID, cursor int64) (*songList, error) {
-	rows, err := a.db.QueryContext(ctx, `select`+songColumns+`
+	rows, err := a.pool.Query(ctx, `select`+songColumns+`
 		  from songs s join users u on u.id = s.submitted_by
 		 where s.submitted_by <> $1
 		   and not exists (select 1 from reviews r where r.song_id = s.id and r.reviewer_id = $1)
@@ -92,7 +93,7 @@ func (a *app) queue(ctx context.Context, viewerID, cursor int64) (*songList, err
 
 // Everything, newest first. This is where a song lives once it has left the queue.
 func (a *app) browse(ctx context.Context, viewerID, cursor int64) (*songList, error) {
-	rows, err := a.db.QueryContext(ctx, `select`+songColumns+`
+	rows, err := a.pool.Query(ctx, `select`+songColumns+`
 		  from songs s join users u on u.id = s.submitted_by
 		 where ($2 = 0 or s.id < $2)
 		 order by s.created_at desc, s.id desc
@@ -147,7 +148,6 @@ func (a *app) browsePage(w http.ResponseWriter, r *http.Request) {
 type songDetail struct {
 	songSummary
 	Description  string
-	Lyrics       string
 	SourceURL    *string
 	Reviews      []*review // nil when the reveal rule is withholding them
 	ViewerReview *review
@@ -159,19 +159,14 @@ type songDetail struct {
 
 func (s *songDetail) Locked() bool { return s.ReviewCount > 0 }
 
-// Synced lyrics get a line-by-line highlight; plain text scrolls continuously instead, because a
-// highlight on guessed timings makes every second of drift look like a bug.
-func (s *songDetail) LyricLines() []lyricLine { return parseLRC(s.Lyrics) }
-
 func (a *app) song(ctx context.Context, viewerID, songID int64) (*songDetail, error) {
 	var d songDetail
-	err := a.db.QueryRowContext(ctx, `select`+songColumns+`,
-		       coalesce(s.description, ''), coalesce(s.lyrics, ''), s.source_url
+	err := a.pool.QueryRow(ctx, `select`+songColumns+`, coalesce(s.description, ''), s.source_url
 		  from songs s join users u on u.id = s.submitted_by
 		 where s.id = $2`, viewerID, songID).
 		Scan(&d.ID, &d.Title, &d.Artist, &d.Genre, &d.Duration, &d.CreatedAt,
 			&d.SubmitterID, &d.Submitter, &d.ReviewCount, &d.Average, &d.Own, &d.Reviewed,
-			&d.Description, &d.Lyrics, &d.SourceURL)
+			&d.Description, &d.SourceURL)
 	if err != nil {
 		return nil, err
 	}
@@ -206,13 +201,13 @@ func (a *app) song(ctx context.Context, viewerID, songID int64) (*songDetail, er
 // draining the queue never means navigating back to it.
 func (a *app) nextInQueue(ctx context.Context, viewerID, exceptID int64) (int64, error) {
 	var id int64
-	err := a.db.QueryRowContext(ctx, `
+	err := a.pool.QueryRow(ctx, `
 		select s.id from songs s
 		 where s.submitted_by <> $1 and s.id <> $2
 		   and not exists (select 1 from reviews r where r.song_id = s.id and r.reviewer_id = $1)
 		 order by s.created_at, s.id
 		 limit 1`, viewerID, exceptID).Scan(&id)
-	if errors.Is(err, sql.ErrNoRows) {
+	if errors.Is(err, pgx.ErrNoRows) {
 		return 0, nil
 	}
 	return id, err
@@ -225,7 +220,7 @@ func (a *app) songPage(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	d, err := a.song(r.Context(), memberFrom(r.Context()).ID, id)
-	if errors.Is(err, sql.ErrNoRows) {
+	if errors.Is(err, pgx.ErrNoRows) {
 		http.NotFound(w, r)
 		return
 	} else if err != nil {
@@ -236,31 +231,6 @@ func (a *app) songPage(w http.ResponseWriter, r *http.Request) {
 	a.render(w, r, http.StatusOK, "song.html", page{Title: d.Title, Data: d})
 }
 
-// Lyrics are not covered by the lock: it freezes what the song claims to be, and nobody reviewed
-// the lyrics. So this checks the submitter and nothing else, which also lets someone paste them for
-// an old song a year later.
-func (a *app) editLyrics(w http.ResponseWriter, r *http.Request) {
-	id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
-	if err != nil {
-		http.NotFound(w, r)
-		return
-	}
-	res, err := a.db.ExecContext(r.Context(),
-		`update songs set lyrics = nullif($3, '') where id = $1 and submitted_by = $2`,
-		id, memberFrom(r.Context()).ID, cleanLyrics(r.FormValue("lyrics")))
-	if err != nil {
-		slog.Error("edit lyrics", "ctx", "songs", "error", err, "song", id)
-		http.Error(w, "virhe", http.StatusInternalServerError)
-		return
-	}
-	if affected(res) == 0 {
-		http.NotFound(w, r)
-		return
-	}
-	a.flash(w, "Sanoitukset tallennettu.")
-	http.Redirect(w, r, fmt.Sprintf("/songs/%d", id), http.StatusSeeOther)
-}
-
 // --- edit and delete ---
 
 // The submitter may change the four text fields while the song is unlocked. Once people have
@@ -283,7 +253,7 @@ func (a *app) editSong(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	res, err := a.db.ExecContext(r.Context(), `
+	tag, err := a.pool.Exec(r.Context(), `
 		update songs set title = $3, artist = $4, genre = $5, description = nullif($6, '')
 		 where id = $1 and submitted_by = $2
 		   and not exists (select 1 from reviews r where r.song_id = songs.id)`,
@@ -294,7 +264,7 @@ func (a *app) editSong(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	if affected(res) == 0 {
+	if tag.RowsAffected() == 0 {
 		a.flash(w, "Kappaletta ei voi enää muokata — sitä on jo arvosteltu.")
 	} else {
 		a.flash(w, "Tiedot tallennettu.")
@@ -309,7 +279,7 @@ func (a *app) deleteSong(w http.ResponseWriter, r *http.Request) {
 		http.NotFound(w, r)
 		return
 	}
-	res, err := a.db.ExecContext(r.Context(), `
+	tag, err := a.pool.Exec(r.Context(), `
 		delete from songs where id = $1 and submitted_by = $2
 		  and not exists (select 1 from reviews r where r.song_id = songs.id)`,
 		id, memberFrom(r.Context()).ID)
@@ -318,7 +288,7 @@ func (a *app) deleteSong(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	if affected(res) == 0 {
+	if tag.RowsAffected() == 0 {
 		a.flash(w, "Kappaletta ei voi enää poistaa — sitä on jo arvosteltu.")
 		http.Redirect(w, r, fmt.Sprintf("/songs/%d", id), http.StatusSeeOther)
 		return
@@ -347,8 +317,8 @@ func (a *app) audio(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var name string
-	err = a.db.QueryRowContext(r.Context(), `select audio_file from songs where id = $1`, id).Scan(&name)
-	if errors.Is(err, sql.ErrNoRows) {
+	err = a.pool.QueryRow(r.Context(), `select audio_file from songs where id = $1`, id).Scan(&name)
+	if errors.Is(err, pgx.ErrNoRows) {
 		http.NotFound(w, r)
 		return
 	} else if err != nil {

songs_test.go

@@ -8,7 +8,7 @@ import (
 func (a *app) seedSong(t *testing.T, submitter int64, title string) int64 {
 	t.Helper()
 	var id int64
-	err := a.db.QueryRowContext(context.Background(), `
+	err := a.pool.QueryRow(context.Background(), `
 		insert into songs (title, artist, genre, audio_file, duration_seconds, submitted_by)
 		values ($1, 'Testiartisti', 'Metal', 'x.ogg', 120, $2) returning id`,
 		title, submitter).Scan(&id)
@@ -21,7 +21,7 @@ func (a *app) seedSong(t *testing.T, submitter int64, title string) int64 {
 func (a *app) seedReview(t *testing.T, songID, reviewerID int64, score int) int64 {
 	t.Helper()
 	var id int64
-	err := a.db.QueryRowContext(context.Background(), `
+	err := a.pool.QueryRow(context.Background(), `
 		insert into reviews (song_id, reviewer_id, score, text)
 		values ($1, $2, $3, 'sanat') returning id`, songID, reviewerID, score).Scan(&id)
 	if err != nil {
@@ -133,8 +133,8 @@ func TestQueueContents(t *testing.T) {
 
 	// Oldest first: a second unreviewed song comes after the first.
 	older := a.seedSong(t, bertta, "Vanhempi")
-	if _, err := a.db.ExecContext(ctx,
-		`update songs set created_at = datetime('now', '-2 days') where id = $1`, older); err != nil {
+	if _, err := a.pool.Exec(ctx,
+		`update songs set created_at = now() - interval '2 days' where id = $1`, older); err != nil {
 		t.Fatal(err)
 	}
 	list, err = a.queue(ctx, aino, 0)
@@ -165,7 +165,7 @@ func TestSongUnlocksWhenTheLastReviewGoes(t *testing.T) {
 		t.Fatal("a reviewed song is still editable")
 	}
 
-	if _, err := a.db.ExecContext(ctx, `delete from reviews where id = $1`, reviewID); err != nil {
+	if _, err := a.pool.Exec(ctx, `delete from reviews where id = $1`, reviewID); err != nil {
 		t.Fatal(err)
 	}
 	d, _ = a.song(ctx, aino, songID)
@@ -192,8 +192,8 @@ func TestEditWindow(t *testing.T) {
 	}
 
 	// Just inside the window.
-	if _, err := a.db.ExecContext(ctx,
-		`update reviews set updated_at = datetime('now', '-29 minutes') where id = $1`,
+	if _, err := a.pool.Exec(ctx,
+		`update reviews set updated_at = now() - interval '29 minutes' where id = $1`,
 		reviewID); err != nil {
 		t.Fatal(err)
 	}
@@ -203,8 +203,8 @@ func TestEditWindow(t *testing.T) {
 	}
 
 	// Past it.
-	if _, err := a.db.ExecContext(ctx,
-		`update reviews set updated_at = datetime('now', '-31 minutes') where id = $1`,
+	if _, err := a.pool.Exec(ctx,
+		`update reviews set updated_at = now() - interval '31 minutes' where id = $1`,
 		reviewID); err != nil {
 		t.Fatal(err)
 	}
@@ -215,17 +215,17 @@ func TestEditWindow(t *testing.T) {
 
 	// The database is the authority, not the Go clock: the update and the delete both refuse.
 	var n int64
-	err = a.db.QueryRowContext(ctx, `
-		update reviews set score = 1, updated_at = datetime('now')
-		 where id = $1 and reviewer_id = $2 and updated_at > datetime('now', $3)
-		 returning id`, reviewID, bertta, editWindowAgo).Scan(&n)
+	err = a.pool.QueryRow(ctx, `
+		update reviews set score = 1, updated_at = now()
+		 where id = $1 and reviewer_id = $2 and updated_at > now() - $3::interval
+		 returning id`, reviewID, bertta, editWindow.String()).Scan(&n)
 	if err == nil {
 		t.Fatal("an expired review was edited")
 	}
-	err = a.db.QueryRowContext(ctx, `
+	err = a.pool.QueryRow(ctx, `
 		delete from reviews
-		 where id = $1 and reviewer_id = $2 and updated_at > datetime('now', $3)
-		 returning id`, reviewID, bertta, editWindowAgo).Scan(&n)
+		 where id = $1 and reviewer_id = $2 and updated_at > now() - $3::interval
+		 returning id`, reviewID, bertta, editWindow.String()).Scan(&n)
 	if err == nil {
 		t.Fatal("an expired review was deleted")
 	}

static/lyrics.js

@@ -1,135 +0,0 @@
-// Lyrics that follow the audio. Two behaviours, because the two kinds of lyrics deserve different
-// treatment: real LRC timestamps get a line highlight, guessed timings get a continuous scroll and
-// a nudge knob. Progressive enhancement — without this file the lyrics are still readable text.
-(function () {
-  'use strict'
-
-  const quiet = window.matchMedia('(prefers-reduced-motion: reduce)').matches
-
-  // The audio element belonging to the same strip, falling back to the only one on the page.
-  const audioFor = (box) => {
-    const scope = box.closest('.strip') || box.closest('section') || document
-    return scope.querySelector('audio') || document.querySelector('audio')
-  }
-
-  // --- synced: highlight the line that is playing ---
-
-  function enhanceSynced(box) {
-    const audio = audioFor(box)
-    if (!audio) return
-    const lines = [...box.querySelectorAll('.lline')]
-    if (!lines.length) return
-    const times = lines.map((l) => Number(l.dataset.t))
-    let current = -1
-
-    // Following is what moves the box. Timestamps are somebody else's guess at where a line
-    // starts, so when they are off, the scrolling is the part that fights you — the highlight can
-    // stay. Remembered per song.
-    const follow = box.parentElement.querySelector('.follow input')
-    const key = 'lyricsfollow:' + box.dataset.song
-    if (follow && localStorage.getItem(key) === 'off') follow.checked = false
-    if (follow) {
-      follow.addEventListener('change', () => {
-        localStorage.setItem(key, follow.checked ? 'on' : 'off')
-      })
-    }
-
-    // Scrolling the box by hand turns following off: reading somewhere else is a clear statement
-    // that you do not want to be dragged back.
-    let selfScroll = false
-    box.addEventListener('scroll', () => {
-      if (selfScroll || !follow || !follow.checked) return
-      follow.checked = false
-      localStorage.setItem(key, 'off')
-    })
-
-    const show = (i) => {
-      if (i === current) return
-      if (lines[current]) lines[current].classList.remove('on')
-      current = i
-      const line = lines[i]
-      if (!line) return
-      line.classList.add('on')
-      if (follow && !follow.checked) return
-      // Measured against the box itself. offsetTop is relative to the nearest positioned ancestor,
-      // which is not this box, so using it scrolls to a position from a different coordinate space.
-      const boxRect = box.getBoundingClientRect()
-      const lineRect = line.getBoundingClientRect()
-      const target = box.scrollTop + (lineRect.top - boxRect.top)
-        - box.clientHeight / 2 + lineRect.height / 2
-      selfScroll = true
-      box.scrollTo({ top: target, behavior: quiet ? 'auto' : 'smooth' })
-      // Long enough for the smooth scroll to finish, so our own movement is not mistaken for the
-      // reader's.
-      setTimeout(() => { selfScroll = false }, 700)
-    }
-
-    audio.addEventListener('timeupdate', () => {
-      const t = audio.currentTime
-      let i = current
-      // Usually one step forward; a seek walks from wherever it lands.
-      if (i < 0 || times[i] > t) i = 0
-      while (i + 1 < times.length && times[i + 1] <= t) i++
-      if (times[i] <= t) show(i)
-    })
-
-    audio.addEventListener('seeked', () => {
-      current = -1
-    })
-
-    // Clicking a line seeks to it: the lyrics become a way to navigate the song.
-    lines.forEach((line, i) => {
-      line.addEventListener('click', () => {
-        audio.currentTime = times[i]
-        if (audio.paused) audio.play()
-      })
-    })
-  }
-
-  // --- plain: scroll the block in step with the audio ---
-
-  function enhancePlain(box) {
-    const audio = audioFor(box)
-    const inner = box.querySelector('.lscroll')
-    if (!audio || !inner) return
-
-    const nudge = box.parentElement.querySelector('.nudge input')
-    const readout = box.parentElement.querySelector('.nudge output')
-    const key = 'lyricsoffset:' + box.dataset.song
-    let offset = Number(localStorage.getItem(key) || 0)
-    if (nudge) {
-      nudge.value = offset
-      readout.value = offset + ' s'
-    }
-
-    const duration = () => Number(audio.duration) || Number(box.dataset.duration) || 0
-
-    // Position is a pure function of time, so a seek needs no bookkeeping and drift cannot
-    // accumulate the way it would with a timer.
-    const place = () => {
-      const total = duration()
-      const travel = inner.scrollHeight - box.clientHeight
-      if (total <= 0 || travel <= 0) return
-      const at = (audio.currentTime + offset) / total
-      box.scrollTop = Math.max(0, Math.min(travel, at * travel))
-    }
-
-    audio.addEventListener('timeupdate', place)
-    audio.addEventListener('seeked', place)
-    audio.addEventListener('loadedmetadata', place)
-
-    if (nudge) {
-      nudge.addEventListener('input', () => {
-        offset = Number(nudge.value)
-        readout.value = (offset > 0 ? '+' : '') + offset + ' s'
-        localStorage.setItem(key, offset)
-        place()
-      })
-    }
-  }
-
-  document.addEventListener('DOMContentLoaded', () => {
-    document.querySelectorAll('.lyricsbox.synced').forEach(enhanceSynced)
-    document.querySelectorAll('.lyricsbox.plain').forEach(enhancePlain)
-  })
-})()

static/style.css

@@ -330,35 +330,6 @@ footer.sitefooter {
 
 .average { font-family: var(--font-display); font-size: 1.2rem; color: var(--gold-1); }
 
-.lyrics {
-  background: var(--surface);
-  border: 1px solid var(--hairline);
-  border-radius: var(--radius);
-  padding: var(--space-3) var(--space-4);
-  margin-bottom: var(--space-5);
-}
-
-.lyrics > summary {
-  cursor: pointer;
-  font-family: var(--font-display);
-  text-transform: uppercase;
-  letter-spacing: 0.04em;
-  color: var(--primary);
-}
-
-/* Lyrics are typed with intent: line breaks and indentation are the content. */
-.lyricstext {
-  font-family: inherit;
-  font-size: 0.95rem;
-  line-height: 1.7;
-  white-space: pre-wrap;
-  margin: var(--space-4) 0 0;
-  max-height: 26rem;
-  overflow-y: auto;
-}
-
-.lyrics form { margin-top: var(--space-4); }
-
 .review {
   padding: var(--space-4);
   border-left: 3px solid var(--input-border);
@@ -453,77 +424,10 @@ button.link:hover { background: none; color: var(--primary-hover); }
 
 .deck { display: flex; flex-direction: column; gap: var(--space-3); min-width: 0; }
 .deck .grow { flex: 1; }
-
-/* Read on the left, write on the right. One column when the song has no lyrics — the pane is
-   absent rather than empty. */
-.panes { display: grid; grid-template-columns: 1fr 1fr; gap: var(--space-4); flex: 1; min-height: 0; }
-.panes.solo { grid-template-columns: 1fr; }
-
-.lyricspane, .writepane { display: flex; flex-direction: column; gap: var(--space-2); min-width: 0; }
-.writepane .grow { display: flex; flex-direction: column; gap: var(--space-1); }
-.writepane textarea { flex: 1; min-height: 12rem; }
-
-.cap {
-  font-family: var(--font-display);
-  font-size: 0.7rem;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-  color: var(--muted);
-}
-
-.lyricsbox {
-  /* Grows with the pane but stops before it can push the page: long lyrics scroll inside the box
-     rather than stretching the strip past the screen. */
-  flex: 1 1 auto;
-  min-height: 10rem;
-  max-height: 24rem;
-  overflow-y: auto;
-  padding: var(--space-3) var(--space-4);
-  background: var(--bar);
-  border: 1px solid var(--hairline);
-  border-radius: var(--radius);
-  white-space: pre-wrap;
-  line-height: 1.7;
-  font-size: 0.95rem;
-  /* Scrolling is smoothed in JS, which also knows when to skip it. Doing it here as well makes two
-     mechanisms fight over the same element. */
-}
-
-/* Synced lyrics: the line that is playing is the only bright one, and clicking any line seeks. */
-.lyricsbox.synced { white-space: normal; }
-
-.lline {
-  margin: 0;
-  padding: 0.1rem 0;
-  color: var(--muted);
-  cursor: pointer;
-  transition: color var(--duration-fast) var(--ease-out);
-}
-
-.lline:hover { color: var(--text); }
-
-.lline.on {
-  color: var(--gold-1);
-  font-weight: 600;
-}
-
-/* Uniform distribution models a song no real song obeys, so the reader gets a knob. */
-.follow { display: flex; align-items: center; gap: var(--space-2); font-size: 0.8rem;
-          color: var(--muted); cursor: pointer; }
-.follow input { width: auto; accent-color: var(--primary); }
-
-.nudge { display: flex; align-items: center; gap: var(--space-2); font-size: 0.75rem;
-         color: var(--muted); font-family: var(--font-display); text-transform: uppercase;
-         letter-spacing: 0.06em; }
-.nudge input { flex: 1; accent-color: var(--primary); }
-.nudge output { min-width: 4ch; text-align: right; color: var(--text); }
-
 .deck .player { margin: 0; }
 .deckfoot { display: flex; align-items: center; gap: var(--space-4); flex-wrap: wrap; }
 
-/* Fixed columns, not auto: the readout spans both, so an auto track would widen the whole fader
-   when the score reaches three digits and shove the deck sideways mid-drag. */
-.fader { display: grid; grid-template-columns: 2rem 2rem; grid-template-rows: 1fr auto;
+.fader { display: grid; grid-template-columns: auto auto; grid-template-rows: 1fr auto;
          gap: var(--space-2); align-items: stretch; }
 
 .ticks { display: flex; flex-direction: column; justify-content: space-between; text-align: right;
@@ -582,16 +486,14 @@ button.link:hover { background: none; color: var(--primary-hover); }
 .readout {
   grid-column: 1 / -1;
   font-family: var(--font-display);
-  font-size: 1.8rem;
+  font-size: 2rem;
   font-weight: 700;
-  /* Digits of equal width, so 99 → 100 does not shift anything inside the box either. */
-  font-variant-numeric: tabular-nums;
   color: var(--gold-1);
   text-align: center;
   background: var(--bar);
   border: 1px solid var(--input-border);
   border-radius: var(--radius);
-  padding: 0 var(--space-1);
+  padding: 0 var(--space-2);
 }
 
 /* --- the reveal: one channel per reviewer --- */
@@ -743,10 +645,6 @@ td.break { word-break: break-all; font-size: 0.8rem; }
 code { background: var(--surface-raised); padding: 0.1rem var(--space-1);
        border-radius: var(--radius); font-size: 0.85rem; }
 
-/* The link is long and the button must stay reachable next to it on a narrow admin window. */
-.invitecell { display: flex; align-items: center; gap: var(--space-2); flex-wrap: wrap; }
-.invitecell code { word-break: break-all; }
-
 /* --- toasts --- */
 
 .toasts { position: fixed; right: var(--space-4); bottom: var(--space-4); z-index: 1000;
@@ -842,9 +740,6 @@ code { background: var(--surface-raised); padding: 0.1rem var(--space-1);
 
   /* A 200px fader on a phone is worse than a horizontal one. */
   .strip { grid-template-columns: 1fr; gap: var(--space-3); padding: var(--space-4); }
-  /* Side by side needs width it does not have here, so reading stacks above writing. */
-  .panes { grid-template-columns: 1fr; }
-  .lyricsbox { max-height: 14rem; }
   .fader { grid-template-columns: 1fr auto; grid-template-rows: auto; align-items: center; }
   .fader input[type="range"] { writing-mode: horizontal-tb; direction: ltr;
                                width: 100%; height: auto; min-height: 0; }
@@ -1085,6 +980,3 @@ img.avatar { object-fit: cover; }
 
 .version { color: var(--muted); font-family: var(--font-display); }
 .version::before { content: "·"; margin: 0 var(--space-2); }
-
-.lyricsbar { display: flex; align-items: center; gap: var(--space-3); flex-wrap: wrap;
-             margin-top: var(--space-2); }

stats.go

@@ -55,18 +55,13 @@ type stats struct {
 	MostProlific []userStat
 }
 
-// SQLite has no stddev aggregate. This is the population formula written out; max() absorbs the
-// tiny negative that floating-point cancellation produces when every score is identical, which
-// would otherwise make sqrt() return null and fail the scan.
-const stddevPop = `sqrt(max(0.0, avg(r.score * r.score) - avg(r.score) * avg(r.score)))`
-
 // Every leaderboard is ordered and limited in SQL, and every one carries a deterministic tie-break:
-// ties are common in a ten-person club, and without one the database may return a different ten
-// each time, so the page visibly reshuffles between reloads for no reason.
+// ties are common in a ten-person club, and without one Postgres may return a different ten each
+// time, so the page visibly reshuffles between reloads for no reason.
 func (a *app) songLeaderboard(ctx context.Context, valueExpr, direction string) ([]songStat, error) {
-	rows, err := a.db.QueryContext(ctx, `
-		select s.id, s.title, s.artist, cast(`+valueExpr+` as real) as value,
-		       count(r.id) as reviews, min(r.score), max(r.score)
+	rows, err := a.pool.Query(ctx, `
+		select s.id, s.title, s.artist, `+valueExpr+`::float as value, count(r.id)::int as reviews,
+		       min(r.score)::int, max(r.score)::int
 		  from songs s join reviews r on r.song_id = s.id
 		 group by s.id
 		having count(r.id) >= $1
@@ -91,8 +86,8 @@ func (a *app) songLeaderboard(ctx context.Context, valueExpr, direction string)
 // Reviewer boards need a minimum too, or one enthusiastic 100 makes someone the most generous
 // member in the club forever.
 func (a *app) reviewerLeaderboard(ctx context.Context, valueExpr, direction string) ([]userStat, error) {
-	rows, err := a.db.QueryContext(ctx, `
-		select u.id, u.name, u.avatar, cast(`+valueExpr+` as real) as value, count(r.id) as n
+	rows, err := a.pool.Query(ctx, `
+		select u.id, u.name, u.avatar, `+valueExpr+`::float as value, count(r.id)::int as n
 		  from users u join reviews r on r.reviewer_id = u.id
 		 group by u.id
 		having count(r.id) >= $1
@@ -114,8 +109,8 @@ func (a *app) reviewerLeaderboard(ctx context.Context, valueExpr, direction stri
 }
 
 func (a *app) mostProlific(ctx context.Context) ([]userStat, error) {
-	rows, err := a.db.QueryContext(ctx, `
-		select u.id, u.name, u.avatar, cast(count(s.id) as real), count(s.id)
+	rows, err := a.pool.Query(ctx, `
+		select u.id, u.name, u.avatar, count(s.id)::float, count(s.id)::int
 		  from users u join songs s on s.submitted_by = u.id
 		 group by u.id
 		 order by count(s.id) desc, u.id asc
@@ -145,8 +140,11 @@ func (a *app) statsPage(w http.ResponseWriter, r *http.Request) {
 	for _, load := range []func() error{
 		func() (err error) { s.TopSongs, err = a.songLeaderboard(ctx, "avg(r.score)", "desc"); return },
 		func() (err error) { s.BottomSongs, err = a.songLeaderboard(ctx, "avg(r.score)", "asc"); return },
-		func() (err error) { s.MostDivisive, err = a.songLeaderboard(ctx, stddevPop, "desc"); return },
-		func() (err error) { s.MostUnified, err = a.songLeaderboard(ctx, stddevPop, "asc"); return },
+		func() (err error) {
+			s.MostDivisive, err = a.songLeaderboard(ctx, "stddev_pop(r.score)", "desc")
+			return
+		},
+		func() (err error) { s.MostUnified, err = a.songLeaderboard(ctx, "stddev_pop(r.score)", "asc"); return },
 		func() (err error) { s.MostReviewed, err = a.songLeaderboard(ctx, "count(r.id)", "desc"); return },
 		func() (err error) { s.Harshest, err = a.reviewerLeaderboard(ctx, "avg(r.score)", "asc"); return },
 		func() (err error) { s.MostGenerous, err = a.reviewerLeaderboard(ctx, "avg(r.score)", "desc"); return },

stats_test.go

@@ -51,7 +51,7 @@ func TestLeaderboardThresholdAndOrder(t *testing.T) {
 	}
 
 	// Identical scores everywhere means stddev 0, so unified beats divisive on the same data.
-	unified, err := a.songLeaderboard(ctx, stddevPop, "asc")
+	unified, err := a.songLeaderboard(ctx, "stddev_pop(r.score)", "asc")
 	if err != nil {
 		t.Fatal(err)
 	}

submit.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"database/sql"
 	"errors"
 	"fmt"
 	"io"
@@ -13,6 +12,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/jackc/pgx/v5"
 )
 
 const (
@@ -83,7 +84,6 @@ type submission struct {
 	Artist      string
 	Genre       string
 	Description string
-	Lyrics      string
 	CreatedAt   time.Time
 }
 
@@ -146,12 +146,12 @@ func (a *app) submitError(w http.ResponseWriter, r *http.Request, status int, ms
 // from `submissions` is why this also looks at `songs`.
 func (a *app) overQuota(ctx context.Context, userID int64) (bool, error) {
 	var n int
-	err := a.db.QueryRowContext(ctx, `
+	err := a.pool.QueryRow(ctx, `
 		select (select count(*) from submissions
 		         where user_id = $1 and status <> 'failed'
-		           and created_at > datetime('now', '-24 hours'))
+		           and created_at > now() - interval '24 hours')
 		     + (select count(*) from songs
-		         where submitted_by = $1 and created_at > datetime('now', '-24 hours'))`,
+		         where submitted_by = $1 and created_at > now() - interval '24 hours')`,
 		userID).Scan(&n)
 	return n >= maxPerDay, err
 }
@@ -195,7 +195,7 @@ func (a *app) submit(w http.ResponseWriter, r *http.Request) {
 	defer file.Close()
 
 	var subID int64
-	err = a.db.QueryRowContext(r.Context(),
+	err = a.pool.QueryRow(r.Context(),
 		`insert into submissions (user_id, status) values ($1, 'queued') returning id`,
 		m.ID).Scan(&subID)
 	if err != nil {
@@ -235,7 +235,7 @@ func (a *app) submit(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if _, err := a.db.ExecContext(r.Context(),
+	if _, err := a.pool.Exec(r.Context(),
 		`update submissions set tmp_path = $2, title = nullif($3, ''), artist = nullif($4, '')
 		  where id = $1`, subID, src, meta.Title, meta.Artist); err != nil {
 		slog.Error("save metadata", "ctx", "submissions", "error", err, "submission", subID)
@@ -267,7 +267,7 @@ func (a *app) submitURL(w http.ResponseWriter, r *http.Request, userID int64, ra
 	}
 
 	var subID int64
-	err = a.db.QueryRowContext(r.Context(), `
+	err = a.pool.QueryRow(r.Context(), `
 		insert into submissions (user_id, status, source_url, title, artist)
 		values ($1, 'queued', $2, nullif($3, ''), nullif($4, '')) returning id`,
 		userID, link, meta.Title, meta.Artist).Scan(&subID)
@@ -293,7 +293,7 @@ func (a *app) retry(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "ei uudelleenyritettävissä", http.StatusConflict)
 		return
 	}
-	if _, err := a.db.ExecContext(r.Context(),
+	if _, err := a.pool.Exec(r.Context(),
 		`update submissions set status = 'queued', status_msg = null where id = $1`, s.ID); err != nil {
 		slog.Error("retry", "ctx", "submissions", "error", err, "submission", s.ID)
 		http.Error(w, "virhe", http.StatusInternalServerError)
@@ -308,7 +308,7 @@ func (a *app) discardSubmission(ctx context.Context, subID int64, path string) {
 	if path != "" {
 		os.Remove(path)
 	}
-	if _, err := a.db.ExecContext(ctx, `delete from submissions where id = $1`, subID); err != nil {
+	if _, err := a.pool.Exec(ctx, `delete from submissions where id = $1`, subID); err != nil {
 		slog.Error("discard submission", "ctx", "submissions", "error", err, "submission", subID)
 	}
 }
@@ -347,7 +347,7 @@ func (a *app) process(subID int64, sourceURL, src string) {
 			a.setStatus(ctx, subID, "failed", "lataus ei tuottanut tiedostoa")
 			return
 		}
-		if _, err := a.db.ExecContext(ctx,
+		if _, err := a.pool.Exec(ctx,
 			`update submissions set tmp_path = $2 where id = $1`, subID, src); err != nil {
 			slog.Error("save tmp path", "ctx", "submissions", "error", err, "submission", subID)
 		}
@@ -369,32 +369,17 @@ func (a *app) process(subID int64, sourceURL, src string) {
 	// The original is discarded as soon as the Opus exists.
 	os.Remove(src)
 
-	if _, err := a.db.ExecContext(ctx,
+	if _, err := a.pool.Exec(ctx,
 		`update submissions set status = 'ready', status_msg = null, tmp_path = $2 where id = $1`,
 		subID, out); err != nil {
 		slog.Error("mark ready", "ctx", "submissions", "error", err, "submission", subID)
 		return
 	}
 	slog.Info("conversion ready", "ctx", "submissions", "submission", subID)
-
-	// One automatic lyrics attempt, after the audio is safe. It runs on whatever metadata exists,
-	// so it covers well-tagged music; the Hae sanoitukset button on the waiting page is what
-	// covers everything else, once the submitter has fixed the title and artist.
-	var title, artist string
-	if err := a.db.QueryRowContext(ctx,
-		`select coalesce(title, ''), coalesce(artist, '') from submissions where id = $1`,
-		subID).Scan(&title, &artist); err != nil {
-		return
-	}
-	seconds := 0
-	if meta, err := probe(ctx, out); err == nil {
-		seconds = int(meta.Duration.Seconds())
-	}
-	a.autoFetchLyrics(ctx, subID, title, artist, seconds)
 }
 
 func (a *app) setStatus(ctx context.Context, subID int64, status, msg string) {
-	if _, err := a.db.ExecContext(ctx,
+	if _, err := a.pool.Exec(ctx,
 		`update submissions set status = $2, status_msg = nullif($3, '') where id = $1`,
 		subID, status, msg); err != nil {
 		slog.Error("set status", "ctx", "submissions", "error", err, "submission", subID)
@@ -411,14 +396,14 @@ func (a *app) loadSubmission(w http.ResponseWriter, r *http.Request) *submission
 		return nil
 	}
 	var s submission
-	err = a.db.QueryRowContext(r.Context(), `
+	err = a.pool.QueryRow(r.Context(), `
 		select id, user_id, status, status_msg, source_url, coalesce(tmp_path, ''),
 		       coalesce(title, ''), coalesce(artist, ''), coalesce(genre, ''),
-		       coalesce(description, ''), coalesce(lyrics, ''), created_at
+		       coalesce(description, ''), created_at
 		  from submissions where id = $1`, id).
 		Scan(&s.ID, &s.UserID, &s.Status, &s.StatusMsg, &s.SourceURL, &s.TmpPath,
-			&s.Title, &s.Artist, &s.Genre, &s.Description, &s.Lyrics, &s.CreatedAt)
-	if errors.Is(err, sql.ErrNoRows) {
+			&s.Title, &s.Artist, &s.Genre, &s.Description, &s.CreatedAt)
+	if errors.Is(err, pgx.ErrNoRows) {
 		http.NotFound(w, r)
 		return nil
 	} else if err != nil {
@@ -459,34 +444,19 @@ func (a *app) submissionStatus(w http.ResponseWriter, r *http.Request) {
 // no save button: HTMX posts here after a pause in typing, and pressing Julkaise posts the same
 // fields to publish, so a browser without JS loses nothing.
 func (a *app) saveMetadata(ctx context.Context, subID int64, r *http.Request) error {
-	// r.Form is only populated once the body has been parsed, and the check below reads it.
-	if err := r.ParseForm(); err != nil {
-		return err
-	}
 	genre := r.FormValue("genre")
 	if genre != "" && !validGenre(genre) {
 		return fmt.Errorf("unknown genre %q", genre)
 	}
-	// A field the request does not carry keeps its stored value. Without this, any post that omits
-	// a field silently clears it — which is exactly how a publish request wiped lyrics that the
-	// worker had just fetched.
-	has := func(field string) bool { _, ok := r.Form[field]; return ok }
-
-	_, err := a.db.ExecContext(ctx, `
-		update submissions set
-		       title       = case when $2 then nullif($3, '') else title end,
-		       artist      = case when $4 then nullif($5, '') else artist end,
-		       genre       = case when $6 then nullif($7, '') else genre end,
-		       description = case when $8 then nullif($9, '') else description end,
-		       lyrics      = case when $10 then nullif($11, '') else lyrics end
+	_, err := a.pool.Exec(ctx, `
+		update submissions set title = nullif($2, ''), artist = nullif($3, ''),
+		       genre = nullif($4, ''), description = nullif($5, '')
 		 where id = $1`,
 		subID,
-		has("title"), clean(r.FormValue("title"), maxTitle),
-		has("artist"), clean(r.FormValue("artist"), maxArtist),
-		has("genre"), genre,
-		has("description"), clean(r.FormValue("description"), maxDescription),
-		// Line breaks are the whole point of lyrics, so they survive rather than being cleaned away.
-		has("lyrics"), cleanLyrics(r.FormValue("lyrics")))
+		clean(r.FormValue("title"), maxTitle),
+		clean(r.FormValue("artist"), maxArtist),
+		genre,
+		clean(r.FormValue("description"), maxDescription))
 	return err
 }
 
@@ -556,21 +526,20 @@ func (a *app) publish(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tx, err := a.db.BeginTx(r.Context(), nil)
+	tx, err := a.pool.Begin(r.Context())
 	if err != nil {
 		slog.Error("begin publish", "ctx", "submissions", "error", err)
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	defer tx.Rollback()
+	defer tx.Rollback(r.Context())
 
 	var songID int64
-	err = tx.QueryRowContext(r.Context(), `
-		insert into songs (title, artist, genre, description, lyrics, audio_file, duration_seconds,
+	err = tx.QueryRow(r.Context(), `
+		insert into songs (title, artist, genre, description, audio_file, duration_seconds,
 		                   source_url, submitted_by)
-		values ($1, $2, $3, $4, $5, '', $6, $7, $8) returning id`,
+		values ($1, $2, $3, $4, '', $5, $6, $7) returning id`,
 		title, artist, genre, nilIfEmpty(clean(s.Description, maxDescription)),
-		nilIfEmpty(cleanLyrics(s.Lyrics)),
 		int(meta.Duration.Seconds()), s.SourceURL, s.UserID).Scan(&songID)
 	if err != nil {
 		slog.Error("insert song", "ctx", "songs", "error", err, "submission", s.ID)
@@ -586,7 +555,7 @@ func (a *app) publish(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	if _, err := tx.ExecContext(r.Context(),
+	if _, err := tx.Exec(r.Context(),
 		`update songs set audio_file = $2 where id = $1`,
 		songID, filepath.Base(dst)); err != nil {
 		os.Rename(dst, src)
@@ -594,13 +563,13 @@ func (a *app) publish(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	if _, err := tx.ExecContext(r.Context(), `delete from submissions where id = $1`, s.ID); err != nil {
+	if _, err := tx.Exec(r.Context(), `delete from submissions where id = $1`, s.ID); err != nil {
 		os.Rename(dst, src)
 		slog.Error("delete submission", "ctx", "submissions", "error", err, "submission", s.ID)
 		http.Error(w, "virhe", http.StatusInternalServerError)
 		return
 	}
-	if err := tx.Commit(); err != nil {
+	if err := tx.Commit(r.Context()); err != nil {
 		os.Rename(dst, src)
 		slog.Error("commit publish", "ctx", "songs", "error", err, "submission", s.ID)
 		http.Error(w, "virhe", http.StatusInternalServerError)
@@ -634,7 +603,7 @@ func nilIfEmpty(s string) *string {
 
 // Own in-flight submissions, for the home page — otherwise a submission is only reachable by URL.
 func (a *app) mySubmissions(ctx context.Context, userID int64) ([]*submission, error) {
-	rows, err := a.db.QueryContext(ctx, `
+	rows, err := a.pool.Query(ctx, `
 		select id, user_id, status, status_msg, source_url, coalesce(tmp_path, ''),
 		       coalesce(title, ''), coalesce(artist, ''), coalesce(genre, ''),
 		       coalesce(description, ''), created_at

submit_test.go

@@ -49,7 +49,7 @@ func makeAudio(t *testing.T, path string) {
 func (a *app) readySubmission(t *testing.T, userID int64) *submission {
 	t.Helper()
 	var id int64
-	err := a.db.QueryRowContext(context.Background(), `
+	err := a.pool.QueryRow(context.Background(), `
 		insert into submissions (user_id, status, title, artist, genre)
 		values ($1, 'ready', 'Testikappale', 'Testiartisti', 'Metal') returning id`,
 		userID).Scan(&id)
@@ -58,7 +58,7 @@ func (a *app) readySubmission(t *testing.T, userID int64) *submission {
 	}
 	path := a.tmpPath(id, ".ogg")
 	makeAudio(t, path)
-	if _, err := a.db.ExecContext(context.Background(),
+	if _, err := a.pool.Exec(context.Background(),
 		`update submissions set tmp_path = $2 where id = $1`, id, path); err != nil {
 		t.Fatal(err)
 	}
@@ -96,13 +96,13 @@ func TestPublishIsAllOrNothing(t *testing.T) {
 		t.Fatalf("publish with an unwritable audio dir: status = %d, want 500", w.Code)
 	}
 	var songs, submissions int
-	if err := a.db.QueryRowContext(ctx, `select count(*) from songs`).Scan(&songs); err != nil {
+	if err := a.pool.QueryRow(ctx, `select count(*) from songs`).Scan(&songs); err != nil {
 		t.Fatal(err)
 	}
 	if songs != 0 {
 		t.Fatalf("orphan song row: %d rows with no audio file", songs)
 	}
-	if err := a.db.QueryRowContext(ctx, `select count(*) from submissions`).Scan(&submissions); err != nil {
+	if err := a.pool.QueryRow(ctx, `select count(*) from submissions`).Scan(&submissions); err != nil {
 		t.Fatal(err)
 	}
 	if submissions != 1 {
@@ -120,13 +120,13 @@ func TestPublishIsAllOrNothing(t *testing.T) {
 		t.Fatalf("publish: status = %d, want 303", w.Code)
 	}
 	var songID int64
-	if err := a.db.QueryRowContext(ctx, `select id from songs`).Scan(&songID); err != nil {
+	if err := a.pool.QueryRow(ctx, `select id from songs`).Scan(&songID); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := os.Stat(a.audioPath(songID)); err != nil {
 		t.Fatalf("published song has no audio file: %v", err)
 	}
-	if err := a.db.QueryRowContext(ctx, `select count(*) from submissions`).Scan(&submissions); err != nil {
+	if err := a.pool.QueryRow(ctx, `select count(*) from submissions`).Scan(&submissions); err != nil {
 		t.Fatal(err)
 	}
 	if submissions != 0 {
@@ -154,7 +154,7 @@ func TestSubmissionQuota(t *testing.T) {
 	check(false, "no submissions")
 
 	for range 4 {
-		if _, err := a.db.ExecContext(ctx,
+		if _, err := a.pool.Exec(ctx,
 			`insert into submissions (user_id, status) values ($1, 'ready')`, id); err != nil {
 			t.Fatal(err)
 		}
@@ -163,7 +163,7 @@ func TestSubmissionQuota(t *testing.T) {
 
 	// Failures never count — yt-dlp rot and bad files are not the submitter's fault.
 	for range 10 {
-		if _, err := a.db.ExecContext(ctx,
+		if _, err := a.pool.Exec(ctx,
 			`insert into submissions (user_id, status) values ($1, 'failed')`, id); err != nil {
 			t.Fatal(err)
 		}
@@ -171,7 +171,7 @@ func TestSubmissionQuota(t *testing.T) {
 	check(false, "failures do not count")
 
 	// A published song still occupies a slot, even though its submission row is gone.
-	if _, err := a.db.ExecContext(ctx, `
+	if _, err := a.pool.Exec(ctx, `
 		insert into songs (title, artist, genre, audio_file, duration_seconds, submitted_by)
 		values ('T', 'A', 'Metal', '1.ogg', 60, $1)`, id); err != nil {
 		t.Fatal(err)
@@ -179,8 +179,8 @@ func TestSubmissionQuota(t *testing.T) {
 	check(true, "four in flight plus one published")
 
 	// Yesterday's submissions are outside the window.
-	if _, err := a.db.ExecContext(ctx,
-		`update submissions set created_at = datetime('now', '-25 hours') where user_id = $1`,
+	if _, err := a.pool.Exec(ctx,
+		`update submissions set created_at = now() - interval '25 hours' where user_id = $1`,
 		id); err != nil {
 		t.Fatal(err)
 	}
@@ -194,17 +194,17 @@ func TestRestartRecovery(t *testing.T) {
 	id := a.seedMember(t, "[email protected]")
 
 	for _, status := range []string{"queued", "downloading", "converting"} {
-		if _, err := a.db.ExecContext(ctx,
+		if _, err := a.pool.Exec(ctx,
 			`insert into submissions (user_id, status) values ($1, $2)`, id, status); err != nil {
 			t.Fatal(err)
 		}
 	}
-	if err := sweep(ctx, a.db); err != nil {
+	if err := sweep(ctx, a.pool); err != nil {
 		t.Fatal(err)
 	}
 
 	var stuck int
-	if err := a.db.QueryRowContext(ctx,
+	if err := a.pool.QueryRow(ctx,
 		`select count(*) from submissions where status <> 'failed'`).Scan(&stuck); err != nil {
 		t.Fatal(err)
 	}
@@ -212,7 +212,7 @@ func TestRestartRecovery(t *testing.T) {
 		t.Fatalf("%d submissions survived the sweep still in flight", stuck)
 	}
 	var msg string
-	if err := a.db.QueryRowContext(ctx,
+	if err := a.pool.QueryRow(ctx,
 		`select status_msg from submissions limit 1`).Scan(&msg); err != nil {
 		t.Fatal(err)
 	}

templates/admin.html

@@ -13,11 +13,8 @@
     <tbody>
       {{range .Data.Invites}}
         <tr>
-          <!-- Not a link: an invite is something to send, never to follow. A click used to open the
-               join form in the admin's own browser, which is never what was wanted. -->
-          <td class="invitecell">
-            <code>{{.Link}}</code>
-            <button type="button" class="ghost" onclick="copyInvite(this)">Kopioi</button>
+          <td>
+            <a href="{{.Link}}">{{.Link}}</a>
           </td>
           <td class="nowrap"><span class="dot on"></span> käyttämätön</td>
           <td>{{fidate .CreatedAt}}</td>
@@ -90,29 +87,4 @@
   </div>
 </section>
 
-<script>
-  // The clipboard API needs a secure context. Over the documented SSH tunnel the origin is
-  // localhost, which qualifies; reached any other way it is missing, so selecting the text is the
-  // fallback — the admin presses Ctrl+C instead of being left with a button that does nothing.
-  function copyInvite(button) {
-    const link = button.previousElementSibling;
-    const done = () => {
-      button.textContent = 'Kopioitu';
-      setTimeout(() => { button.textContent = 'Kopioi'; }, 1500);
-    };
-    if (navigator.clipboard) {
-      navigator.clipboard.writeText(link.textContent).then(done, () => selectText(link));
-    } else {
-      selectText(link);
-    }
-  }
-
-  function selectText(el) {
-    const range = document.createRange();
-    range.selectNodeContents(el);
-    const sel = window.getSelection();
-    sel.removeAllRanges();
-    sel.addRange(range);
-  }
-</script>
 {{end}}

templates/layout.html

@@ -9,7 +9,6 @@
   <link rel="stylesheet" href="/static/style.css">
   <script src="/static/htmx.min.js" defer></script>
   <script src="/static/player.js" defer></script>
-  <script src="/static/lyrics.js" defer></script>
 </head>
 <body>
   <header class="topbar">
@@ -62,7 +61,7 @@
   <footer class="sitefooter">
     {{if .Member}}
       <!-- The server already knows where they were, so the path travels in the link — no JS. -->
-      <a href="/report?from={{.Path}}">Ongelmia? Ideoita? Palautetta?</a> ·
+      <a href="/report?from={{.Path}}">Ilmoita ongelmasta</a> ·
     {{end}}
     <span class="slogan">We know good music, baby!</span>
     <span class="copyright">© Kessinen</span>

templates/partials/player.html

@@ -1,30 +1,3 @@
-{{/* Two shapes, because timed lyrics and guessed lyrics deserve different treatment.
-     Synced: one element per line with its own timestamp, highlighted as it comes.
-     Plain: one block that scrolls continuously, with a nudge knob, because a highlight on evenly
-     guessed timings turns guaranteed drift into what looks like a bug. */}}
-{{define "lyricsview"}}
-<span class="cap">Sanoitukset</span>
-{{$lines := .LyricLines}}
-{{if $lines}}
-  <div class="lyricsbox synced" data-song="{{.ID}}">
-    {{range $lines}}<p class="lline" data-t="{{.At}}">{{if .Text}}{{.Text}}{{else}}&nbsp;{{end}}</p>{{end}}
-  </div>
-  <label class="follow">
-    <input type="checkbox" checked> Seuraa kappaletta
-    <span class="muted small">— korostus jatkuu, sivu ei vieri</span>
-  </label>
-{{else}}
-  <div class="lyricsbox plain" data-duration="{{.Duration}}" data-song="{{.ID}}">
-    <div class="lscroll">{{lyricstext .Lyrics}}</div>
-  </div>
-  <label class="nudge">
-    Ajoitus
-    <input type="range" min="-10" max="10" step="0.5" value="0" aria-label="Ajoituksen siirto sekunteina">
-    <output>0 s</output>
-  </label>
-{{end}}
-{{end}}
-
 {{define "player"}}
 <!-- Ships with native controls; player.js removes them and drives the same element. No JS means
      the browser's own player, which is plain but complete. -->

templates/report.html

@@ -1,13 +1,13 @@
 {{define "content"}}
 <h1>Palaute</h1>
-<p class="muted">Ongelmat, ideat ja kaikki muu palaute samaan paikkaan. Ei kategorioita eikä
-  prioriteetteja — yksi virke riittää.</p>
+<p class="muted">Kerro mikä on rikki tai ärsyttää. Ei kategorioita eikä prioriteetteja — yksi
+  virke riittää.</p>
 
 <form method="post" action="/report" class="stack">
   <input type="hidden" name="from" value="{{.Data.From}}">
   <label>Palaute
     <textarea name="body" rows="6" maxlength="2000" required autofocus
-              placeholder="Esim. soittimeen kaipaisi kelausta."></textarea>
+              placeholder="Esim. soitin ei toimi puhelimella."></textarea>
   </label>
   <button type="submit">Lähetä palaute</button>
 </form>

templates/song.html

@@ -49,16 +49,9 @@
     <div class="deck">
       {{template "player" $s}}
       {{with $s.Description}}<p class="intro">{{.}}</p>{{end}}
-
-      <!-- Two panes when the song has lyrics: read on the left, write on the right, so following
-           the words costs no scrolling. Without lyrics the pane is absent, not empty. -->
-      <div class="panes{{if not $s.Lyrics}} solo{{end}}">
-        {{if $s.Lyrics}}
-          <div class="lyricspane">{{template "lyricsview" $s}}</div>
-        {{end}}
-        <div class="writepane">
       <label class="grow">Arvostelu
-            <textarea name="text" maxlength="5000" required placeholder="Mitä kuulit?"></textarea>
+        <textarea name="text" rows="8" maxlength="5000" required
+                  placeholder="Mitä kuulit?"></textarea>
       </label>
       <div class="deckfoot">
         <button type="submit">Tallenna arvostelu</button>
@@ -66,35 +59,13 @@
           tai poistaa arvostelusi 30 minuutin ajan.</span>
       </div>
     </div>
-      </div>
-    </div>
   </form>
 {{else}}
   {{template "player" $s}}
   {{with $s.Description}}<p class="intro">{{.}}</p>{{end}}
 {{end}}
 
-{{/* New tab: leaving the page mid-review would lose whatever is already typed in the form. */}}
-{{with $s.SourceURL}}<p class="muted small"><a href="{{.}}" target="_blank" rel="noreferrer">Kuuntele YouTubessa</a></p>{{end}}
-
-{{if and (not $s.CanReview) (or $s.Lyrics $s.Own)}}
-<!-- Only when the review strip is not already showing them: while reviewing, the lyrics live in
-     the left pane. This panel is for reading afterwards and for the submitter's edits. -->
-<details class="lyrics">
-  <summary>Sanoitukset{{if not $s.Lyrics}} <span class="muted small">— ei vielä lisätty</span>{{end}}</summary>
-  {{if $s.Lyrics}}<pre class="lyricstext">{{lyricstext $s.Lyrics}}</pre>{{end}}
-  {{if $s.Own}}
-    <form method="post" action="/songs/{{$s.ID}}/lyrics" class="stack">
-      <label>Muokkaa sanoituksia
-        <textarea name="lyrics" rows="10" maxlength="20000"
-                  placeholder="Liitä sanoitukset tähän.">{{$s.Lyrics}}</textarea>
-      </label>
-      <button type="submit">Tallenna sanoitukset</button>
-    </form>
-    <p class="muted small">Sanoituksia voi muokata vielä arvostelujenkin jälkeen.</p>
-  {{end}}
-</details>
-{{end}}
+{{with $s.SourceURL}}<p class="muted small"><a href="{{.}}" rel="noreferrer">Kuuntele YouTubessa</a></p>{{end}}
 
 {{if $s.ViewerReview}}
 <section>

templates/submission.html

@@ -31,28 +31,6 @@
 
 {{define "saved"}}<span id="saved" class="saved">{{if .}}Tallennettu {{.}}{{end}}</span>{{end}}
 
-<!-- Included by the page and returned alone by the suggestion button, so the markup exists once.
-     hx-include sends the current title and artist, which is the whole point: the lookup uses what
-     the submitter just fixed, not what the tags claimed. -->
-{{define "lyricsfield"}}
-<div id="lyricsfield">
-  <label>Sanoitukset <span class="muted small">(vapaaehtoinen)</span>
-    <textarea name="lyrics" rows="8" maxlength="20000"
-              placeholder="Liitä sanoitukset tähän tai hae ne alta.">{{.Lyrics}}</textarea>
-  </label>
-  <div class="lyricsbar">
-    <button type="button" class="ghost"
-            hx-post="/submit/{{.ID}}/lyrics"
-            hx-include="[name='title'], [name='artist']"
-            hx-target="#lyricsfield" hx-swap="outerHTML">Hae sanoitukset</button>
-    {{if .Found}}<span class="muted small">Löytyi — tarkista ja muokkaa tarvittaessa.</span>{{end}}
-    {{if .Searched}}{{if not .Found}}
-      <span class="muted small">Ei löytynyt. Tarkista nimi ja esittäjä tai liitä sanoitukset itse.</span>
-    {{end}}{{end}}
-  </div>
-</div>
-{{end}}
-
 {{define "content"}}
 <h1>Lähetys</h1>
 
@@ -80,7 +58,6 @@
   <label>Esittely <span class="muted small">(vapaaehtoinen)</span>
     <textarea name="description" rows="5" maxlength="2000">{{.Data.Description}}</textarea>
   </label>
-  {{template "lyricsfield" dict "ID" .Data.ID "Lyrics" .Data.Lyrics}}
   {{template "saved" ""}}
 </form>