Start test servers on a port the system picks (closes #211)

The internal/server and internal/ircserver tests picked a port by
opening a listener, reading its port and closing it. They then started
a server on that number. Another process could take the port in
between, and a test failed with "address already in use".

The IRC server tests now start the server on 127.0.0.1:0 and read the
port back from its listener. The HTTP server tests start the app with
port 0. The stop test cannot read that port, so it serves the same HTTP
server on a listener it opened and keeps open.

Only test files change.

Model: opus-5-5

AGENTS.md

@@ -1,73 +1,55 @@
-# Rules for coding agents
+# AGENTS.md — Rules for AI Agents
 
-This file holds the rules for coding agents working in this repository.
+## Before Every Commit
-`CONVENTIONS.md` defines the architecture. `REPO_POLICIES.md` defines the
-repository standards. Both are copies of shared documents. Do not edit them
-here.
 
-## Before every commit
+1. **Format**: `make fmt`
+2. **Check**: `make check` — the tests and the linter, which run in Docker, and
+   the format check: all passing, zero issues
 
-1. Run `make fmt`.
+Never run `go test`, `golangci-lint` or `gofmt` directly; use the `make`
-2. Run `make check`. It runs the tests and the linter in Docker, then the format
+targets.
-   check. All three must pass with no findings.
 
-Never run `go test`, `golangci-lint` or `gofmt` directly. Use the `make` targets
+No commit lands on main with lint errors, test failures, or formatting issues.
-instead, such as `make test` and `make lint`.
 
-## Branches and pull requests
+## Code Style
 
-- Never commit to `main` or `next` directly. Every change is a pull request from
+- Follow CONVENTIONS.md exactly — it defines the architecture
-  a feature branch into `next`.
+- All exported types, functions, methods, and vars must have doc comments
-- Only the owner merges `next` into `main`.
+- All packages must have a package doc comment
-- A pull request that closes an issue has the title `Description (closes #N)`.
+- JSON tags use camelCase (not snake_case)
-- One logical change per commit.
+- No magic numbers — use named constants
-- Commit messages are in the imperative mood and short.
+- No inline error handling (`if err := ...; err != nil`) — use plain assignment
+- Blank line before every `return` statement
+- Blank line separating embedded fields from regular fields in structs
+- Blank imports must have a justification comment
 
-## Code style
+## Git Workflow
 
-- Follow `CONVENTIONS.md`.
+- **Never commit directly to main** — all changes go on feature branches
-- Every package has a package doc comment. Test files need none.
+- Merge to main only when ready and passing all checks
-- Every exported type, function and variable has a doc comment. Test files need
+- PR titles: `Description (closes #N)` when closing an issue
-  none.
+- One logical change per commit
-- JSON tags are camelCase. The HTTP API's `last_id`, `pow_token` and
+- Commit messages: imperative mood, concise
-  `hashcash_bits` stay as they are, each with a `//nolint:tagliatelle` comment.
-- Prefer named constants to magic numbers. The `mnd` linter checks for them
-  outside test files.
-- No inline error handling such as `if err := f(); err != nil`. Assign the error
-  on its own line, then test it.
-- A `return` that follows another statement in its block has a blank line before
-  it.
-- A blank line between the embedded fields of a struct and its other fields.
-- Every blank import has a comment saying why it is there. Test files need none.
 
 ## Architecture
 
-- The server uses `go.uber.org/fx` for dependency injection.
+- Dependency injection via Uber fx — all components are fx providers
-  `cmd/neoircd/main.go` lists its `fx` providers, such as `db.New` and
+- `internal/` for all application packages — one package per concern
-  `handlers.New`.
+- Handlers return `http.HandlerFunc` using the closure pattern
-- Application packages live under `internal/`, one package per concern.
+- Request/response structs defined inside handler closures
-- `pkg/irc` holds the IRC command names and numeric reply codes.
+- Models embed `models.Base` for database access to relation methods
-- The `web` package embeds the built web client.
+- Database migrations in `internal/db/schema/` — embedded via `go:embed`
-- Each exported `Handle…` method of `Handlers` returns an `http.HandlerFunc`.
+- SQLite by default (pure Go driver: modernc.org/sqlite)
-- A request struct is defined inside the method that decodes it.
-- The server uses the database only through the methods of `db.Database`.
-- The database migrations live in `internal/db/schema/` and are embedded with
-  `go:embed`.
-- The database is SQLite, through the pure Go driver `modernc.org/sqlite`.
 
 ## Testing
 
-- Prefer table-driven tests.
+- Table-driven tests preferred
-- Use `testing.T` helpers, not assertion libraries.
+- Use `testing.T` helpers, not assertion libraries
-- A test file lives next to the code it tests and ends in `_test.go`.
+- Test files live next to the code they test
-- The linter requires each test file to be in the package's external test
+- `_test.go` suffix, same package for white-box testing
-  package, such as `handlers_test`. It allows `export_test.go` and files ending
-  in `_internal_test.go` in the package itself.
-- An `export_test.go` file gives the external tests access to the package's
-  unexported code.
 
 ## Dependencies
 
-- The required libraries are listed in `CONVENTIONS.md` §1.
+- Required libraries are listed in CONVENTIONS.md §1
-- No new dependency without a reason given in the pull request.
+- No new dependencies without justification
-- Prefer dependencies written in pure Go, which build without cgo.
+- Pure Go preferred (no CGO)

Dockerfile

@@ -33,18 +33,14 @@ RUN golangci-lint run --config .golangci.yml ./...
 # golang:1.24.13-bookworm, 2026-10-06
 FROM golang@sha256:1a6d4452c65dea36aac2e2d606b01b4a029ec90cc1ae53890540ce6173ea77ac AS test
 WORKDIR /src
+COPY go.mod go.sum ./
+RUN go mod download
 COPY . .
 RUN mkdir -p web/dist && touch web/dist/index.html web/dist/style.css web/dist/app.js
 # -p 4 because test runs on a shared build host cap their parallelism.
-# The modules download in this RUN rather than a layer of their own, because
+RUN go test -p 4 -timeout 90s -race -cover ./... || \
-# exporting a layer that holds them is slow. Nothing reads them or the build
-# cache afterwards, so go clean removes both.
-RUN set -e; \
-    go mod download; \
-    go test -p 4 -timeout 90s -race -cover ./... || \
     { echo "--- Rerunning with -v for details ---"; \
-      go test -p 4 -timeout 90s -race -v ./...; exit 1; }; \
+      go test -p 4 -timeout 90s -race -v ./...; exit 1; }
-    go clean -cache -modcache
 
 # Build stage. Nothing is wanted from either phase above; the copies
 # are what make BuildKit build them first, so this stage cannot run

internal/cli/app.go

@@ -34,30 +34,13 @@ type App struct {
 
 // Run creates and runs the CLI application.
 func Run() {
-	err := run(NewUI())
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-		os.Exit(1)
-	}
-}
-
-// run starts the client on ui and returns when ui stops. Tests
-// call it with ui on a simulation screen.
-func run(ui *UI) error {
 	app := &App{ //nolint:exhaustruct
-		ui:   ui,
+		ui:   NewUI(),
 		nick: "guest",
 	}
 
 	app.ui.OnInput(app.handleInput)
-
+	app.ui.SetStatus(app.nick, "", "disconnected")
-	// SetStatus and AddStatus wait for the event loop, which
-	// app.ui.Run starts below, so they run on a goroutine. The
-	// nick is read first, as a typed /nick may change app.nick.
-	nick := app.nick
-
-	go func() {
-		app.ui.SetStatus(nick, "", "disconnected")
 
 	app.ui.AddStatus(
 		"Welcome to neoirc-cli — an IRC-style client",
@@ -67,9 +50,12 @@ func run(ui *UI) error {
 			"[white] to begin, " +
 			"or [yellow]/help[white] for commands",
 	)
-	}()
 
-	return app.ui.Run()
+	err := app.ui.Run()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		os.Exit(1)
+	}
 }
 
 func (a *App) handleInput(text string) {
@@ -108,7 +94,7 @@ func (a *App) handleInput(text string) {
 	})
 	if err != nil {
 		a.ui.AddStatus(
-			"[red]Send error: " + escape(err.Error()),
+			"[red]Send error: " + err.Error(),
 		)
 	}
 }
@@ -166,7 +152,7 @@ func (a *App) dispatchInfoCommand(cmd, args string) {
 		a.cmdWhois(args)
 	default:
 		a.ui.AddStatus(
-			"[red]Unknown command: " + escape(cmd),
+			"[red]Unknown command: " + cmd,
 		)
 	}
 }
@@ -182,7 +168,7 @@ func (a *App) cmdConnect(serverURL string) {
 
 	serverURL = strings.TrimRight(serverURL, "/")
 
-	a.ui.AddStatus("Connecting to " + escape(serverURL) + "...")
+	a.ui.AddStatus("Connecting to " + serverURL + "...")
 
 	a.mu.Lock()
 	nick := a.nick
@@ -192,37 +178,29 @@ func (a *App) cmdConnect(serverURL string) {
 
 	resp, err := client.CreateSession(nick)
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Connection failed: " + escape(err.Error()),
+			"[red]Connection failed: %v", err,
-		)
+		))
 
 		return
 	}
 
-	// The poll loop of an earlier connection is stopped in the same
-	// step that replaces the client, so it never polls with the new
-	// one.
 	a.mu.Lock()
 	a.client = client
 	a.nick = resp.Nick
 	a.connected = true
 	a.lastQID = 0
-
-	if a.stopPoll != nil {
-		close(a.stopPoll)
-	}
-
-	stop := make(chan struct{})
-	a.stopPoll = stop
 	a.mu.Unlock()
 
 	a.ui.AddStatus(fmt.Sprintf(
 		"[green]Connected! Nick: %s, Session: %d",
-		escape(resp.Nick), resp.ID,
+		resp.Nick, resp.ID,
 	))
 	a.ui.SetStatus(resp.Nick, "", "connected")
 
-	go a.pollLoop(stop)
+	a.stopPoll = make(chan struct{})
+
+	go a.pollLoop()
 }
 
 func (a *App) cmdNick(nick string) {
@@ -244,7 +222,7 @@ func (a *App) cmdNick(nick string) {
 		a.mu.Unlock()
 
 		a.ui.AddStatus(
-			"Nick set to " + escape(nick) +
+			"Nick set to " + nick +
 				" (will be used on connect)",
 		)
 
@@ -256,9 +234,9 @@ func (a *App) cmdNick(nick string) {
 		Body:    []string{nick},
 	})
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Nick change failed: " + escape(err.Error()),
+			"[red]Nick change failed: %v", err,
-		)
+		))
 
 		return
 	}
@@ -269,7 +247,7 @@ func (a *App) cmdNick(nick string) {
 	a.mu.Unlock()
 
 	a.ui.SetStatus(nick, target, "connected")
-	a.ui.AddStatus("Nick changed to " + escape(nick))
+	a.ui.AddStatus("Nick changed to " + nick)
 }
 
 func (a *App) cmdJoin(channel string) {
@@ -297,9 +275,9 @@ func (a *App) cmdJoin(channel string) {
 
 	err := a.client.JoinChannel(channel)
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Join failed: " + escape(err.Error()),
+			"[red]Join failed: %v", err,
-		)
+		))
 
 		return
 	}
@@ -337,9 +315,9 @@ func (a *App) cmdPart(channel string) {
 
 	err := a.client.PartChannel(channel)
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Part failed: " + escape(err.Error()),
+			"[red]Part failed: %v", err,
-		)
+		))
 
 		return
 	}
@@ -384,9 +362,9 @@ func (a *App) cmdMsg(args string) {
 		Body:    []string{text},
 	})
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Send failed: " + escape(err.Error()),
+			"[red]Send failed: %v", err,
-		)
+		))
 	}
 }
 
@@ -402,16 +380,10 @@ func (a *App) cmdQuery(nick string) {
 	a.mu.Lock()
 	a.target = nick
 	myNick := a.nick
-	connected := a.connected
 	a.mu.Unlock()
 
-	connStatus := "disconnected"
-	if connected {
-		connStatus = "connected"
-	}
-
 	a.ui.SwitchToBuffer(nick)
-	a.ui.SetStatus(myNick, nick, connStatus)
+	a.ui.SetStatus(myNick, nick, "connected")
 }
 
 func (a *App) cmdTopic(args string) {
@@ -445,9 +417,9 @@ func (a *App) cmdTopic(args string) {
 		Body:    []string{args},
 	})
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Topic set failed: " + escape(err.Error()),
+			"[red]Topic set failed: %v", err,
-		)
+		))
 	}
 }
 
@@ -471,9 +443,9 @@ func (a *App) cmdNames() {
 
 	members, err := a.client.GetMembers(target)
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Names failed: " + escape(err.Error()),
+			"[red]Names failed: %v", err,
-		)
+		))
 
 		return
 	}
@@ -486,7 +458,7 @@ func (a *App) cmdNames() {
 
 	a.ui.AddLine(target, fmt.Sprintf(
 		"[cyan]*** Members of %s: %s",
-		escape(target), escape(strings.Join(nicks, " ")),
+		target, strings.Join(nicks, " "),
 	))
 }
 
@@ -517,9 +489,9 @@ func (a *App) cmdList() {
 
 	channels, err := a.client.ListChannels()
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]List failed: " + escape(err.Error()),
+			"[red]List failed: %v", err,
-		)
+		))
 
 		return
 	}
@@ -528,7 +500,7 @@ func (a *App) cmdList() {
 
 	for _, ch := range channels {
 		a.ui.AddStatus(fmt.Sprintf(
-			"  %s %s", escape(ch.Name), escape(ch.Topic),
+			"  %s %s", ch.Name, ch.Topic,
 		))
 	}
 
@@ -550,9 +522,9 @@ func (a *App) cmdMotd() {
 		&api.Message{Command: irc.CmdMotd}, //nolint:exhaustruct
 	)
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]MOTD failed: " + escape(err.Error()),
+			"[red]MOTD failed: %v", err,
-		)
+		))
 	}
 }
 
@@ -588,9 +560,9 @@ func (a *App) cmdWho(args string) {
 		},
 	)
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]WHO failed: " + escape(err.Error()),
+			"[red]WHO failed: %v", err,
-		)
+		))
 	}
 }
 
@@ -619,9 +591,9 @@ func (a *App) cmdWhois(args string) {
 		},
 	)
 	if err != nil {
-		a.ui.AddStatus(
+		a.ui.AddStatus(fmt.Sprintf(
-			"[red]WHOIS failed: " + escape(err.Error()),
+			"[red]WHOIS failed: %v", err,
-		)
+		))
 	}
 }
 
@@ -638,37 +610,24 @@ func (a *App) cmdWindow(args string) {
 
 	_, _ = fmt.Sscanf(args, "%d", &bufIndex)
 
-	a.mu.Lock()
-	nick := a.nick
-	connected := a.connected
-	a.mu.Unlock()
-
-	connStatus := "disconnected"
-	if connected {
-		connStatus = "connected"
-	}
-
-	// Read the name before switching. A message from the server can
-	// add a buffer at any time, but only at the end, so bufIndex
-	// still names this buffer when SwitchBuffer runs.
-	name, found := a.ui.BufferName(bufIndex)
-	if found {
 	a.ui.SwitchBuffer(bufIndex)
 
-		if name != "(status)" {
 	a.mu.Lock()
-			a.target = name
+	nick := a.nick
+	a.mu.Unlock()
+
+	if bufIndex >= 0 && bufIndex < a.ui.BufferCount() {
+		buf := a.ui.buffers[bufIndex]
+		if buf.Name != "(status)" {
+			a.mu.Lock()
+			a.target = buf.Name
 			a.mu.Unlock()
 
 			a.ui.SetStatus(
-				nick, name, connStatus,
+				nick, buf.Name, "connected",
 			)
 		} else {
-			a.mu.Lock()
+			a.ui.SetStatus(nick, "", "connected")
-			a.target = ""
-			a.mu.Unlock()
-
-			a.ui.SetStatus(nick, "", connStatus)
 		}
 	}
 }
@@ -716,23 +675,16 @@ func (a *App) cmdHelp() {
 	}
 }
 
-// pollLoop long-polls for messages in the background until stop is
+// pollLoop long-polls for messages in the background.
-// closed. A later /connect closes stop under a.mu as it replaces the
+func (a *App) pollLoop() {
-// client and the cursor, so the loop checks stop under a.mu too. A
-// stopped loop then neither polls with the new client nor moves the
-// new cursor.
-func (a *App) pollLoop(stop <-chan struct{}) {
 	for {
-		a.mu.Lock()
-
 		select {
-		case <-stop:
+		case <-a.stopPoll:
-			a.mu.Unlock()
-
 			return
 		default:
 		}
 
+		a.mu.Lock()
 		client := a.client
 		lastQID := a.lastQID
 		a.mu.Unlock()
@@ -750,23 +702,11 @@ func (a *App) pollLoop(stop <-chan struct{}) {
 			continue
 		}
 
-		// A poll sent before stop was closed answers for the earlier
-		// connection.
-		a.mu.Lock()
-
-		select {
-		case <-stop:
-			a.mu.Unlock()
-
-			return
-		default:
-		}
-
 		if result.LastID > 0 {
+			a.mu.Lock()
 			a.lastQID = result.LastID
-		}
-
 			a.mu.Unlock()
+		}
 
 		for i := range result.Messages {
 			a.handleServerMessage(&result.Messages[i])
@@ -824,7 +764,7 @@ func (a *App) handlePrivmsgEvent(
 
 	a.ui.AddLine(target, fmt.Sprintf(
 		"[gray]%s [green]<%s>[white] %s",
-		timestamp, escape(msg.From), escape(text),
+		timestamp, msg.From, text,
 	))
 }
 
@@ -837,7 +777,7 @@ func (a *App) handleJoinEvent(
 
 	a.ui.AddLine(msg.To, fmt.Sprintf(
 		"[gray]%s [yellow]*** %s has joined %s",
-		timestamp, escape(msg.From), escape(msg.To),
+		timestamp, msg.From, msg.To,
 	))
 }
 
@@ -856,11 +796,11 @@ func (a *App) handlePartEvent(
 
 	line := fmt.Sprintf(
 		"[gray]%s [yellow]*** %s has left %s",
-		timestamp, escape(msg.From), escape(msg.To),
+		timestamp, msg.From, msg.To,
 	)
 
 	if reason != "" {
-		line += " (" + escape(reason) + ")"
+		line += " (" + reason + ")"
 	}
 
 	if msg.From == myNick {
@@ -881,12 +821,12 @@ func (a *App) handleQuitEvent(
 	if reason != "" {
 		a.ui.AddStatus(fmt.Sprintf(
 			"[gray]%s [yellow]*** %s has quit (%s)",
-			timestamp, escape(msg.From), escape(reason),
+			timestamp, msg.From, reason,
 		))
 	} else {
 		a.ui.AddStatus(fmt.Sprintf(
 			"[gray]%s [yellow]*** %s has quit",
-			timestamp, escape(msg.From),
+			timestamp, msg.From,
 		))
 	}
 }
@@ -913,7 +853,7 @@ func (a *App) handleNickEvent(
 
 	a.ui.AddStatus(fmt.Sprintf(
 		"[gray]%s [yellow]*** %s is now known as %s",
-		timestamp, escape(msg.From), escape(newNick),
+		timestamp, msg.From, newNick,
 	))
 }
 
@@ -925,7 +865,7 @@ func (a *App) handleNoticeEvent(
 
 	a.ui.AddStatus(fmt.Sprintf(
 		"[gray]%s [magenta]--%s-- %s",
-		timestamp, escape(msg.From), escape(text),
+		timestamp, msg.From, text,
 	))
 }
 
@@ -941,7 +881,7 @@ func (a *App) handleTopicEvent(
 
 	a.ui.AddLine(msg.To, fmt.Sprintf(
 		"[gray]%s [cyan]*** %s set topic: %s",
-		timestamp, escape(msg.From), escape(text),
+		timestamp, msg.From, text,
 	))
 }
 
@@ -951,12 +891,10 @@ func (a *App) handleDefaultEvent(
 	lines := msg.BodyLines()
 	text := strings.Join(lines, " ")
 
-	// The brackets around the command are escaped with it, as tview
-	// reads a command such as "[MODE]" as a tag.
 	if text != "" {
 		a.ui.AddStatus(fmt.Sprintf(
-			"[gray]%s [white]%s %s",
+			"[gray]%s [white][%s] %s",
-			timestamp, escape("["+msg.Command+"]"), escape(text),
+			timestamp, msg.Command, text,
 		))
 	}
 }

internal/cli/ui.go

@@ -16,10 +16,7 @@ type Buffer struct {
 	Unread int
 }
 
-// UI manages the terminal interface. Most of its methods wait for
+// UI manages the terminal interface.
-// the tview event loop to run their update. Code that runs on that
-// loop, such as a key handler, must not call them: it would wait
-// for itself.
 type UI struct {
 	app       *tview.Application
 	messages  *tview.TextView
@@ -30,17 +27,7 @@ type UI struct {
 	buffers       []*Buffer
 	currentBuffer int
 
-	// The nick, target and connection state last passed to
-	// SetStatus.
-	nick       string
-	target     string
-	connStatus string
-
 	onInput func(string)
-	// inputDone is closed once the line last passed to onInput
-	// has been handled. Only callOnInput, on the event loop, uses
-	// it.
-	inputDone chan struct{}
 }
 
 // NewUI creates the tview-based IRC-like UI.
@@ -185,32 +172,13 @@ func (ui *UI) SetStatus(
 	nick, target, connStatus string,
 ) {
 	ui.app.QueueUpdateDraw(func() {
-		ui.nick = nick
+		ui.renderStatusBar(nick, target, connStatus)
-		ui.target = target
-		ui.connStatus = connStatus
-
-		ui.refreshStatusBar()
 	})
 }
 
-// BufferName returns the name of the buffer at index bufIndex,
+// BufferCount returns the number of buffers.
-// and whether there is such a buffer.
+func (ui *UI) BufferCount() int {
-func (ui *UI) BufferName(bufIndex int) (string, bool) {
+	return len(ui.buffers)
-	var (
-		name  string
-		found bool
-	)
-
-	ui.app.QueueUpdate(func() {
-		if bufIndex < 0 || bufIndex >= len(ui.buffers) {
-			return
-		}
-
-		name = ui.buffers[bufIndex].Name
-		found = true
-	})
-
-	return name, found
 }
 
 // BufferIndex returns the index of a named buffer.
@@ -235,21 +203,9 @@ func (ui *UI) initMessages() {
 	ui.messages.SetBorder(false)
 }
 
-// escape returns text so that the message window shows it exactly
-// as written. It writes each "[" as "[[:]": a "[" followed by
-// another "[" never starts a tag, and the tag "[:]" changes
-// nothing. tview.Escape is not enough: it does not escape a bracket
-// pair holding a symbol such as "|" or "^", and nothing it adds
-// stops a tag with a URL, such as "[:::y|z]".
-func escape(text string) string {
-	return strings.ReplaceAll(text, "[", "[[:]")
-}
-
 func (ui *UI) initStatusBar() {
-	// Colour tags stay off. With them on, tview reads text in
+	ui.statusBar = tview.NewTextView().
-	// square brackets, such as "[connected]" or part of a nick,
+		SetDynamicColors(true)
-	// as a tag and drops it.
-	ui.statusBar = tview.NewTextView()
 	ui.statusBar.SetBackgroundColor(tcell.ColorNavy)
 	ui.statusBar.SetTextColor(tcell.ColorWhite)
 }
@@ -270,7 +226,10 @@ func (ui *UI) initInput() {
 		}
 
 		ui.input.SetText("")
-		ui.callOnInput(text)
+
+		if ui.onInput != nil {
+			ui.onInput(text)
+		}
 	})
 }
 
@@ -281,11 +240,10 @@ func (ui *UI) initKeyCapture() {
 				return event
 			}
 
-			// Alt and a digit runs /window with that digit.
-			// SwitchBuffer alone would leave the target as it was.
 			r := event.Rune()
 			if r >= '0' && r <= '9' {
-				ui.callOnInput("/window " + string(r))
+				idx := int(r - '0')
+				ui.SwitchBuffer(idx)
 
 				return nil
 			}
@@ -295,35 +253,8 @@ func (ui *UI) initKeyCapture() {
 	)
 }
 
-// callOnInput passes text to the input callback on a new
-// goroutine. The key handlers call it on the event loop, and the
-// callback waits for that loop to update the screen, so they must
-// not wait for the callback. The goroutine first waits for the
-// line before it to be handled, which keeps lines in the order
-// they were typed.
-func (ui *UI) callOnInput(text string) {
-	if ui.onInput == nil {
-		return
-	}
-
-	previous := ui.inputDone
-	done := make(chan struct{})
-	ui.inputDone = done
-
-	go func() {
-		if previous != nil {
-			<-previous
-		}
-
-		ui.onInput(text)
-		close(done)
-	}()
-}
-
-// refreshStatusBar redraws the status bar with the nick, target
-// and connection state last passed to SetStatus.
 func (ui *UI) refreshStatusBar() {
-	ui.renderStatusBar(ui.nick, ui.target, ui.connStatus)
+	// Placeholder; full refresh needs nick/target context.
 }
 
 func (ui *UI) renderStatusBar(

internal/config/config.go

@@ -3,12 +3,8 @@ package config
 
 import (
 	"errors"
-	"fmt"
 	"log/slog"
-	"math"
 	"os"
-	"strconv"
-	"time"
 
 	"github.com/spf13/viper"
 	"go.uber.org/fx"
@@ -32,8 +28,6 @@ Type /help for available commands.`
 const DefaultDBURL = "file:///var/lib/neoirc/state.db" +
 	"?_pragma=journal_mode(WAL)&_pragma=busy_timeout(5000)"
 
-var errOutOfRange = errors.New("setting out of range")
-
 // Params defines the dependencies for creating a Config.
 type Params struct {
 	fx.In
@@ -69,8 +63,6 @@ type Config struct {
 }
 
 // New creates a new Config by reading from files and environment variables.
-// It returns an error when a number, true/false or duration setting does
-// not parse or is out of range.
 func New(
 	_ fx.Lifecycle, params Params,
 ) (*Config, error) {
@@ -115,27 +107,29 @@ func New(
 
 	cfg := &Config{
 		DBURL:              viper.GetString("DBURL"),
+		Debug:              viper.GetBool("DEBUG"),
+		Port:               viper.GetInt("PORT"),
 		SentryDSN:          viper.GetString("SENTRY_DSN"),
+		MaintenanceMode:    viper.GetBool("MAINTENANCE_MODE"),
 		MetricsUsername:    viper.GetString("METRICS_USERNAME"),
 		MetricsPassword:    viper.GetString("METRICS_PASSWORD"),
 		MessageMaxAge:      viper.GetString("MESSAGE_MAX_AGE"),
+		MaxMessageSize:     viper.GetInt("MAX_MESSAGE_SIZE"),
 		QueueMaxAge:        viper.GetString("QUEUE_MAX_AGE"),
 		MOTD:               viper.GetString("MOTD"),
 		ServerName:         viper.GetString("SERVER_NAME"),
 		FederationKey:      viper.GetString("FEDERATION_KEY"),
 		SessionIdleTimeout: viper.GetString("SESSION_IDLE_TIMEOUT"),
+		HashcashBits:       viper.GetInt("NEOIRC_HASHCASH_BITS"),
 		OperName:           viper.GetString("NEOIRC_OPER_NAME"),
 		OperPassword:       viper.GetString("NEOIRC_OPER_PASSWORD"),
+		LoginRateLimit:     viper.GetFloat64("LOGIN_RATE_LIMIT"),
+		LoginRateBurst:     viper.GetInt("LOGIN_RATE_BURST"),
 		IRCListenAddr:      viper.GetString("IRC_LISTEN_ADDR"),
 		log:                log,
 		params:             &params,
 	}
 
-	err = parseSettings(cfg)
-	if err != nil {
-		return nil, err
-	}
-
 	// Viper counts an empty environment variable as unset, but an
 	// empty IRC_LISTEN_ADDR must turn the IRC listener off.
 	ircListenAddr, set := os.LookupEnv("IRC_LISTEN_ADDR")
@@ -150,93 +144,3 @@ func New(
 
 	return cfg, nil
 }
-
-// parseSettings reads the number and true/false settings into cfg and
-// checks the duration settings. Each number and duration must be above
-// zero. PORT and NEOIRC_HASHCASH_BITS may also be zero: port 0 lets the
-// system pick a port, and 0 bits turns proof of work off. The error
-// names each setting that does not parse or is out of range.
-func parseSettings(cfg *Config) error {
-	return errors.Join(
-		parseInt("PORT", 0, &cfg.Port),
-		parseInt("MAX_MESSAGE_SIZE", 1, &cfg.MaxMessageSize),
-		parseInt("NEOIRC_HASHCASH_BITS", 0, &cfg.HashcashBits),
-		parseInt("LOGIN_RATE_BURST", 1, &cfg.LoginRateBurst),
-		parseFloat("LOGIN_RATE_LIMIT", &cfg.LoginRateLimit),
-		parseBool("DEBUG", &cfg.Debug),
-		parseBool("MAINTENANCE_MODE", &cfg.MaintenanceMode),
-		checkDuration("MESSAGE_MAX_AGE", cfg.MessageMaxAge),
-		checkDuration("QUEUE_MAX_AGE", cfg.QueueMaxAge),
-		checkDuration("SESSION_IDLE_TIMEOUT", cfg.SessionIdleTimeout),
-	)
-}
-
-// parseInt sets *value to the setting key read as a whole number. It
-// returns an error when the value does not parse or is below minimum.
-func parseInt(key string, minimum int, value *int) error {
-	raw := viper.GetString(key)
-
-	parsed, err := strconv.Atoi(raw)
-	if err != nil {
-		return fmt.Errorf("cannot parse %s: %w", key, err)
-	}
-
-	if parsed < minimum {
-		return fmt.Errorf("%w: %s is %s, but must be at least %d",
-			errOutOfRange, key, raw, minimum)
-	}
-
-	*value = parsed
-
-	return nil
-}
-
-// parseFloat sets *value to the setting key read as a floating-point
-// number. It returns an error when the value does not parse or is not a
-// finite number above zero.
-func parseFloat(key string, value *float64) error {
-	raw := viper.GetString(key)
-
-	parsed, err := strconv.ParseFloat(raw, 64)
-	if err != nil {
-		return fmt.Errorf("cannot parse %s: %w", key, err)
-	}
-
-	if math.IsNaN(parsed) || math.IsInf(parsed, 0) || parsed <= 0 {
-		return fmt.Errorf(
-			"%w: %s is %s, but must be a finite number above zero",
-			errOutOfRange, key, raw)
-	}
-
-	*value = parsed
-
-	return nil
-}
-
-// parseBool sets *value to the setting key read as true or false.
-func parseBool(key string, value *bool) error {
-	parsed, err := strconv.ParseBool(viper.GetString(key))
-	if err != nil {
-		return fmt.Errorf("cannot parse %s: %w", key, err)
-	}
-
-	*value = parsed
-
-	return nil
-}
-
-// checkDuration returns an error naming the setting key when value is
-// not a Go duration above zero.
-func checkDuration(key, value string) error {
-	duration, err := time.ParseDuration(value)
-	if err != nil {
-		return fmt.Errorf("cannot parse %s: %w", key, err)
-	}
-
-	if duration <= 0 {
-		return fmt.Errorf("%w: %s is %s, but must be above zero",
-			errOutOfRange, key, value)
-	}
-
-	return nil
-}

internal/config/config_test.go

@@ -2,7 +2,6 @@ package config_test
 
 import (
 	"os"
-	"strings"
 	"testing"
 	"time"
 
@@ -11,8 +10,7 @@ import (
 	"sneak.berlin/go/neoirc/internal/logger"
 )
 
-// loadConfig runs config.New and returns its result.
+func newConfig(t *testing.T) *config.Config {
-func loadConfig(t *testing.T) (*config.Config, error) {
 	t.Helper()
 
 	globs := &globals.Globals{
@@ -26,15 +24,9 @@ func loadConfig(t *testing.T) (*config.Config, error) {
 		t.Fatal(err)
 	}
 
-	return config.New(
+	cfg, err := config.New(
 		nil, config.Params{Globals: globs, Logger: log},
 	)
-}
-
-func newConfig(t *testing.T) *config.Config {
-	t.Helper()
-
-	cfg, err := loadConfig(t)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -42,145 +34,6 @@ func newConfig(t *testing.T) *config.Config {
 	return cfg
 }
 
-func TestUnsetSettingsKeepDefaults(t *testing.T) {
-	// Viper counts an empty environment variable as unset.
-	t.Setenv("PORT", "")
-	t.Setenv("MAX_MESSAGE_SIZE", "")
-	t.Setenv("NEOIRC_HASHCASH_BITS", "")
-	t.Setenv("LOGIN_RATE_BURST", "")
-	t.Setenv("LOGIN_RATE_LIMIT", "")
-	t.Setenv("DEBUG", "")
-	t.Setenv("MAINTENANCE_MODE", "")
-	t.Setenv("MESSAGE_MAX_AGE", "")
-	t.Setenv("QUEUE_MAX_AGE", "")
-	t.Setenv("SESSION_IDLE_TIMEOUT", "")
-
-	// Each duration setting defaults to 30 days.
-	const thirtyDays = "720h"
-
-	want := settings{
-		Port:               8080,
-		MaxMessageSize:     4096,
-		HashcashBits:       20,
-		LoginRateBurst:     5,
-		LoginRateLimit:     1,
-		Debug:              false,
-		MaintenanceMode:    false,
-		MessageMaxAge:      thirtyDays,
-		QueueMaxAge:        thirtyDays,
-		SessionIdleTimeout: thirtyDays,
-	}
-
-	got := settingsOf(newConfig(t))
-	if got != want {
-		t.Errorf("settings = %+v, want %+v", got, want)
-	}
-}
-
-func TestValidSettingsAreUsed(t *testing.T) {
-	// Each whole number is the lowest value its setting allows, and 1ns
-	// is the shortest duration allowed.
-	t.Setenv("PORT", "0")
-	t.Setenv("MAX_MESSAGE_SIZE", "1")
-	t.Setenv("NEOIRC_HASHCASH_BITS", "0")
-	t.Setenv("LOGIN_RATE_BURST", "1")
-	t.Setenv("LOGIN_RATE_LIMIT", "0.5")
-	t.Setenv("DEBUG", "true")
-	t.Setenv("MAINTENANCE_MODE", "true")
-	t.Setenv("MESSAGE_MAX_AGE", "1ns")
-	t.Setenv("QUEUE_MAX_AGE", "1h30m")
-	t.Setenv("SESSION_IDLE_TIMEOUT", "45m")
-
-	want := settings{
-		Port:               0,
-		MaxMessageSize:     1,
-		HashcashBits:       0,
-		LoginRateBurst:     1,
-		LoginRateLimit:     0.5,
-		Debug:              true,
-		MaintenanceMode:    true,
-		MessageMaxAge:      "1ns",
-		QueueMaxAge:        "1h30m",
-		SessionIdleTimeout: "45m",
-	}
-
-	got := settingsOf(newConfig(t))
-	if got != want {
-		t.Errorf("settings = %+v, want %+v", got, want)
-	}
-}
-
-// settings holds the Config fields whose settings config.New parses.
-type settings struct {
-	Port               int
-	MaxMessageSize     int
-	HashcashBits       int
-	LoginRateBurst     int
-	LoginRateLimit     float64
-	Debug              bool
-	MaintenanceMode    bool
-	MessageMaxAge      string
-	QueueMaxAge        string
-	SessionIdleTimeout string
-}
-
-func settingsOf(cfg *config.Config) settings {
-	return settings{
-		Port:               cfg.Port,
-		MaxMessageSize:     cfg.MaxMessageSize,
-		HashcashBits:       cfg.HashcashBits,
-		LoginRateBurst:     cfg.LoginRateBurst,
-		LoginRateLimit:     cfg.LoginRateLimit,
-		Debug:              cfg.Debug,
-		MaintenanceMode:    cfg.MaintenanceMode,
-		MessageMaxAge:      cfg.MessageMaxAge,
-		QueueMaxAge:        cfg.QueueMaxAge,
-		SessionIdleTimeout: cfg.SessionIdleTimeout,
-	}
-}
-
-func TestBadSettingStopsStartup(t *testing.T) {
-	// For each setting, the first value does not parse and the others
-	// parse but are out of range.
-	tests := []struct {
-		key    string
-		values []string
-	}{
-		{key: "PORT", values: []string{"80a", "-1"}},
-		{key: "MAX_MESSAGE_SIZE", values: []string{"4k", "0", "-4096"}},
-		{key: "NEOIRC_HASHCASH_BITS", values: []string{"twenty", "-1"}},
-		{key: "LOGIN_RATE_BURST", values: []string{"five", "0", "-5"}},
-		{key: "LOGIN_RATE_LIMIT", values: []string{
-			"fast", "0", "-1", "NaN", "Inf", "-Inf",
-		}},
-		{key: "DEBUG", values: []string{"yes"}},
-		{key: "MAINTENANCE_MODE", values: []string{"on"}},
-		{key: "MESSAGE_MAX_AGE", values: []string{"30d", "0", "-1h"}},
-		{key: "QUEUE_MAX_AGE", values: []string{"720", "0s", "-24h"}},
-		{key: "SESSION_IDLE_TIMEOUT", values: []string{"a month", "0", "-1m"}},
-	}
-
-	for _, test := range tests {
-		for _, value := range test.values {
-			t.Run(test.key+"="+value, func(t *testing.T) {
-				t.Setenv(test.key, value)
-
-				_, err := loadConfig(t)
-				if err == nil {
-					t.Fatalf("%s=%q: got no error", test.key, value)
-				}
-
-				msg := err.Error()
-				if !strings.Contains(msg, test.key) ||
-					!strings.Contains(msg, value) {
-					t.Errorf("error %q does not name %s and %q",
-						msg, test.key, value)
-				}
-			})
-		}
-	}
-}
-
 func TestIRCListenAddrUnsetKeepsDefault(t *testing.T) {
 	// t.Setenv puts back whatever value was there after the test.
 	t.Setenv("IRC_LISTEN_ADDR", "")

internal/db/auth.go

@@ -10,6 +10,13 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
+//nolint:gochecknoglobals // var so tests can override via SetBcryptCost
+var bcryptCost = bcrypt.DefaultCost
+
+// SetBcryptCost overrides the bcrypt cost.
+// Use bcrypt.MinCost in tests to avoid slow hashing.
+func SetBcryptCost(cost int) { bcryptCost = cost }
+
 var errNoPassword = errors.New(
 	"account has no password set",
 )
@@ -22,7 +29,7 @@ func (database *Database) SetPassword(
 	password string,
 ) error {
 	hash, err := bcrypt.GenerateFromPassword(
-		[]byte(password), bcrypt.DefaultCost,
+		[]byte(password), bcryptCost,
 	)
 	if err != nil {
 		return fmt.Errorf("hash password: %w", err)

internal/db/db.go

@@ -85,6 +85,11 @@ func New(
 	return database, nil
 }
 
+// GetDB returns the underlying sql.DB connection.
+func (database *Database) GetDB() *sql.DB {
+	return database.conn
+}
+
 func (database *Database) connect(ctx context.Context) error {
 	dbURL := database.params.Config.DBURL
 	if dbURL == "" {

internal/db/export_test.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log/slog"
 	"testing"
-	"time"
 
 	"sneak.berlin/go/neoirc/internal/dbtest"
 )
@@ -68,78 +67,3 @@ func (database *Database) ExecForTest(
 
 	return nil
 }
-
-// GetDB returns the underlying sql.DB connection.
-func (database *Database) GetDB() *sql.DB {
-	return database.conn
-}
-
-// GetOrCreateChannel returns channel id, creating if needed.
-// Uses INSERT OR IGNORE to avoid TOCTOU races.
-func (database *Database) GetOrCreateChannel(
-	ctx context.Context,
-	name string,
-) (int64, error) {
-	now := time.Now()
-
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO channels
-		 (name, created_at, updated_at)
-		 VALUES (?, ?, ?)`,
-		name, now, now)
-	if err != nil {
-		return 0, fmt.Errorf("create channel: %w", err)
-	}
-
-	var channelID int64
-
-	err = database.conn.QueryRowContext(
-		ctx,
-		"SELECT id FROM channels WHERE name = ?",
-		name,
-	).Scan(&channelID)
-	if err != nil {
-		return 0, fmt.Errorf("get channel: %w", err)
-	}
-
-	return channelID, nil
-}
-
-// JoinChannel adds a session to a channel.
-func (database *Database) JoinChannel(
-	ctx context.Context,
-	channelID, sessionID int64,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO channel_members
-		 (channel_id, session_id, joined_at)
-		 VALUES (?, ?, ?)`,
-		channelID, sessionID, time.Now())
-	if err != nil {
-		return fmt.Errorf("join channel: %w", err)
-	}
-
-	return nil
-}
-
-// HasChannelInvite checks if a session has been invited
-// to a channel.
-func (database *Database) HasChannelInvite(
-	ctx context.Context,
-	channelID, sessionID int64,
-) (bool, error) {
-	var count int
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT COUNT(*) FROM channel_invites
-		 WHERE channel_id = ? AND session_id = ?`,
-		channelID, sessionID,
-	).Scan(&count)
-	if err != nil {
-		return false, fmt.Errorf(
-			"check invite: %w", err,
-		)
-	}
-
-	return count > 0, nil
-}

internal/db/main_test.go

@@ -0,0 +1,14 @@
+package db_test
+
+import (
+	"os"
+	"testing"
+
+	"golang.org/x/crypto/bcrypt"
+	"sneak.berlin/go/neoirc/internal/db"
+)
+
+func TestMain(m *testing.M) {
+	db.SetBcryptCost(bcrypt.MinCost)
+	os.Exit(m.Run())
+}

internal/db/queries.go

@@ -320,6 +320,29 @@ type ClientHostInfo struct {
 	Hostname string
 }
 
+// GetClientHostInfo returns the IP and hostname for a
+// client.
+func (database *Database) GetClientHostInfo(
+	ctx context.Context,
+	clientID int64,
+) (*ClientHostInfo, error) {
+	var info ClientHostInfo
+
+	err := database.conn.QueryRowContext(
+		ctx,
+		`SELECT ip, hostname
+		 FROM clients WHERE id = ?`,
+		clientID,
+	).Scan(&info.IP, &info.Hostname)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"get client host info: %w", err,
+		)
+	}
+
+	return &info, nil
+}
+
 // SetSessionOper sets the is_oper flag on a session.
 func (database *Database) SetSessionOper(
 	ctx context.Context,
@@ -410,6 +433,54 @@ func (database *Database) GetChannelByName(
 	return channelID, nil
 }
 
+// GetOrCreateChannel returns channel id, creating if needed.
+// Uses INSERT OR IGNORE to avoid TOCTOU races.
+func (database *Database) GetOrCreateChannel(
+	ctx context.Context,
+	name string,
+) (int64, error) {
+	now := time.Now()
+
+	_, err := database.conn.ExecContext(ctx,
+		`INSERT OR IGNORE INTO channels
+		 (name, created_at, updated_at)
+		 VALUES (?, ?, ?)`,
+		name, now, now)
+	if err != nil {
+		return 0, fmt.Errorf("create channel: %w", err)
+	}
+
+	var channelID int64
+
+	err = database.conn.QueryRowContext(
+		ctx,
+		"SELECT id FROM channels WHERE name = ?",
+		name,
+	).Scan(&channelID)
+	if err != nil {
+		return 0, fmt.Errorf("get channel: %w", err)
+	}
+
+	return channelID, nil
+}
+
+// JoinChannel adds a session to a channel.
+func (database *Database) JoinChannel(
+	ctx context.Context,
+	channelID, sessionID int64,
+) error {
+	_, err := database.conn.ExecContext(ctx,
+		`INSERT OR IGNORE INTO channel_members
+		 (channel_id, session_id, joined_at)
+		 VALUES (?, ?, ?)`,
+		channelID, sessionID, time.Now())
+	if err != nil {
+		return fmt.Errorf("join channel: %w", err)
+	}
+
+	return nil
+}
+
 // Errors that CreateOrJoinChannel refuses a join with.
 var (
 	ErrBannedFromChannel = errors.New("banned from channel")
@@ -1056,6 +1127,23 @@ func (database *Database) GetChannelMemberIDs(
 	return scanInt64s(rows)
 }
 
+// GetSessionChannelIDs returns channel IDs for a session.
+func (database *Database) GetSessionChannelIDs(
+	ctx context.Context,
+	sessionID int64,
+) ([]int64, error) {
+	rows, err := database.conn.QueryContext(ctx,
+		`SELECT channel_id FROM channel_members
+		 WHERE session_id = ?`, sessionID)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"get session channel ids: %w", err,
+		)
+	}
+
+	return scanInt64s(rows)
+}
+
 // InsertMessage stores a message and returns its DB ID.
 // toSessionID is the session a DM or INVITE is sent to and
 // toChannelID the channel a channel message is sent to;
@@ -2372,6 +2460,28 @@ func (database *Database) AddChannelInvite(
 	return nil
 }
 
+// HasChannelInvite checks if a session has been invited
+// to a channel.
+func (database *Database) HasChannelInvite(
+	ctx context.Context,
+	channelID, sessionID int64,
+) (bool, error) {
+	var count int
+
+	err := database.conn.QueryRowContext(ctx,
+		`SELECT COUNT(*) FROM channel_invites
+		 WHERE channel_id = ? AND session_id = ?`,
+		channelID, sessionID,
+	).Scan(&count)
+	if err != nil {
+		return false, fmt.Errorf(
+			"check invite: %w", err,
+		)
+	}
+
+	return count > 0, nil
+}
+
 // --- Tier 2: Secret (+s) ---
 
 // IsChannelSecret checks if a channel has +s mode.

internal/db/queries_test.go

@@ -125,7 +125,7 @@ func TestCreateSessionStoresIP(t *testing.T) {
 	database := setupTestDB(t)
 	ctx := t.Context()
 
-	sessionID, _, _, err := database.CreateSession(
+	sessionID, clientID, _, err := database.CreateSession(
 		ctx, "ipuser", "ident", "host.example.com",
 		"192.168.1.42",
 	)
@@ -147,8 +147,8 @@ func TestCreateSessionStoresIP(t *testing.T) {
 		)
 	}
 
-	clientInfo, err := database.GetLatestClientForSession(
+	clientInfo, err := database.GetClientHostInfo(
-		ctx, sessionID,
+		ctx, clientID,
 	)
 	if err != nil {
 		t.Fatal(err)
@@ -169,6 +169,19 @@ func TestCreateSessionStoresIP(t *testing.T) {
 	}
 }
 
+func TestGetClientHostInfoNotFound(t *testing.T) {
+	t.Parallel()
+
+	database := setupTestDB(t)
+
+	_, err := database.GetClientHostInfo(
+		t.Context(), 99999,
+	)
+	if err == nil {
+		t.Fatal("expected error for nonexistent client")
+	}
+}
+
 func TestGetSessionHostInfoNotFound(t *testing.T) {
 	t.Parallel()
 

internal/db/testing.go

@@ -0,0 +1,25 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"log/slog"
+)
+
+// NewTestDatabaseFromConn creates a Database wrapping an
+// existing *sql.DB connection.  Intended for integration
+// tests in other packages.
+func NewTestDatabaseFromConn(conn *sql.DB) *Database {
+	return &Database{ //nolint:exhaustruct
+		conn: conn,
+		log:  slog.Default(),
+	}
+}
+
+// RunMigrations applies all schema migrations.  Exposed
+// for integration tests in other packages.
+func (database *Database) RunMigrations(
+	ctx context.Context,
+) error {
+	return database.runMigrations(ctx)
+}

internal/dbtest/dbtest.go

@@ -1,5 +1,5 @@
-// Package dbtest gives each test a database of its own and runs raw
+// Package dbtest gives each test a database of its own. Only tests
-// SQL on it. Only tests may import it.
+// may import it.
 package dbtest
 
 import (
@@ -37,23 +37,3 @@ func NewURL(tb testing.TB) string {
 
 	return dbURL
 }
-
-// Exec runs one raw SQL statement on the database at dbURL, over a
-// connection of its own. A test uses it for what the methods of
-// db.Database cannot do, such as creating a trigger that makes a
-// write fail.
-func Exec(tb testing.TB, dbURL, statement string) {
-	tb.Helper()
-
-	pool, err := sql.Open("sqlite", dbURL)
-	if err != nil {
-		tb.Fatalf("open test database: %v", err)
-	}
-
-	defer func() { _ = pool.Close() }()
-
-	_, err = pool.ExecContext(tb.Context(), statement)
-	if err != nil {
-		tb.Fatalf("run %q: %v", statement, err)
-	}
-}

internal/handlers/api.go

@@ -188,7 +188,7 @@ func (hdlr *Handlers) handleCreateSession(
 
 	var payload createRequest
 
-	err := decodeJSON(request, &payload)
+	err := json.NewDecoder(request.Body).Decode(&payload)
 	if err != nil {
 		hdlr.respondError(
 			writer, request,
@@ -412,7 +412,7 @@ func (hdlr *Handlers) deliverWelcome(
 	// 004 RPL_MYINFO
 	hdlr.enqueueNumeric(
 		ctx, clientID, irc.RplMyInfo, nick,
-		[]string{srvName, version, service.UserModes, "Hbiklmnostv"},
+		[]string{srvName, version, "", "ikmnostl"},
 		"",
 	)
 
@@ -925,7 +925,7 @@ func (hdlr *Handlers) HandleSendCommand() http.HandlerFunc {
 
 		var payload commandRequest
 
-		err := decodeJSON(request, &payload)
+		err := json.NewDecoder(request.Body).Decode(&payload)
 		if err != nil {
 			hdlr.respondError(
 				writer, request,
@@ -994,7 +994,7 @@ func (hdlr *Handlers) dispatchCommand(
 		hdlr.handlePrivmsg(
 			writer, request,
 			sessionID, clientID, nick,
-			command, target, body, meta,
+			command, target, body, meta, bodyLines,
 		)
 	case irc.CmdJoin:
 		hdlr.handleJoin(
@@ -1139,18 +1139,8 @@ func (hdlr *Handlers) handlePrivmsg(
 	nick, command, target string,
 	body json.RawMessage,
 	meta json.RawMessage,
+	bodyLines func() []string,
 ) {
-	lines, ok := checkBodyAndMeta(body, meta)
-	if !ok {
-		hdlr.respondError(
-			writer, request,
-			"invalid request body",
-			http.StatusBadRequest,
-		)
-
-		return
-	}
-
 	if target == "" {
 		hdlr.enqueueNumeric(
 			request.Context(), clientID,
@@ -1165,6 +1155,7 @@ func (hdlr *Handlers) handlePrivmsg(
 		return
 	}
 
+	lines := bodyLines()
 	if len(lines) == 0 {
 		hdlr.enqueueNumeric(
 			request.Context(), clientID,
@@ -1198,44 +1189,6 @@ func (hdlr *Handlers) handlePrivmsg(
 	)
 }
 
-// checkBodyAndMeta returns the lines in body. It returns false
-// when body is present and is not an array of strings, or meta
-// is present and is not an object. Each line is decoded as any
-// because decoding into []string turns a null line into "". A
-// null body or meta decodes without an error into nil.
-func checkBodyAndMeta(body, meta json.RawMessage) ([]string, bool) {
-	var lines []string
-
-	if body != nil {
-		var values []any
-
-		err := json.Unmarshal(body, &values)
-		if err != nil || values == nil {
-			return nil, false
-		}
-
-		for _, value := range values {
-			line, isString := value.(string)
-			if !isString {
-				return nil, false
-			}
-
-			lines = append(lines, line)
-		}
-	}
-
-	if meta != nil {
-		var fields map[string]any
-
-		err := json.Unmarshal(meta, &fields)
-		if err != nil || fields == nil {
-			return nil, false
-		}
-	}
-
-	return lines, true
-}
-
 // respondIRCError enqueues a numeric error reply, notifies
 // the broker, and sends HTTP 200 with {"status":"error"}.
 func (hdlr *Handlers) respondIRCError(
@@ -3238,7 +3191,7 @@ func (hdlr *Handlers) handleWho(
 		// 315 RPL_ENDOFWHO (empty result)
 		hdlr.enqueueNumeric(
 			ctx, clientID, irc.RplEndOfWho, nick,
-			[]string{channel},
+			[]string{target},
 			"End of /WHO list",
 		)
 		hdlr.broker.Notify(sessionID)

internal/handlers/api_test.go

@@ -8,12 +8,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"maps"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"os"
-	"reflect"
 	"slices"
 	"strconv"
 	"strings"
@@ -47,25 +45,22 @@ import (
 const templateDBURL = "file:template?mode=memory&cache=shared"
 
 func TestMain(m *testing.M) {
-	template := fx.New(
+	db.SetBcryptCost(bcrypt.MinCost)
-		fx.NopLogger,
-		fx.Supply(
-			&globals.Globals{},
-			&config.Config{DBURL: templateDBURL},
-		),
-		fx.Provide(logger.New, newTestDB),
-		// fx makes the database only if something asks for it.
-		fx.Invoke(func(*db.Database) {}),
-	)
 
-	err := template.Start(context.Background())
+	template, err := sql.Open("sqlite", templateDBURL)
+	if err != nil {
+		panic(err)
+	}
+
+	err = db.NewTestDatabaseFromConn(template).
+		RunMigrations(context.Background())
 	if err != nil {
 		panic(err)
 	}
 
 	code := m.Run()
 
-	_ = template.Stop(context.Background())
+	_ = template.Close()
 
 	os.Exit(code)
 }
@@ -140,7 +135,6 @@ type testServer struct {
 	t          *testing.T
 	fxApp      *fxtest.App
 	broker     *broker.Broker
-	dbURL      string
 	database   *db.Database
 	handlers   *handlers.Handlers
 }
@@ -235,7 +229,6 @@ func newTestServerWith(
 		t:          t,
 		fxApp:      app,
 		broker:     brk,
-		dbURL:      dbURL,
 		database:   database,
 		handlers:   hdlr,
 	}
@@ -802,104 +795,6 @@ func TestCreateSessionMalformed(t *testing.T) {
 	}
 }
 
-func (tserver *testServer) postBody(
-	path, token, body string,
-) (int, map[string]any) {
-	tserver.t.Helper()
-
-	resp, err := doRequestAuth(
-		tserver.t, http.MethodPost, tserver.url(path), token,
-		strings.NewReader(body),
-	)
-	if err != nil {
-		tserver.t.Fatalf("post %s: %v", path, err)
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	var result map[string]any
-
-	_ = json.NewDecoder(resp.Body).Decode(&result)
-
-	return resp.StatusCode, result
-}
-
-// TestRequestBodyLimit sends each endpoint a small valid JSON value
-// followed by other bytes. Only whitespace may follow the value, and
-// the whole body counts towards MAX_MESSAGE_SIZE.
-func TestRequestBodyLimit(t *testing.T) {
-	t.Parallel()
-
-	const (
-		maxMessageSize = 4096 // the default MAX_MESSAGE_SIZE
-		nick           = "alice_bodylimit"
-	)
-
-	endpoints := []struct {
-		name, path, value string
-		acceptedStatus    int
-	}{
-		{
-			"create session", apiSession,
-			`{"nick":"bob_bodylimit"}`,
-			http.StatusCreated,
-		},
-		{
-			"login", "/api/v1/login",
-			`{"nick":"` + nick + `","password":"` + testPassword + `"}`,
-			http.StatusOK,
-		},
-		{
-			"post message", apiMessages,
-			`{"command":"PING"}`,
-			http.StatusOK,
-		},
-	}
-
-	for _, endpoint := range endpoints {
-		t.Run(endpoint.name, func(t *testing.T) {
-			t.Parallel()
-
-			tserver := newTestServer(t)
-			token := tserver.createSession(nick)
-
-			tserver.setPassword(nick)
-
-			bytesToLimit := maxMessageSize - len(endpoint.value)
-
-			for _, trailing := range []string{
-				strings.Repeat(" ", bytesToLimit+1),
-				strings.Repeat("x", bytesToLimit+1),
-				"x",
-				"{}",
-			} {
-				status, result := tserver.postBody(
-					endpoint.path, token, endpoint.value+trailing,
-				)
-				if status != http.StatusBadRequest ||
-					result["error"] != "invalid request body" {
-					t.Errorf(
-						"%d bytes of %.10q after the value: expected "+
-							"400 invalid request body, got %d: %v",
-						len(trailing), trailing, status, result,
-					)
-				}
-			}
-
-			status, result := tserver.postBody(
-				endpoint.path, token,
-				endpoint.value+strings.Repeat(" ", bytesToLimit),
-			)
-			if status != endpoint.acceptedStatus {
-				t.Errorf(
-					"body of exactly the limit: expected %d, got %d: %v",
-					endpoint.acceptedStatus, status, result,
-				)
-			}
-		})
-	}
-}
-
 func TestAuthNoCookie(t *testing.T) {
 	t.Parallel()
 
@@ -1104,8 +999,6 @@ func TestChannelMessage(t *testing.T) {
 	}
 }
 
-// TestMessageMissingBody checks that a PRIVMSG with no body,
-// or an empty one, gets ERR_NOTEXTTOSEND.
 func TestMessageMissingBody(t *testing.T) {
 	t.Parallel()
 
@@ -1120,26 +1013,21 @@ func TestMessageMissingBody(t *testing.T) {
 
 	_, lastID := tserver.pollMessages(token, 0)
 
-	for _, request := range []map[string]any{
+	status, _ := tserver.sendCommand(token, map[string]any{
-		{commandKey: privmsgCmd, toKey: channel},
+		commandKey: privmsgCmd, toKey: channel,
-		{commandKey: privmsgCmd, toKey: channel, bodyKey: []string{}},
+	})
-	} {
-		status, _ := tserver.sendCommand(token, request)
 	if status != http.StatusOK {
-			t.Fatalf("%v: expected 200, got %d", request, status)
+		t.Fatalf("expected 200, got %d", status)
 	}
 
-		var msgs []map[string]any
+	msgs, _ := tserver.pollMessages(token, lastID)
-
-		msgs, lastID = tserver.pollMessages(token, lastID)
 
 	if !findNumeric(msgs, "412") {
 		t.Fatalf(
-				"%v: expected ERR_NOTEXTTOSEND (412), got %v",
+			"expected ERR_NOTEXTTOSEND (412), got %v",
-				request, msgs,
+			msgs,
 		)
 	}
-	}
 }
 
 func TestMessageMissingTo(t *testing.T) {
@@ -1168,132 +1056,6 @@ func TestMessageMissingTo(t *testing.T) {
 	}
 }
 
-// TestMessageInvalidBodyOrMeta checks that a PRIVMSG or
-// NOTICE, to a channel or a nick, whose body is not an array
-// of strings or whose meta is not an object gets 400 and
-// reaches nobody.
-func TestMessageInvalidBodyOrMeta(t *testing.T) {
-	t.Parallel()
-
-	cases := []struct {
-		name   string
-		fields map[string]any
-	}{
-		{"null line", map[string]any{bodyKey: []any{"hi", nil}}},
-		{"number line", map[string]any{bodyKey: []any{"hi", 1}}},
-		{"object line", map[string]any{bodyKey: []any{map[string]any{}}}},
-		{"null body", map[string]any{bodyKey: nil}},
-		{"object body", map[string]any{bodyKey: map[string]any{}}},
-		{"null meta", map[string]any{bodyKey: []string{"hi"}, metaKey: nil}},
-		{"array meta", map[string]any{bodyKey: []string{"hi"}, metaKey: []string{}}},
-		{"string meta", map[string]any{bodyKey: []string{"hi"}, metaKey: "hi"}},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			const channel = "#badmsg"
-
-			tserver := newTestServer(t)
-			aliceToken := tserver.createSession("alice_badmsg")
-			bobToken := tserver.createSession("bob_badmsg")
-
-			tserver.sendCommand(aliceToken, map[string]any{
-				commandKey: joinCmd, toKey: channel,
-			})
-			tserver.sendCommand(bobToken, map[string]any{
-				commandKey: joinCmd, toKey: channel,
-			})
-
-			_, bobLastID := tserver.pollMessages(bobToken, 0)
-
-			for _, command := range []string{privmsgCmd, irc.CmdNotice} {
-				for _, target := range []string{channel, "bob_badmsg"} {
-					request := map[string]any{
-						commandKey: command, toKey: target,
-					}
-					maps.Copy(request, tc.fields)
-
-					status, result := tserver.sendCommand(
-						aliceToken, request,
-					)
-					if status != http.StatusBadRequest ||
-						result["error"] != "invalid request body" {
-						t.Errorf(
-							"%s to %s: expected 400 invalid "+
-								"request body, got %d: %v",
-							command, target, status, result,
-						)
-					}
-				}
-			}
-
-			msgs, _ := tserver.pollMessages(bobToken, bobLastID)
-			if len(msgs) != 0 {
-				t.Fatalf("expected no messages, bob got %v", msgs)
-			}
-		})
-	}
-}
-
-// TestMessageRelaysBodyAndMeta checks that a PRIVMSG or
-// NOTICE, to a channel or a nick, reaches its recipient with
-// body and meta as sent.
-func TestMessageRelaysBodyAndMeta(t *testing.T) {
-	t.Parallel()
-
-	const channel = "#relaymsg"
-
-	tserver := newTestServer(t)
-	aliceToken := tserver.createSession("alice_relaymsg")
-	bobToken := tserver.createSession("bob_relaymsg")
-
-	tserver.sendCommand(aliceToken, map[string]any{
-		commandKey: joinCmd, toKey: channel,
-	})
-	tserver.sendCommand(bobToken, map[string]any{
-		commandKey: joinCmd, toKey: channel,
-	})
-
-	_, bobLastID := tserver.pollMessages(bobToken, 0)
-
-	body := []any{"line one", ""}
-	meta := map[string]any{"sig": "abc", "alg": "ed25519"}
-
-	for _, command := range []string{privmsgCmd, irc.CmdNotice} {
-		for _, target := range []string{channel, "bob_relaymsg"} {
-			status, result := tserver.sendCommand(
-				aliceToken,
-				map[string]any{
-					commandKey: command, toKey: target,
-					bodyKey: body, metaKey: meta,
-				},
-			)
-			if status != http.StatusOK {
-				t.Fatalf(
-					"%s to %s: expected 200, got %d: %v",
-					command, target, status, result,
-				)
-			}
-
-			var msgs []map[string]any
-
-			msgs, bobLastID = tserver.pollMessages(
-				bobToken, bobLastID,
-			)
-			if len(msgs) != 1 ||
-				msgs[0][commandKey] != command ||
-				!reflect.DeepEqual(msgs[0][bodyKey], body) ||
-				!reflect.DeepEqual(msgs[0][metaKey], meta) {
-				t.Fatalf(
-					"%s to %s: bob got %v", command, target, msgs,
-				)
-			}
-		}
-	}
-}
-
 func TestNonMemberCannotSend(t *testing.T) {
 	t.Parallel()
 
@@ -1765,7 +1527,9 @@ func checkQuitRace(
 		firstToken := tserver.createSession(nick)
 		observerToken := tserver.createSession("raceobserver")
 
-		tserver.setPassword(nick)
+		tserver.sendCommand(firstToken, map[string]any{
+			commandKey: irc.CmdPass, bodyKey: []string{testPassword},
+		})
 
 		tokens := []string{firstToken, tserver.login(nick)}
 
@@ -1815,7 +1579,9 @@ func TestLogoutOfOneClientKeepsSession(t *testing.T) {
 	firstToken := tserver.createSession(nick)
 	observerToken := tserver.createSession("logoutobserver")
 
-	tserver.setPassword(nick)
+	tserver.sendCommand(firstToken, map[string]any{
+		commandKey: irc.CmdPass, bodyKey: []string{testPassword},
+	})
 
 	secondToken := tserver.login(nick)
 
@@ -1885,12 +1651,15 @@ func TestFailedLogoutChangesNothing(t *testing.T) {
 
 	_, lastID := tserver.pollMessages(observerToken, 0)
 
-	dbtest.Exec(t, tserver.dbURL,
+	_, err := tserver.database.GetDB().ExecContext(t.Context(),
 		`CREATE TRIGGER keep_sessions
 		 BEFORE DELETE ON sessions
 		 BEGIN
 		   SELECT RAISE(ABORT, 'sessions are kept');
 		 END`)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	resp, err := doRequestAuth(
 		t, http.MethodPost, tserver.url(apiLogout), token, nil,
@@ -2124,24 +1893,6 @@ func (tserver *testServer) longPoll(
 	return result.Messages, nil
 }
 
-// setPassword gives the session nick the password testPassword
-// without sending PASS. It hashes at bcrypt.MinCost, and a login
-// compares at the cost stored in the hash, so both are fast.
-func (tserver *testServer) setPassword(nick string) {
-	tserver.t.Helper()
-
-	hash, err := bcrypt.GenerateFromPassword(
-		[]byte(testPassword), bcrypt.MinCost,
-	)
-	if err != nil {
-		tserver.t.Fatalf("hash password: %v", err)
-	}
-
-	dbtest.Exec(tserver.t, tserver.dbURL,
-		"UPDATE sessions SET password_hash = '"+string(hash)+
-			"' WHERE nick = '"+nick+"'")
-}
-
 // login logs in to the session nick with testPassword and
 // returns the new client's token.
 func (tserver *testServer) login(nick string) string {
@@ -3749,8 +3500,13 @@ func TestLoginValid(t *testing.T) {
 
 	tserver := newTestServer(t)
 
-	tserver.createSession("loginuser")
+	// Create session and set password via PASS command.
-	tserver.setPassword("loginuser")
+	token := tserver.createSession("loginuser")
+
+	tserver.sendCommand(token, map[string]any{
+		commandKey: irc.CmdPass,
+		bodyKey:    []string{testPassword},
+	})
 
 	// Login with nick + password.
 	loginBody, err := json.Marshal(map[string]string{
@@ -3814,8 +3570,13 @@ func TestLoginWrongPassword(t *testing.T) {
 
 	tserver := newTestServer(t)
 
-	tserver.createSession("wrongpwuser")
+	// Create session and set password via PASS command.
-	tserver.setPassword("wrongpwuser")
+	token := tserver.createSession("wrongpwuser")
+
+	tserver.sendCommand(token, map[string]any{
+		commandKey: irc.CmdPass,
+		bodyKey:    []string{"correctpass1"},
+	})
 
 	postJSONExpectStatus(
 		t, tserver, "/api/v1/login",
@@ -4143,31 +3904,6 @@ func assertWhoReplyUsername(
 	)
 }
 
-func TestWhoUnknownChannelEndReplyAddsHash(t *testing.T) {
-	t.Parallel()
-
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("whoasker")
-
-	_, lastID := tserver.pollMessages(token, 0)
-
-	msgs, _ := sendAndPoll(tserver, token, lastID, map[string]any{
-		commandKey: irc.CmdWho,
-		toKey:      "nosuch",
-	})
-
-	endOfWho := findNumericWithParams(msgs, "315")
-	if endOfWho == nil {
-		t.Fatalf("expected RPL_ENDOFWHO (315), got %v", msgs)
-	}
-
-	params := getNumericParams(endOfWho)
-	if !slices.Equal(params, []string{"#nosuch"}) {
-		t.Fatalf("expected params [#nosuch], got %v", params)
-	}
-}
-
 func TestSessionUsernameDefault(t *testing.T) {
 	t.Parallel()
 
@@ -4286,8 +4022,13 @@ func TestLoginRateLimitAllowsNormalUse(t *testing.T) {
 
 	tserver := newTestServer(t)
 
-	tserver.createSession("normaluser")
+	// Create session and set password via PASS command.
-	tserver.setPassword("normaluser")
+	token := tserver.createSession("normaluser")
+
+	tserver.sendCommand(token, map[string]any{
+		commandKey: irc.CmdPass,
+		bodyKey:    []string{testPassword},
+	})
 
 	// A single login should succeed without rate limiting.
 	loginBody, err := json.Marshal(map[string]string{
@@ -7056,32 +6797,6 @@ func TestISUPPORT(t *testing.T) {
 	}
 }
 
-// TestMyInfoListsModes verifies the 004 numeric lists the
-// user modes o and w as its third parameter, and the HTTP
-// API's channel modes Hbiklmnostv as its fourth.
-func TestMyInfoListsModes(t *testing.T) {
-	t.Parallel()
-
-	tserver := newTestServer(t)
-	token := tserver.createSession("myinfo")
-
-	msgs, _ := tserver.pollMessages(token, 0)
-
-	myInfo := findNumericWithParams(msgs, "004")
-	if myInfo == nil {
-		t.Fatal("expected 004 RPL_MYINFO")
-	}
-
-	params := getNumericParams(myInfo)
-	if len(params) != 4 || params[2] != "ow" ||
-		params[3] != "Hbiklmnostv" {
-		t.Fatalf(
-			"004 params %v, want four ending ow Hbiklmnostv",
-			params,
-		)
-	}
-}
-
 // TestNonOpCannotSetModes verifies non-operators
 // cannot set +i, +s, +k, +l, +b.
 func TestNonOpCannotSetModes(t *testing.T) {

internal/handlers/auth.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"encoding/json"
 	"net/http"
 	"strings"
 
@@ -54,7 +55,7 @@ func (hdlr *Handlers) handleLogin(
 
 	var payload loginRequest
 
-	err := decodeJSON(request, &payload)
+	err := json.NewDecoder(request.Body).Decode(&payload)
 	if err != nil {
 		hdlr.respondError(
 			writer, request,

internal/handlers/handlers.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"io"
 	"log/slog"
 	"net/http"
 	"time"
@@ -160,18 +159,6 @@ func (hdlr *Handlers) respondError(
 	)
 }
 
-// decodeJSON reads the whole request body and decodes it into dest.
-// It fails if the body is larger than the http.MaxBytesReader limit,
-// or holds anything other than one JSON value and whitespace.
-func decodeJSON(request *http.Request, dest any) error {
-	body, err := io.ReadAll(request.Body)
-	if err != nil {
-		return err
-	}
-
-	return json.Unmarshal(body, dest)
-}
-
 func (hdlr *Handlers) idleTimeout() time.Duration {
 	raw := hdlr.params.Config.SessionIdleTimeout
 	if raw == "" {

internal/ircserver/commands.go

@@ -371,7 +371,6 @@ func (c *Conn) handleQuit(msg *Message) {
 
 	c.mu.Lock()
 	c.closed = true
-	c.quitReason = reason
 	c.mu.Unlock()
 }
 
@@ -1227,12 +1226,9 @@ func (c *Conn) handlePassPostReg(
 		return
 	}
 
-	// The IRC listener cannot add a connection to an existing
-	// session; only the HTTP API login can.
 	c.sendFromServer("NOTICE", c.currentNick(),
-		"Password set. Another client can log in to this "+
+		"Password set. You can reconnect using "+
-			"session over the HTTP API: POST /api/v1/login "+
+			"PASS <password> with your nick.",
-			"with your nick and this password.",
 	)
 }
 

internal/ircserver/conn.go

@@ -69,11 +69,6 @@ type Conn struct {
 	lastQueueID int64
 	closed      bool
 	killed      bool
-
-	// quitReason is the reason in the QUIT that peers are
-	// sent when the connection ends. The client's QUIT
-	// replaces it.
-	quitReason string
 }
 
 func newConn(
@@ -100,7 +95,6 @@ func newConn(
 		svc:       svc,
 		serverSfx: srvName,
 		remoteIP:  host,
-		quitReason: "Connection closed",
 	}
 
 	conn.commands = conn.buildCommandMap()
@@ -284,7 +278,6 @@ func (c *Conn) cleanup(ctx context.Context) {
 	wasKilled := c.killed
 	sessID := c.sessionID
 	nick := c.nick
-	quitReason := c.quitReason
 	c.closed = true
 	c.mu.Unlock()
 
@@ -294,7 +287,9 @@ func (c *Conn) cleanup(ctx context.Context) {
 		// KILL has already sent the QUIT and deleted the
 		// session.
 		if !wasKilled {
-			c.svc.BroadcastQuit(ctx, sessID, nick, quitReason)
+			c.svc.BroadcastQuit(
+				ctx, sessID, nick, "Connection closed",
+			)
 		}
 	}
 
@@ -610,7 +605,7 @@ func (c *Conn) deliverWelcome() {
 	)
 	c.sendNumeric(
 		irc.RplMyInfo,
-		c.serverSfx, "neoirc", service.UserModes, "Himnostv",
+		c.serverSfx, "neoirc", "", "mnst",
 	)
 	c.sendNumeric(
 		irc.RplIsupport,

internal/ircserver/relay_test.go

@@ -8,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/crypto/bcrypt"
-	"sneak.berlin/go/neoirc/internal/dbtest"
 	"sneak.berlin/go/neoirc/internal/ircserver"
 	"sneak.berlin/go/neoirc/internal/service"
 )
@@ -318,7 +316,7 @@ func TestRelayNickDiffersOnlyInCase(t *testing.T) {
 		{"JOIN #case", ":Alice!Alice@* JOIN #case"},
 		{"NICK Alicia", ":Alice!Alice@* NICK Alicia"},
 		{"NICK Alice", ":Alicia!Alicia@* NICK Alice"}, // back for QUIT
-		{"QUIT", ":Alice!Alice@* QUIT :Quit: Client quit"},
+		{"QUIT", ":Alice!Alice@* QUIT :Quit: Connection closed"},
 	} {
 		capitalAlice.send(step.line)
 
@@ -585,10 +583,8 @@ func ownSessionCopies(
 
 // aliceWithHTTPClient connects alice to the IRC listener and
 // has her join #chan, which bob is on too, then adds an HTTP API
-// client to her session with a password, as POST /api/v1/login
+// client to her session with the password her connection set,
-// does. It stores that password without sending PASS. It hashes
+// as POST /api/v1/login does. It returns her connection, bob's
-// at bcrypt.MinCost, and a login compares at the cost stored in
-// the hash, so both are fast. It returns her connection, bob's
 // connection, her session and her HTTP API client.
 func aliceWithHTTPClient(
 	t *testing.T, env *testEnv,
@@ -598,24 +594,15 @@ func aliceWithHTTPClient(
 	const password = "alicepass"
 
 	alice := env.dial(t)
+	alice.send("PASS " + password)
 	alice.register("alice")
+	// Registration stores the password before the JOIN runs.
 	alice.joinAndDrain("#chan")
 
 	bob := env.dial(t)
 	bob.register("bob")
 	bob.joinAndDrain("#chan")
 
-	hash, err := bcrypt.GenerateFromPassword(
-		[]byte(password), bcrypt.MinCost,
-	)
-	if err != nil {
-		t.Fatalf("hash password: %v", err)
-	}
-
-	dbtest.Exec(t, env.dbURL,
-		"UPDATE sessions SET password_hash = '"+string(hash)+
-			"' WHERE nick = 'alice'")
-
 	sessionID, httpClientID, _, err := env.database.LoginUser(
 		t.Context(), "alice", password, "127.0.0.1", "localhost",
 	)

internal/ircserver/server_test.go

@@ -4,14 +4,12 @@ import (
 	"bufio"
 	"context"
 	"database/sql"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"log/slog"
 	"net"
 	"os"
 	"runtime"
-	"slices"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -25,16 +23,20 @@ import (
 	"sneak.berlin/go/neoirc/internal/globals"
 	"sneak.berlin/go/neoirc/internal/ircserver"
 	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/pkg/irc"
 
 	_ "modernc.org/sqlite"
 )
 
 const testTimeout = 5 * time.Second
 
+func TestMain(m *testing.M) {
+	db.SetBcryptCost(4)
+
+	os.Exit(m.Run())
+}
+
 // testEnv holds the shared test infrastructure.
 type testEnv struct {
-	dbURL    string
 	database *db.Database
 	brk      *broker.Broker
 	cfg      *config.Config
@@ -105,26 +107,33 @@ func newTestEnvWithResolver(
 ) *testEnv {
 	t.Helper()
 
-	dbURL := dbtest.NewURL(t)
+	conn, err := sql.Open("sqlite", dbtest.NewURL(t))
-	lifecycle := fxtest.NewLifecycle(t)
-
-	dbLog, err := logger.New(lifecycle, logger.Params{
-		Globals: &globals.Globals{},
-	})
 	if err != nil {
-		t.Fatalf("new logger: %v", err)
+		t.Fatalf("open db: %v", err)
 	}
 
-	database, err := db.New(lifecycle, db.Params{
+	t.Cleanup(func() {
-		Logger: dbLog,
+		err := conn.Close()
-		Config: &config.Config{DBURL: dbURL},
-	})
 		if err != nil {
-		t.Fatalf("new database: %v", err)
+			t.Logf("close db: %v", err)
+		}
+	})
+
+	conn.SetMaxOpenConns(1)
+
+	_, err = conn.ExecContext(
+		t.Context(), "PRAGMA foreign_keys = ON",
+	)
+	if err != nil {
+		t.Fatalf("pragma: %v", err)
 	}
 
-	lifecycle.RequireStart()
+	database := db.NewTestDatabaseFromConn(conn)
-	t.Cleanup(lifecycle.RequireStop)
+
+	err = database.RunMigrations(t.Context())
+	if err != nil {
+		t.Fatalf("migrate: %v", err)
+	}
 
 	brk := broker.New()
 
@@ -149,7 +158,6 @@ func newTestEnvWithResolver(
 	t.Cleanup(srv.Stop)
 
 	return &testEnv{
-		dbURL:    dbURL,
 		database: database,
 		brk:      brk,
 		cfg:      cfg,
@@ -478,22 +486,6 @@ func TestWelcomeContainsNick(t *testing.T) {
 	}
 }
 
-// TestMyInfoListsModes checks that RPL_MYINFO lists the user
-// modes o and w, then the channel modes MODE accepts on the
-// IRC listener. It compares the whole line, so a missing or
-// extra mode fails it.
-func TestMyInfoListsModes(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	lines := env.dial(t).register("carol")
-
-	want := ":test.irc 004 carol test.irc neoirc ow Himnostv"
-	if !slices.Contains(lines, want) {
-		t.Errorf("no line %q in %v", want, lines)
-	}
-}
-
 func TestPingPong(t *testing.T) {
 	t.Parallel()
 
@@ -864,107 +856,6 @@ func TestQuit(t *testing.T) {
 	assertContains(t, lines, "goodbye", "QUIT reason")
 }
 
-// TestQuitReasonReachesPeers checks the reason that an IRC
-// listener user's channel peers see in its QUIT, on both the
-// IRC listener and the HTTP API. It is the reason the user
-// gave, Client quit for a QUIT without one, or Connection
-// closed when the connection ends without a QUIT.
-func TestQuitReasonReachesPeers(t *testing.T) {
-	t.Parallel()
-
-	for _, step := range []struct {
-		name, quit, want string
-	}{
-		{"QUIT with a reason", "QUIT :gone home", "gone home"},
-		{"QUIT without a reason", irc.CmdQuit, "Client quit"},
-		{"connection closed without QUIT", "", "Connection closed"},
-	} {
-		t.Run(step.name, func(t *testing.T) {
-			t.Parallel()
-
-			ircLine, apiBody := quitSeenByPeers(t, step.quit)
-
-			want := ":quitter!quitter@* QUIT :Quit: " + step.want
-			if ircLine != want {
-				t.Errorf("IRC peer got %q, want %q", ircLine, want)
-			}
-
-			if len(apiBody) != 1 || apiBody[0] != step.want {
-				t.Errorf("HTTP API peer got %q, want [%q]", apiBody, step.want)
-			}
-		})
-	}
-}
-
-// quitSeenByPeers starts a server on which quitter, ircpeer on
-// the IRC listener and apipeer on the HTTP API share a channel.
-// quitter sends the line quit, or closes its connection when
-// quit is empty. It returns the QUIT line ircpeer is sent and
-// the body of the QUIT apipeer is sent.
-func quitSeenByPeers(t *testing.T, quit string) (string, []string) {
-	t.Helper()
-
-	env := newTestEnv(t)
-	ctx := t.Context()
-
-	ircPeer := env.dial(t)
-	ircPeer.register("ircpeer")
-	ircPeer.joinAndDrain("#bye")
-
-	apiPeerID, apiPeerClientID, _, err := env.database.CreateSession(
-		ctx, "apipeer", "apipeer", "", "",
-	)
-	if err != nil {
-		t.Fatalf("create peer session: %v", err)
-	}
-
-	_, _, err = env.database.CreateOrJoinChannel(ctx, "#bye", apiPeerID, "")
-	if err != nil {
-		t.Fatalf("join peer: %v", err)
-	}
-
-	quitter := env.dial(t)
-	quitter.register("quitter")
-	quitter.joinAndDrain("#bye")
-
-	if quit == "" {
-		err = quitter.conn.Close()
-		if err != nil {
-			t.Fatalf("close: %v", err)
-		}
-	} else {
-		quitter.send(quit)
-	}
-
-	lines := ircPeer.readUntil(func(l string) bool {
-		return strings.Contains(l, " QUIT ")
-	})
-
-	// The QUIT is queued to both peers at once, so apipeer has
-	// it by now.
-	msgs, _, err := env.database.PollMessages(ctx, apiPeerClientID, 0, 0)
-	if err != nil {
-		t.Fatalf("poll peer: %v", err)
-	}
-
-	for _, msg := range msgs {
-		if msg.Command == irc.CmdQuit && msg.From == "quitter" {
-			var body []string
-
-			err = json.Unmarshal(msg.Body, &body)
-			if err != nil {
-				t.Fatalf("decode QUIT body %s: %v", msg.Body, err)
-			}
-
-			return lines[len(lines)-1], body
-		}
-	}
-
-	t.Fatalf("apipeer was not sent the QUIT: %v", msgs)
-
-	return "", nil
-}
-
 // TestStopEndsSessions checks that stopping the server ends
 // a registered connection's session before Stop returns, as
 // closing the connection does: the session, its client and
@@ -989,9 +880,12 @@ func TestStopEndsSessions(t *testing.T) {
 		t.Fatalf("create peer session: %v", err)
 	}
 
-	channelID, _, err := env.database.CreateOrJoinChannel(
+	channelID, err := env.database.GetChannelByName(ctx, "#shut")
-		ctx, "#shut", peerID, "",
+	if err != nil {
-	)
+		t.Fatalf("get channel: %v", err)
+	}
+
+	err = env.database.JoinChannel(ctx, channelID, peerID)
 	if err != nil {
 		t.Fatalf("join peer: %v", err)
 	}
@@ -1049,16 +943,11 @@ func TestStopReturnsWhileCleanupIsStuck(t *testing.T) {
 
 	client.register("stuck")
 
-	// While a connection of the test's own holds a write
+	// The test database has one connection. While the test
-	// transaction, the cleanup's first write waits for it to end.
+	// holds it, the cleanup's first query waits for it.
-	holder, err := sql.Open("sqlite", env.dbURL)
+	held, err := env.database.GetDB().Conn(t.Context())
 	if err != nil {
-		t.Fatalf("open a second database connection: %v", err)
+		t.Fatalf("take the database connection: %v", err)
-	}
-
-	_, err = holder.ExecContext(t.Context(), "BEGIN IMMEDIATE")
-	if err != nil {
-		t.Fatalf("begin a write transaction: %v", err)
 	}
 
 	stopped := make(chan struct{})
@@ -1074,11 +963,10 @@ func TestStopReturnsWhileCleanupIsStuck(t *testing.T) {
 		t.Error("Stop did not return while a cleanup was stuck")
 	}
 
-	// Closing ends the transaction, which lets the cleanup finish
+	// Lets the cleanup finish before the database is closed.
-	// before the database is closed.
+	err = held.Close()
-	err = holder.Close()
 	if err != nil {
-		t.Errorf("close the second database connection: %v", err)
+		t.Errorf("release the database connection: %v", err)
 	}
 }
 
@@ -1237,9 +1125,6 @@ func TestAwaySetAndClear(t *testing.T) {
 	assertContains(t, clearLines, " 305 ", "RPL_UNAWAY")
 }
 
-// TestHandlePassPostRegistration checks the NOTICE that
-// confirms PASS after registration. It points to the HTTP API
-// login, the only way to add a client to an existing session.
 func TestHandlePassPostRegistration(t *testing.T) {
 	t.Parallel()
 
@@ -1252,11 +1137,7 @@ func TestHandlePassPostRegistration(t *testing.T) {
 	)
 
 	assertContains(
-		t, lines,
+		t, lines, "Password set", "password confirmation",
-		" NOTICE passuser :Password set. Another client can log "+
-			"in to this session over the HTTP API: "+
-			"POST /api/v1/login with your nick and this password.",
-		"password confirmation",
 	)
 }
 
@@ -1357,11 +1238,14 @@ func TestPassPostRegistrationNotStored(t *testing.T) {
 
 	client.register("failpass")
 
-	dbtest.Exec(t, env.dbURL,
+	_, err := env.database.GetDB().ExecContext(t.Context(),
 		`CREATE TRIGGER refuse_password
 		 BEFORE UPDATE OF password_hash ON sessions
 		 BEGIN SELECT RAISE(ABORT, 'refused'); END`,
 	)
+	if err != nil {
+		t.Fatalf("create trigger: %v", err)
+	}
 
 	client.send("PASS :mypassword123")
 

internal/server/export_test.go

@@ -15,12 +15,6 @@ func NewTestSPAServer() *Server {
 	return srv
 }
 
-// Listener returns the listener the start hook bound for the
-// HTTP server.
-func (srv *Server) Listener() net.Listener {
-	return srv.listener
-}
-
 // ServeUntilShutdown runs serveUntilShutdown, which serves the
 // HTTP server on listener, and returns when it does.
 func (srv *Server) ServeUntilShutdown(listener net.Listener) {

internal/server/server.go

@@ -50,7 +50,6 @@ type Server struct {
 	sentryEnabled bool
 	log           *slog.Logger
 	httpServer    *http.Server
-	listener      net.Listener
 	router        *chi.Mux
 	params        Params
 	mw            *middleware.Middleware
@@ -180,8 +179,6 @@ func (srv *Server) startHTTP(ctx context.Context) error {
 		return fmt.Errorf("http listen: %w", err)
 	}
 
-	srv.listener = listener
-
 	srv.httpServer = &http.Server{ //nolint:exhaustruct // optional fields
 		Addr:           listenAddr,
 		ReadTimeout:    httpReadTimeout,

internal/server/server_test.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -56,12 +55,20 @@ func TestStopWaitsForRequestInProgress(t *testing.T) {
 		t.Fatalf("create session: %v", err)
 	}
 
-	tcpAddr, ok := srv.Listener().Addr().(*net.TCPAddr)
+	// The test cannot read the port the system gave the app, so
-	if !ok {
+	// it serves the same HTTP server on a listener of its own.
-		t.Fatalf("listener address %v is not TCP", srv.Listener().Addr())
+	var listenConfig net.ListenConfig
+
+	listener, err := listenConfig.Listen(
+		t.Context(), "tcp", "127.0.0.1:0",
+	)
+	if err != nil {
+		t.Fatalf("listen: %v", err)
 	}
 
-	addr := net.JoinHostPort("127.0.0.1", strconv.Itoa(tcpAddr.Port))
+	go srv.ServeUntilShutdown(listener)
+
+	addr := listener.Addr().String()
 
 	statuses := make(chan int, 1)
 

internal/service/service.go

@@ -1169,12 +1169,6 @@ func (s *Service) ApplyUserMode(
 	return s.QueryUserMode(ctx, sessionID)
 }
 
-// UserModes lists the user modes the server supports, as
-// RPL_MYINFO sends them: o (server operator) and w
-// (receives WALLOPS). parseUserModeString must accept the
-// same letters.
-const UserModes = "ow"
-
 // parseUserModeString parses a user mode string such as
 // "+w", "-o" or "+w-o" into the new value of each flag it
 // names, or nil for a flag it does not name; a later letter

internal/service/service_test.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"os"
 	"slices"
 	"strings"
 	"sync"
@@ -17,6 +18,7 @@ import (
 
 	"go.uber.org/fx"
 	"go.uber.org/fx/fxtest"
+	"golang.org/x/crypto/bcrypt"
 	"sneak.berlin/go/neoirc/internal/broker"
 	"sneak.berlin/go/neoirc/internal/config"
 	"sneak.berlin/go/neoirc/internal/db"
@@ -28,10 +30,14 @@ import (
 	"sneak.berlin/go/neoirc/pkg/irc"
 )
 
+func TestMain(m *testing.M) {
+	db.SetBcryptCost(bcrypt.MinCost)
+	os.Exit(m.Run())
+}
+
 // testEnv holds all dependencies for a service test.
 type testEnv struct {
 	svc    *service.Service
-	dbURL  string
 	db     *db.Database
 	broker *broker.Broker
 	app    *fxtest.App
@@ -105,7 +111,6 @@ func newTestEnv(t *testing.T) *testEnv {
 
 	return &testEnv{
 		svc:    svc,
-		dbURL:  dbURL,
 		db:     database,
 		broker: brk,
 		app:    app,
@@ -935,16 +940,19 @@ func TestSendDirectMessageTargetQuits(t *testing.T) {
 	sid := createSession(ctx, t, env.db, "alice")
 	createSession(ctx, t, env.db, "bob")
 
-	dbtest.Exec(t, env.dbURL,
+	_, err := env.db.GetDB().ExecContext(ctx,
 		`CREATE TRIGGER delete_recipient
 		 BEFORE INSERT ON messages
 		 BEGIN
 		   DELETE FROM sessions WHERE id = NEW.to_session_id;
 		 END`)
+	if err != nil {
+		t.Fatalf("create trigger: %v", err)
+	}
 
 	body, _ := json.Marshal([]string{"hi"}) //nolint:errchkjson
 
-	_, err := env.svc.SendDirectMessage(
+	_, err = env.svc.SendDirectMessage(
 		ctx, sid, 0, "alice", irc.CmdPrivmsg, "bob", body, nil,
 	)
 
@@ -970,12 +978,15 @@ func TestSendChannelMessageChannelDeleted(t *testing.T) {
 		t.Fatalf("join alice: %v", err)
 	}
 
-	dbtest.Exec(t, env.dbURL,
+	_, err = env.db.GetDB().ExecContext(ctx,
 		`CREATE TRIGGER delete_recipient
 		 BEFORE INSERT ON messages
 		 BEGIN
 		   DELETE FROM channels WHERE id = NEW.to_channel_id;
 		 END`)
+	if err != nil {
+		t.Fatalf("create trigger: %v", err)
+	}
 
 	body, _ := json.Marshal([]string{"hi"}) //nolint:errchkjson
 

schema/README.md

@@ -1,101 +1,98 @@
-# Message schemas
+# Message Schemas
 
-This directory holds JSON Schema files (draft 2020-12) for the messages that the
+JSON Schema definitions (draft 2020-12) for the neoirc protocol. Messages use
-neoirc HTTP API carries. `message.json` describes the fields that every message
+**IRC command names and numeric reply codes** (RFC 1459/2812) encoded as JSON
-can have. `commands/` has files for some commands. `numerics/` has files for
+over HTTP.
-some of the numeric replies. A numeric reply is a server reply named by a
-three-digit number, such as `001`. `README.md` at the repository root documents
-the protocol.
 
-The server can also run an IRC listener for ordinary IRC clients. The IRC
+## Envelope
-listener sends plain IRC lines, which these files do not describe.
 
-## Message fields
+Every message is a JSON object with a `command` field. The format maps directly
-
+to IRC wire format:
-Every message is one JSON object, which `message.json` calls the envelope. These
-are the fields it can have:
-
-- `command`: the IRC command name, such as `PRIVMSG`, or the name of a numeric
-  reply, such as `RPL_WELCOME`. Always present.
-- `code`: the number of a numeric reply, such as `1` for `RPL_WELCOME`. Absent
-  on other messages.
-- `id`: the message's UUID, a unique ID that the server assigns.
-- `from`: the sender's nick, or the server name on a numeric reply or a `PONG`.
-- `to`: the target, such as a channel name starting with `#` or a nick.
-- `params`: an array of strings with the message's other parameters, in order.
-  `KICK` events and many numeric replies have it. The HTTP API ignores `params`
-  sent by a client.
-- `body`: an array of strings. It is never a bare string. In a `PRIVMSG` or
-  `NOTICE`, each string is one line of text.
-- `ts`: the time the server stored the message. It is an RFC 3339 time in UTC,
-  such as `2026-10-27T12:00:00.123Z`.
-- `meta`: an object of extra data, such as a hashcash stamp in `meta.hashcash`.
-  A hashcash stamp is a short string that takes a computer some work to make. A
-  `PRIVMSG` to a channel with mode `+H` needs one. The HTTP API relays the
-  `meta` of a `PRIVMSG` or `NOTICE` unchanged. It drops the `meta` of every
-  other command.
-
-Here is one `PRIVMSG` as the IRC listener sends it and as the HTTP API sends it.
-The JSON leaves out `id`, `ts` and `meta`:
 
 ```
-IRC:  :alice!alice@* PRIVMSG #general :hello world
+IRC:  :nick PRIVMSG #channel :hello world
-JSON: {"command": "PRIVMSG", "from": "alice", "to": "#general", "body": ["hello world"]}
+JSON: {"command": "PRIVMSG", "from": "nick", "to": "#channel", "body": ["hello world"]}
+
+IRC:  :server 353 nick = #channel :user1 @op1 +voice1
+JSON: {"command": "353", "to": "nick", "params": ["=", "#channel"], "body": ["user1 @op1 +voice1"]}
+
+Multiline:  {"command": "PRIVMSG", "to": "#ch", "body": ["line 1", "line 2"]}
+Structured: {"command": "PUBKEY", "body": {"alg": "ed25519", "key": "base64..."}}
 ```
 
-In the JSON, a numeric reply has its name in `command` and its number in `code`.
+Common fields (see `message.json` for full schema):
-This `353` reply lists the members of `#general`. The JSON again leaves out
-`id`, `ts` and `meta`:
 
-```
+| Field     | Type            | Description                                          |
-{"command": "RPL_NAMREPLY", "code": 353, "from": "neoirc", "to": "alice",
+| --------- | --------------- | ---------------------------------------------------- |
- "params": ["=", "#general"], "body": ["@op1!op1@host1 alice!alice@host2"]}
+| `id`      | string (uuid)   | Server-assigned message UUID                         |
-```
+| `command` | string          | IRC command or 3-digit numeric code                  |
+| `from`    | string          | Source nick or server name (IRC prefix)              |
+| `to`      | string          | Target: #channel or nick                             |
+| `params`  | string[]        | Middle parameters (mainly for numerics)              |
+| `body`    | array \| object | Structured body — never a raw string (see below)     |
+| `ts`      | string          | ISO 8601 timestamp (server-assigned, not in raw IRC) |
+| `meta`    | object          | Extensible metadata (signatures, hashes, etc.)       |
 
-A `PRIVMSG` whose `body` has two strings is a two-line message:
+**Structured bodies:** `body` is always an array of strings (for text) or an
+object (for structured data like PUBKEY). Never a raw string. This enables:
 
-```
+- Multiline messages without escape sequences
-{"command": "PRIVMSG", "to": "#general", "body": ["line one", "line two"]}
+- Deterministic canonicalization via RFC 8785 JCS for signing
-```
+- Structured data where needed
 
-## Files
+## Commands
 
-Most command files describe both the message a client sends and the message the
+IRC commands used for client↔server and server↔server communication.
-server sends. Their field descriptions say where the two differ. The examples in
-the files leave out `id`, `ts` and `meta`.
 
-Commands, in `commands/`:
+| Command   | File                    | RFC         | Description                |
+| --------- | ----------------------- | ----------- | -------------------------- |
+| `PRIVMSG` | `commands/PRIVMSG.json` | 1459 §4.4.1 | Message to channel or user |
+| `NOTICE`  | `commands/NOTICE.json`  | 1459 §4.4.2 | Notice (no auto-reply)     |
+| `JOIN`    | `commands/JOIN.json`    | 1459 §4.2.1 | Join a channel             |
+| `PART`    | `commands/PART.json`    | 1459 §4.2.2 | Leave a channel            |
+| `QUIT`    | `commands/QUIT.json`    | 1459 §4.1.6 | User disconnected          |
+| `NICK`    | `commands/NICK.json`    | 1459 §4.1.2 | Change nickname            |
+| `TOPIC`   | `commands/TOPIC.json`   | 1459 §4.2.4 | Get/set channel topic      |
+| `MODE`    | `commands/MODE.json`    | 1459 §4.2.3 | Set channel/user modes     |
+| `KICK`    | `commands/KICK.json`    | 1459 §4.2.8 | Kick user from channel     |
+| `PING`    | `commands/PING.json`    | 1459 §4.6.2 | Keepalive                  |
+| `PONG`    | `commands/PONG.json`    | 1459 §4.6.3 | Keepalive response         |
+| `PUBKEY`  | `commands/PUBKEY.json`  | (extension) | Announce/relay signing key |
 
-- `PRIVMSG.json`: a message to a channel or a user.
+## Numeric Replies
-- `NOTICE.json`: a notice, which is a message that a client must not answer
-  automatically.
-- `JOIN.json`: joining a channel.
-- `PART.json`: leaving a channel.
-- `QUIT.json`: leaving the server.
-- `NICK.json`: changing nick.
-- `TOPIC.json`: setting a channel's topic.
-- `MODE.json`: querying or changing a channel's modes or the user's own modes.
-- `KICK.json`: a channel operator removing a user from a channel.
-- `PING.json`: a check that the server still answers.
-- `PONG.json`: the answer to a `PING`, which is the HTTP response to it.
 
-Numeric replies, in `numerics/`:
+Three-digit codes for server responses, per IRC convention.
 
-- `001.json`: `RPL_WELCOME`, which welcomes the user.
+### Success / Informational (0xx–3xx)
-- `002.json`: `RPL_YOURHOST`, the server's name and version.
+
-- `003.json`: `RPL_CREATED`, the date the server last started.
+| Code  | Name           | File                | Description                    |
-- `004.json`: `RPL_MYINFO`, the server's name, its version and its lists of
+| ----- | -------------- | ------------------- | ------------------------------ |
-  modes.
+| `001` | RPL_WELCOME    | `numerics/001.json` | Welcome after session creation |
-- `322.json`: `RPL_LIST`, one channel in the answer to `LIST`.
+| `002` | RPL_YOURHOST   | `numerics/002.json` | Server host info               |
-- `323.json`: `RPL_LISTEND`, the end of the answer to `LIST`.
+| `003` | RPL_CREATED    | `numerics/003.json` | Server creation date           |
-- `332.json`: `RPL_TOPIC`, a channel's topic.
+| `004` | RPL_MYINFO     | `numerics/004.json` | Server info and modes          |
-- `353.json`: `RPL_NAMREPLY`, a channel's members.
+| `322` | RPL_LIST       | `numerics/322.json` | Channel list entry             |
-- `366.json`: `RPL_ENDOFNAMES`, the end of the member list.
+| `323` | RPL_LISTEND    | `numerics/323.json` | End of channel list            |
-- `372.json`: `RPL_MOTD`, one line of the message of the day.
+| `332` | RPL_TOPIC      | `numerics/332.json` | Channel topic                  |
-- `375.json`: `RPL_MOTDSTART`, the start of the message of the day.
+| `353` | RPL_NAMREPLY   | `numerics/353.json` | Channel member list            |
-- `376.json`: `RPL_ENDOFMOTD`, the end of the message of the day.
+| `366` | RPL_ENDOFNAMES | `numerics/366.json` | End of NAMES list              |
-- `401.json`: `ERR_NOSUCHNICK`, the nick does not exist.
+| `372` | RPL_MOTD       | `numerics/372.json` | MOTD line                      |
-- `403.json`: `ERR_NOSUCHCHANNEL`, the channel does not exist.
+| `375` | RPL_MOTDSTART  | `numerics/375.json` | Start of MOTD                  |
-- `433.json`: `ERR_NICKNAMEINUSE`, the nick is taken.
+| `376` | RPL_ENDOFMOTD  | `numerics/376.json` | End of MOTD                    |
-- `442.json`: `ERR_NOTONCHANNEL`, the user is not on that channel.
+
-- `482.json`: `ERR_CHANOPRIVSNEEDED`, the user is not a channel operator.
+### Errors (4xx)
+
+| Code  | Name                 | File                | Description             |
+| ----- | -------------------- | ------------------- | ----------------------- |
+| `401` | ERR_NOSUCHNICK       | `numerics/401.json` | No such nick/channel    |
+| `403` | ERR_NOSUCHCHANNEL    | `numerics/403.json` | No such channel         |
+| `433` | ERR_NICKNAMEINUSE    | `numerics/433.json` | Nickname already in use |
+| `442` | ERR_NOTONCHANNEL     | `numerics/442.json` | Not on that channel     |
+| `482` | ERR_CHANOPRIVSNEEDED | `numerics/482.json` | Not channel operator    |
+
+## Federation (S2S)
+
+Server-to-server messages use the same command format. Federated servers relay
+messages with an additional `origin` field in `meta` to track the source server.
+The PING/PONG commands serve as inter-server keepalives. State sync after link
+establishment uses a burst of JOIN, NICK, TOPIC, and MODE commands.

schema/commands/JOIN.json

@@ -2,25 +2,15 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/JOIN.json",
   "title": "JOIN",
-  "description": "Join a channel. A client sends it to join a channel, which the server creates if it does not exist. The server sends it to every member of the channel when a user joins, the new member included. RFC 1459 §4.2.1.",
+  "description": "Join a channel. C2S: request to join. S2C: notification that a user joined. RFC 1459 §4.2.1.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "JOIN" },
-    "from": { "type": "string", "description": "The nick that joined. The server sets it." },
+    "from": { "type": "string", "description": "Nick that joined (S2C)." },
-    "to": {
+    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" }
-      "type": "string",
-      "description": "The channel name: # and then 1 to 63 of a-z, A-Z, 0-9, _ and -. The server adds the # if a client leaves it out.",
-      "pattern": "^#?[a-zA-Z0-9_-]{1,63}$"
-    },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "From a client: the channel key as the first string, which a channel with mode +k needs. From the server: the channel name. After a login, and for GET /api/v1/state?initChannelState=1, the server queues a JOIN for each of the session's channels. That JOIN has an empty body."
-    }
   },
   "required": ["command", "to"],
   "examples": [
-    { "command": "JOIN", "to": "#general" },
+    { "command": "JOIN", "from": "alice", "to": "#general" }
-    { "command": "JOIN", "from": "alice", "to": "#general", "body": ["#general"] }
   ]
 }

schema/commands/KICK.json

@@ -2,33 +2,28 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/KICK.json",
   "title": "KICK",
-  "description": "Remove a user from a channel. A client sends it, and only a channel operator may. The server sends it to every member of the channel, the removed user included. RFC 1459 §4.2.8.",
+  "description": "Kick a user from a channel. RFC 1459 §4.2.8.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "KICK" },
-    "from": { "type": "string", "description": "The nick that removed the user. The server sets it." },
+    "from": { "type": "string", "description": "Nick that performed the kick." },
-    "to": {
+    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" },
-      "type": "string",
-      "description": "The channel name. The server adds the # if a client leaves it out.",
-      "pattern": "^#?[a-zA-Z0-9_-]{1,63}$"
-    },
     "params": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The removed nick. Only the server sends it.",
+      "description": "Kicked nick. e.g. [\"alice\"].",
       "minItems": 1,
       "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "From a client: the nick to remove, then an optional reason. From the server: the reason, as one string.",
+      "description": "Optional kick reason.",
-      "minItems": 1
+      "maxItems": 1
     }
   },
-  "required": ["command", "to", "body"],
+  "required": ["command", "to", "params"],
   "examples": [
-    { "command": "KICK", "to": "#general", "body": ["troll", "Behave"] },
     { "command": "KICK", "from": "op1", "to": "#general", "params": ["troll"], "body": ["Behave"] }
   ]
 }

schema/commands/MODE.json

@@ -2,29 +2,28 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/MODE.json",
   "title": "MODE",
-  "description": "Query or change a channel's modes or the user's own modes. A client sends it. The server sends it to every member of the channel when a channel mode changes. A +H or -H sent over the HTTP API is the exception. The server answers it with RPL_CHANNELMODEIS (324) and sends no MODE. RFC 1459 §4.2.3.",
+  "description": "Set or query channel/user modes. RFC 1459 §4.2.3.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "MODE" },
     "from": {
       "type": "string",
-      "description": "The nick that changed the mode. The server sets it."
+      "description": "Nick that set the mode (S2C only)."
     },
     "to": {
       "type": "string",
-      "description": "A channel name, which starts with #, or the user's own nick."
+      "description": "Channel name.",
+      "pattern": "^#[a-zA-Z0-9_-]+$"
     },
-    "body": {
+    "params": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "From a client: the mode change and then its value, as separate strings, such as \"+o\" and \"bob\". A MODE without a body is a query. From the server: the change and its value, as one string, such as \"+o bob\", or as separate strings, such as \"+k\" and \"secret\".",
+      "description": "Mode string and optional target nick. e.g. [\"+o\", \"alice\"].",
-      "examples": [["+o", "bob"], ["-m"], ["+o bob"], ["+k", "secret"]]
+      "examples": [["+o", "alice"], ["-m"], ["+v", "bob"]]
     }
   },
-  "required": ["command", "to"],
+  "required": ["command", "to", "params"],
   "examples": [
-    { "command": "MODE", "to": "#general", "body": ["+o", "bob"] },
+    { "command": "MODE", "from": "op1", "to": "#general", "params": ["+o", "alice"] }
-    { "command": "MODE", "from": "op1", "to": "#general", "body": ["+o bob"] },
-    { "command": "MODE", "from": "op1", "to": "#general", "body": ["+k", "secret"] }
   ]
 }

schema/commands/NICK.json

@@ -2,21 +2,21 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/NICK.json",
   "title": "NICK",
-  "description": "Change nick. A client sends it to change its nick. The server sends it to the user's own clients and to the users who share a channel with the user. RFC 1459 §4.1.2.",
+  "description": "Change nickname. C2S: request new nick. S2C: notification of nick change. RFC 1459 §4.1.2.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "NICK" },
-    "from": { "type": "string", "description": "The old nick. The server sets it." },
+    "from": { "type": "string", "description": "Old nick (S2C)." },
     "body": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The new nick, as the first string. The server sends one string.",
+      "description": "New nick (single-element array).",
-      "minItems": 1
+      "minItems": 1,
+      "maxItems": 1
     }
   },
   "required": ["command", "body"],
   "examples": [
-    { "command": "NICK", "body": ["newnick"] },
     { "command": "NICK", "from": "oldnick", "body": ["newnick"] }
   ]
 }

schema/commands/NOTICE.json

@@ -2,21 +2,20 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/NOTICE.json",
   "title": "NOTICE",
-  "description": "A notice: a message to a channel or a user that a client must not answer automatically. The server relays it as it relays a PRIVMSG. A NOTICE to a channel with mode +H needs no hashcash stamp. RFC 1459 §4.4.2.",
+  "description": "Send a notice. Like PRIVMSG but must not trigger automatic replies. RFC 1459 §4.4.2.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "NOTICE" },
-    "from": { "type": "string", "description": "The sender's nick. The server sets it." },
+    "from": { "type": "string" },
-    "to": { "type": "string", "description": "A channel name, which starts with #, or a nick." },
+    "to": { "type": "string", "description": "Target: #channel, nick, or * (global)." },
     "body": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The lines of the notice, one string per line.",
+      "description": "Notice text lines."
-      "minItems": 1
     }
   },
   "required": ["command", "to", "body"],
   "examples": [
-    { "command": "NOTICE", "from": "alice", "to": "#general", "body": ["Back in five minutes"] }
+    { "command": "NOTICE", "from": "server.example.com", "to": "*", "body": ["Server restarting in 5 minutes"] }
   ]
 }

schema/commands/PART.json

@@ -2,20 +2,17 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/PART.json",
   "title": "PART",
-  "description": "Leave a channel. A client sends it to leave. The server sends it to every member of the channel when a user leaves, the leaving user included. RFC 1459 §4.2.2.",
+  "description": "Leave a channel. C2S: request to leave. S2C: notification that a user left. RFC 1459 §4.2.2.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "PART" },
-    "from": { "type": "string", "description": "The nick that left. The server sets it." },
+    "from": { "type": "string", "description": "Nick that left (S2C)." },
-    "to": {
+    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" },
-      "type": "string",
-      "description": "The channel name. The server adds the # if a client leaves it out.",
-      "pattern": "^#?[a-zA-Z0-9_-]{1,63}$"
-    },
     "body": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The reason for leaving. A client may send one as the first string. The server always sends one string, which is empty when no reason was given."
+      "description": "Optional part reason.",
+      "maxItems": 1
     }
   },
   "required": ["command", "to"],

schema/commands/PING.json

@@ -2,13 +2,19 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/PING.json",
   "title": "PING",
-  "description": "A check that the server still answers. A client sends it. The server ignores every field but 'command'. Its answer is a PONG in the HTTP response. RFC 1459 §4.6.2.",
+  "description": "Keepalive. C2S or S2S. Server responds with PONG. RFC 1459 §4.6.2.",
   "$ref": "../message.json",
   "properties": {
-    "command": { "const": "PING" }
+    "command": { "const": "PING" },
+    "body": {
+      "type": "array",
+      "items": { "type": "string" },
+      "description": "Opaque token to be echoed in PONG (single-element array).",
+      "maxItems": 1
+    }
   },
   "required": ["command"],
   "examples": [
-    { "command": "PING" }
+    { "command": "PING", "body": ["1707580000"] }
   ]
 }

schema/commands/PONG.json

@@ -2,14 +2,20 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/PONG.json",
   "title": "PONG",
-  "description": "The answer to a PING. The server sends it as the HTTP response to the PING, with only 'command' and 'from'. A client's PONG gets ERR_UNKNOWNCOMMAND (421). RFC 1459 §4.6.3.",
+  "description": "Keepalive response. S2C or S2S. RFC 1459 §4.6.3.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "PONG" },
-    "from": { "type": "string", "description": "The server name." }
+    "from": { "type": "string", "description": "Responding server name." },
+    "body": {
+      "type": "array",
+      "items": { "type": "string" },
+      "description": "Echoed token from PING (single-element array).",
+      "maxItems": 1
+    }
   },
-  "required": ["command", "from"],
+  "required": ["command"],
   "examples": [
-    { "command": "PONG", "from": "neoirc" }
+    { "command": "PONG", "from": "server.example.com", "body": ["1707580000"] }
   ]
 }

schema/commands/PRIVMSG.json

@@ -2,16 +2,16 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/PRIVMSG.json",
   "title": "PRIVMSG",
-  "description": "A message to a channel or a user. A client sends it. The server relays it to every member of the channel, or to the user, and to the sender's own clients. RFC 1459 §4.4.1.",
+  "description": "Send a message to a channel or user. C2S: client sends to server. S2C: server relays to recipients. RFC 1459 §4.4.1.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "PRIVMSG" },
-    "from": { "type": "string", "description": "The sender's nick. The server sets it." },
+    "from": { "type": "string", "description": "Sender nick (set by server on relay)." },
-    "to": { "type": "string", "description": "A channel name, which starts with #, or a nick.", "examples": ["#general", "alice"] },
+    "to": { "type": "string", "description": "Target: #channel or nick.", "examples": ["#general", "alice"] },
     "body": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The lines of the message, one string per line.",
+      "description": "Message lines. One string per line.",
       "minItems": 1
     }
   },
@@ -19,6 +19,6 @@
   "examples": [
     { "command": "PRIVMSG", "from": "bob", "to": "#general", "body": ["hello world"] },
     { "command": "PRIVMSG", "from": "bob", "to": "#general", "body": ["line one", "line two"] },
-    { "command": "PRIVMSG", "from": "bob", "to": "alice", "body": ["hey"] }
+    { "command": "PRIVMSG", "from": "bob", "to": "alice", "body": ["hey"], "meta": { "sig": "base64...", "alg": "ed25519" } }
   ]
 }

schema/commands/PUBKEY.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://sneak.berlin/go/neoirc/schema/commands/PUBKEY.json",
+  "title": "PUBKEY",
+  "description": "Announce or relay a user's public signing key. C2S: client announces key to channel or server. S2C: server relays to channel members. Protocol extension (not in RFC 1459). Body is a structured object (not an array) containing the key material.",
+  "$ref": "../message.json",
+  "properties": {
+    "command": { "const": "PUBKEY" },
+    "from": { "type": "string", "description": "Nick announcing the key (set by server on relay)." },
+    "to": {
+      "type": "string",
+      "description": "Target: #channel to announce to channel members, or omit for server-wide announcement."
+    },
+    "body": {
+      "type": "object",
+      "description": "Key material.",
+      "properties": {
+        "alg": {
+          "type": "string",
+          "description": "Key algorithm.",
+          "enum": ["ed25519"]
+        },
+        "key": {
+          "type": "string",
+          "description": "Base64-encoded public key."
+        }
+      },
+      "required": ["alg", "key"],
+      "additionalProperties": false
+    }
+  },
+  "required": ["command", "body"],
+  "examples": [
+    { "command": "PUBKEY", "from": "alice", "body": { "alg": "ed25519", "key": "base64-encoded-pubkey" } },
+    { "command": "PUBKEY", "from": "alice", "to": "#general", "body": { "alg": "ed25519", "key": "base64-encoded-pubkey" } }
+  ]
+}

schema/commands/QUIT.json

@@ -2,20 +2,20 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/QUIT.json",
   "title": "QUIT",
-  "description": "A user left the server. A client sends it to end its session. The server sends it to the users who shared a channel with the user who left. RFC 1459 §4.1.6.",
+  "description": "User disconnected. S2C only. RFC 1459 §4.1.6.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "QUIT" },
-    "from": { "type": "string", "description": "The nick that quit. The server sets it." },
+    "from": { "type": "string", "description": "Nick that quit." },
     "body": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The reason for leaving. A client may send one as the first string, and the server uses 'Client quit' when it does not. The server always sends one string."
+      "description": "Optional quit reason.",
+      "maxItems": 1
     }
   },
-  "required": ["command"],
+  "required": ["command", "from"],
   "examples": [
-    { "command": "QUIT", "body": ["Gone for the day"] },
+    { "command": "QUIT", "from": "alice", "body": ["Connection reset"] }
-    { "command": "QUIT", "from": "alice", "body": ["Connection closed"] }
   ]
 }

schema/commands/TOPIC.json

@@ -2,24 +2,20 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/commands/TOPIC.json",
   "title": "TOPIC",
-  "description": "Set a channel's topic. A client sends it to set the topic. The server sends it to every member of the channel when the topic changes. RFC 1459 §4.2.4.",
+  "description": "Get or set channel topic. C2S: set topic (body present) or query (body absent). S2C: topic change notification. RFC 1459 §4.2.4.",
   "$ref": "../message.json",
   "properties": {
     "command": { "const": "TOPIC" },
-    "from": { "type": "string", "description": "The nick that set the topic. The server sets it." },
+    "from": { "type": "string", "description": "Nick that changed the topic (S2C)." },
-    "to": {
+    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" },
-      "type": "string",
-      "description": "The channel name. The server adds the # if a client leaves it out.",
-      "pattern": "^#?[a-zA-Z0-9_-]{1,63}$"
-    },
     "body": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The new topic. The server joins a client's strings with spaces, and sends the topic as one string. [\"\"] clears the topic.",
+      "description": "New topic text (single-element array). Empty array clears the topic.",
-      "minItems": 1
+      "maxItems": 1
     }
   },
-  "required": ["command", "to", "body"],
+  "required": ["command", "to"],
   "examples": [
     { "command": "TOPIC", "from": "alice", "to": "#general", "body": ["Welcome to the channel"] }
   ]

schema/message.json

@@ -2,55 +2,67 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/message.json",
   "title": "IRC Message Envelope",
-  "description": "Every message in the HTTP API is one JSON object with these fields. Only 'command' is always present.",
+  "description": "Base envelope for all messages. Mirrors IRC wire format (RFC 1459/2812) encoded as JSON over HTTP. The 'command' field carries either an IRC command name (PRIVMSG, JOIN, etc.) or a three-digit numeric reply code (001, 353, 433, etc.).",
   "type": "object",
   "properties": {
     "id": {
       "type": "string",
       "format": "uuid",
-      "description": "The message's UUID, which the server assigns. Present on every message the server queues for a client."
+      "description": "Server-assigned message UUID. Present on all server-originated messages."
     },
     "command": {
       "type": "string",
-      "description": "An IRC command name, such as PRIVMSG, or the name of a numeric reply, such as RPL_WELCOME. The server reads a client's command in any case and sends it in upper case.",
+      "description": "IRC command name (PRIVMSG, JOIN, NICK, etc.) or three-digit numeric reply code (001, 353, 433, etc.).",
-      "examples": ["PRIVMSG", "JOIN", "RPL_WELCOME", "ERR_NICKNAMEINUSE"]
+      "examples": ["PRIVMSG", "JOIN", "001", "353", "433"]
-    },
-    "code": {
-      "type": "integer",
-      "minimum": 1,
-      "maximum": 999,
-      "description": "The number of a numeric reply, such as 1 for RPL_WELCOME. Absent on other messages."
     },
     "from": {
       "type": "string",
-      "description": "The sender's nick, or the server name on a numeric reply or a PONG. The server sets it and ignores it from a client."
+      "description": "Source — nick for user messages, server name for server messages. Equivalent to IRC prefix."
     },
     "to": {
       "type": "string",
-      "description": "The target: a channel name, such as #general, or a nick. A WALLOPS has * here."
+      "description": "Target — channel (#name) or nick. Equivalent to first IRC parameter for most commands."
     },
     "params": {
       "type": "array",
       "items": { "type": "string" },
-      "description": "The message's other parameters, in order. KICK events and many numeric replies have it. The server ignores it from a client."
+      "description": "Additional parameters (used primarily by numeric replies). Equivalent to IRC middle parameters."
     },
     "body": {
+      "oneOf": [
+        {
           "type": "array",
           "items": { "type": "string" },
-      "description": "An array of strings, never a bare string. In a PRIVMSG or NOTICE, each string is one line of text."
+          "description": "Array of strings (one per line for text messages)."
+        },
+        {
+          "type": "object",
+          "description": "Structured data (e.g. PUBKEY key material).",
+          "additionalProperties": true
+        }
+      ],
+      "description": "Message body. MUST be an array or object, never a raw string. Arrays represent lines of text; objects carry structured data. This enables deterministic canonicalization (RFC 8785 JCS) for signing."
     },
     "ts": {
       "type": "string",
       "format": "date-time",
-      "description": "The time the server stored the message, as an RFC 3339 time in UTC."
+      "description": "Server-assigned timestamp (ISO 8601). Not present in original IRC; added for HTTP transport."
     },
     "meta": {
       "type": "object",
-      "description": "An object of extra data. Every message the server queues for a client has meta, which is {} when there is none. The server keeps a client's meta only on a PRIVMSG or NOTICE, and relays it unchanged.",
+      "description": "Extensible metadata. Used for signatures (meta.sig, meta.alg), hashes (meta.hash), and client extensions.",
       "properties": {
-        "hashcash": {
+        "sig": {
           "type": "string",
-          "description": "A hashcash stamp. A PRIVMSG to a channel with mode +H needs one."
+          "description": "Base64-encoded cryptographic signature over the canonical message form."
+        },
+        "alg": {
+          "type": "string",
+          "description": "Signature algorithm (e.g. 'ed25519')."
+        },
+        "hash": {
+          "type": "string",
+          "description": "Hash of the canonical message form (e.g. 'sha256:base64...')."
         }
       },
       "additionalProperties": true

schema/numerics/001.json

@@ -2,45 +2,32 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/001.json",
   "title": "001 RPL_WELCOME",
-  "description": "Welcomes the user. Sent after a session is created, after a login, and in answer to MOTD. RFC 2812 §5.1.",
+  "description": "Welcome message sent after successful session creation. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_WELCOME"
+      "const": "001"
-    },
-    "code": {
-      "const": 1
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
       "type": "string",
-      "description": "The user's nick."
+      "description": "Target nick."
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'Welcome to the network, ' and the user's nick.",
+      "description": "Welcome text lines."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
     "body"
   ],
   "examples": [
     {
-      "command": "RPL_WELCOME",
+      "command": "001",
-      "code": 1,
-      "from": "neoirc",
       "to": "alice",
       "body": [
         "Welcome to the network, alice"

schema/numerics/002.json

@@ -2,48 +2,34 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/002.json",
   "title": "002 RPL_YOURHOST",
-  "description": "The server's name and version. Sent right after RPL_WELCOME. RFC 2812 §5.1.",
+  "description": "Server host info sent after session creation. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_YOURHOST"
+      "const": "002"
-    },
-    "code": {
-      "const": 2
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'Your host is ', the server name, ', running version ' and the version.",
+      "description": "Host info lines."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
     "body"
   ],
   "examples": [
     {
-      "command": "RPL_YOURHOST",
+      "command": "002",
-      "code": 2,
-      "from": "neoirc",
       "to": "alice",
       "body": [
-        "Your host is neoirc, running version dev"
+        "Your host is neoirc.example.com, running version 0.1.0"
       ]
     }
   ]

schema/numerics/003.json

@@ -2,45 +2,31 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/003.json",
   "title": "003 RPL_CREATED",
-  "description": "The date the server last started. Sent right after RPL_YOURHOST. RFC 2812 §5.1.",
+  "description": "Server creation date. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_CREATED"
+      "const": "003"
-    },
-    "code": {
-      "const": 3
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'This server was created ' and the start date as YYYY-MM-DD.",
+      "description": "Text lines."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
     "body"
   ],
   "examples": [
     {
-      "command": "RPL_CREATED",
+      "command": "003",
-      "code": 3,
-      "from": "neoirc",
       "to": "alice",
       "body": [
         "This server was created 2026-02-01"

schema/numerics/004.json

@@ -2,64 +2,37 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/004.json",
   "title": "004 RPL_MYINFO",
-  "description": "The server's name, its version, and its lists of user and channel modes. Sent right after RPL_CREATED. RFC 2812 §5.1.",
+  "description": "Server info (name, version, available modes). RFC 2812 \u00a75.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_MYINFO"
+      "const": "004"
-    },
-    "code": {
-      "const": 4
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The server name, the version, the user modes 'ow' and the channel modes 'Hbiklmnostv'.",
+      "description": "[server_name, version, user_modes, channel_modes]."
-      "minItems": 4,
-      "maxItems": 4
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "One empty string.",
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
   ],
   "examples": [
     {
-      "command": "RPL_MYINFO",
+      "command": "004",
-      "code": 4,
-      "from": "neoirc",
       "to": "alice",
       "params": [
-        "neoirc",
+        "neoirc.example.com",
-        "dev",
+        "0.1.0",
-        "ow",
+        "o",
-        "Hbiklmnostv"
+        "imnst+ov"
-      ],
-      "body": [
-        ""
       ]
     }
   ]

schema/numerics/322.json

@@ -2,55 +2,38 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/322.json",
   "title": "322 RPL_LIST",
-  "description": "One channel in the answer to LIST. The answer has one per channel, except a secret channel, one with mode +s, that the user is not on. RFC 1459 §6.2.",
+  "description": "Channel list entry. One per channel in response to LIST. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_LIST"
+      "const": "322"
-    },
-    "code": {
-      "const": 322
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The channel name and its number of members.",
+      "description": "[channel, visible_count]."
-      "minItems": 2,
-      "maxItems": 2
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: the channel's topic, empty when it has none.",
+      "description": "Channel topic."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
   ],
   "examples": [
     {
-      "command": "RPL_LIST",
+      "command": "322",
-      "code": 322,
-      "from": "neoirc",
       "to": "alice",
       "params": [
         "#general",

schema/numerics/323.json

@@ -2,49 +2,26 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/323.json",
   "title": "323 RPL_LISTEND",
-  "description": "The end of the answer to LIST. RFC 1459 §6.2.",
+  "description": "End of channel list. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_LISTEND"
+      "const": "323"
-    },
-    "code": {
-      "const": 323
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'End of /LIST'.",
+      "description": "End of /LIST",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
+    "to"
-    "from",
-    "to",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "RPL_LISTEND",
-      "code": 323,
-      "from": "neoirc",
-      "to": "alice",
-      "body": [
-        "End of /LIST"
-      ]
-    }
   ]
 }

schema/numerics/332.json

@@ -2,55 +2,39 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/332.json",
   "title": "332 RPL_TOPIC",
-  "description": "A channel's topic. Sent to a client after it sets the topic, and after it joins a channel that has one. Also sent for each of a session's channels that has one after a login, and for GET /api/v1/state?initChannelState=1. RFC 1459 §6.2.",
+  "description": "Channel topic (sent on JOIN or TOPIC query). RFC 1459 \u00a76.2.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_TOPIC"
+      "const": "332"
-    },
-    "code": {
-      "const": 332
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The channel name.",
+      "description": "[channel]."
-      "minItems": 1,
-      "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: the topic.",
+      "description": "Topic text."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
     "params",
     "body"
   ],
   "examples": [
     {
-      "command": "RPL_TOPIC",
+      "command": "332",
-      "code": 332,
-      "from": "neoirc",
       "to": "alice",
       "params": [
         "#general"

schema/numerics/353.json

@@ -2,62 +2,46 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/353.json",
   "title": "353 RPL_NAMREPLY",
-  "description": "A channel's members. Sent to a client after it joins a channel, and in answer to NAMES. Also sent for each of a session's channels after a login, and for GET /api/v1/state?initChannelState=1. RFC 1459 §6.2.",
+  "description": "Channel member list. Sent on JOIN or NAMES query. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_NAMREPLY"
+      "const": "353"
-    },
-    "code": {
-      "const": 353
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "'=' and the channel name. The server always sends '='.",
+      "description": "[channel_type, channel]. channel_type: = (public), * (private), @ (secret)."
-      "minItems": 2,
-      "maxItems": 2
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: the members as nick!user@host, separated by spaces. '@' comes before a channel operator and '+' before a voiced member. The host is '*' when the server does not know it.",
+      "description": "Space-separated list of nicks. Prefixed with @ for ops, + for voiced."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
     "params",
     "body"
   ],
   "examples": [
     {
-      "command": "RPL_NAMREPLY",
+      "command": "353",
-      "code": 353,
-      "from": "neoirc",
       "to": "alice",
       "params": [
         "=",
         "#general"
       ],
       "body": [
-        "@op1!op1@host1 alice!alice@host2 +bob!bob@host3"
+        "@op1 alice bob +voiced1"
       ]
     }
   ]

schema/numerics/366.json

@@ -2,62 +2,34 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/366.json",
   "title": "366 RPL_ENDOFNAMES",
-  "description": "The end of a channel's member list. It comes after the RPL_NAMREPLY for the channel. RFC 1459 §6.2.",
+  "description": "End of NAMES list. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_ENDOFNAMES"
+      "const": "366"
-    },
-    "code": {
-      "const": 366
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The channel name.",
+      "description": "[channel]."
-      "minItems": 1,
-      "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'End of /NAMES list'.",
+      "description": "End of /NAMES list",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "RPL_ENDOFNAMES",
-      "code": 366,
-      "from": "neoirc",
-      "to": "alice",
-      "params": [
-        "#general"
-      ],
-      "body": [
-        "End of /NAMES list"
-      ]
-    }
   ]
 }

schema/numerics/372.json

@@ -2,45 +2,31 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/372.json",
   "title": "372 RPL_MOTD",
-  "description": "One line of the message of the day. The server sends one per line, after RPL_MOTDSTART. RFC 2812 §5.1.",
+  "description": "MOTD line. One message per line of the MOTD. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_MOTD"
+      "const": "372"
-    },
-    "code": {
-      "const": 372
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: '- ' and the line.",
+      "description": "MOTD line text (prefixed with '- ')."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
     "body"
   ],
   "examples": [
     {
-      "command": "RPL_MOTD",
+      "command": "372",
-      "code": 372,
-      "from": "neoirc",
       "to": "alice",
       "body": [
         "- Welcome to our server!"

schema/numerics/375.json

@@ -2,49 +2,25 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/375.json",
   "title": "375 RPL_MOTDSTART",
-  "description": "The start of the message of the day. Sent after RPL_LUSERME (255) when the server has a message of the day. RFC 2812 §5.1.",
+  "description": "Start of MOTD. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_MOTDSTART"
+      "const": "375"
-    },
-    "code": {
-      "const": 375
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: '- ', the server name and ' Message of the Day -'.",
+      "description": "Text lines."
-      "minItems": 1,
-      "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
+    "to"
-    "from",
-    "to",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "RPL_MOTDSTART",
-      "code": 375,
-      "from": "neoirc",
-      "to": "alice",
-      "body": [
-        "- neoirc Message of the Day -"
-      ]
-    }
   ]
 }

schema/numerics/376.json

@@ -2,49 +2,26 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/376.json",
   "title": "376 RPL_ENDOFMOTD",
-  "description": "The end of the message of the day. RFC 2812 §5.1.",
+  "description": "End of MOTD. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "RPL_ENDOFMOTD"
+      "const": "376"
-    },
-    "code": {
-      "const": 376
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'End of /MOTD command.'.",
+      "description": "End of /MOTD command",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
+    "to"
-    "from",
-    "to",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "RPL_ENDOFMOTD",
-      "code": 376,
-      "from": "neoirc",
-      "to": "alice",
-      "body": [
-        "End of /MOTD command."
-      ]
-    }
   ]
 }

schema/numerics/401.json

@@ -2,61 +2,45 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/401.json",
   "title": "401 ERR_NOSUCHNICK",
-  "description": "No user has that nick. RFC 1459 §6.1.",
+  "description": "No such nick/channel. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "ERR_NOSUCHNICK"
+      "const": "401"
-    },
-    "code": {
-      "const": 401
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The nick that was not found.",
+      "description": "[target_nick]."
-      "minItems": 1,
-      "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'No such nick' in answer to a PRIVMSG or NOTICE, and 'No such nick/channel' in answer to anything else.",
+      "description": "No such nick/channel",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
   ],
   "examples": [
     {
-      "command": "ERR_NOSUCHNICK",
+      "command": "401",
-      "code": 401,
-      "from": "neoirc",
       "to": "alice",
       "params": [
         "bob"
       ],
       "body": [
-        "No such nick"
+        "No such nick/channel"
       ]
     }
   ]

schema/numerics/403.json

@@ -2,55 +2,39 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/403.json",
   "title": "403 ERR_NOSUCHCHANNEL",
-  "description": "No channel has that name. A JOIN with a channel name that the server does not allow gets it too. RFC 1459 §6.1.",
+  "description": "No such channel. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "ERR_NOSUCHCHANNEL"
+      "const": "403"
-    },
-    "code": {
-      "const": 403
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The channel name.",
+      "description": "[channel_name]."
-      "minItems": 1,
-      "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'No such channel'.",
+      "description": "No such channel",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
   ],
   "examples": [
     {
-      "command": "ERR_NOSUCHCHANNEL",
+      "command": "403",
-      "code": 403,
-      "from": "neoirc",
       "to": "alice",
       "params": [
         "#nonexistent"

schema/numerics/433.json

@@ -2,58 +2,42 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/433.json",
   "title": "433 ERR_NICKNAMEINUSE",
-  "description": "Another user has the nick. Sent in answer to a NICK. RFC 1459 §6.1.",
+  "description": "Nickname is already in use. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "ERR_NICKNAMEINUSE"
+      "const": "433"
-    },
-    "code": {
-      "const": 433
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick, which has not changed."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The nick that was asked for.",
+      "description": "[requested_nick]."
-      "minItems": 1,
-      "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'Nickname is already in use'.",
+      "description": "Nickname is already in use",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
   ],
   "examples": [
     {
-      "command": "ERR_NICKNAMEINUSE",
+      "command": "433",
-      "code": 433,
+      "to": "*",
-      "from": "neoirc",
-      "to": "alice",
       "params": [
-        "bob"
+        "alice"
       ],
       "body": [
         "Nickname is already in use"

schema/numerics/442.json

@@ -2,62 +2,34 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/442.json",
   "title": "442 ERR_NOTONCHANNEL",
-  "description": "The user is not on that channel. RFC 1459 §6.1.",
+  "description": "You're not on that channel. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "ERR_NOTONCHANNEL"
+      "const": "442"
-    },
-    "code": {
-      "const": 442
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The channel name.",
+      "description": "[channel]."
-      "minItems": 1,
-      "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'You're not on that channel'.",
+      "description": "You're not on that channel",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "ERR_NOTONCHANNEL",
-      "code": 442,
-      "from": "neoirc",
-      "to": "alice",
-      "params": [
-        "#general"
-      ],
-      "body": [
-        "You're not on that channel"
-      ]
-    }
   ]
 }

schema/numerics/482.json

@@ -2,62 +2,34 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://sneak.berlin/go/neoirc/schema/numerics/482.json",
   "title": "482 ERR_CHANOPRIVSNEEDED",
-  "description": "The user is not a channel operator, and the command needs one. RFC 1459 §6.1.",
+  "description": "You're not channel operator. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",
   "properties": {
     "command": {
-      "const": "ERR_CHANOPRIVSNEEDED"
+      "const": "482"
-    },
-    "code": {
-      "const": 482
-    },
-    "from": {
-      "type": "string",
-      "description": "The server name."
     },
     "to": {
-      "type": "string",
+      "type": "string"
-      "description": "The user's nick."
     },
     "params": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "The channel name.",
+      "description": "[channel]."
-      "minItems": 1,
-      "maxItems": 1
     },
     "body": {
       "type": "array",
       "items": {
         "type": "string"
       },
-      "description": "One string: 'You're not channel operator'.",
+      "description": "You're not channel operator",
-      "minItems": 1,
       "maxItems": 1
     }
   },
   "required": [
     "command",
-    "code",
-    "from",
     "to",
-    "params",
+    "params"
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "ERR_CHANOPRIVSNEEDED",
-      "code": 482,
-      "from": "neoirc",
-      "to": "alice",
-      "params": [
-        "#general"
-      ],
-      "body": [
-        "You're not channel operator"
-      ]
-    }
   ]
 }