Merge branch 'main' into fix/irc-numeric-replies

IRC command handlers now return proper IRC numeric reply codes per
RFC 1459/2812 instead of HTTP status codes:

- 401 ERR_NOSUCHNICK for unknown DM targets
- 403 ERR_NOSUCHCHANNEL for invalid/missing channels
- 411 ERR_NORECIPIENT for missing message recipients
- 412 ERR_NOTEXTTOSEND for missing message body
- 421 ERR_UNKNOWNCOMMAND for unknown/empty commands
- 431 ERR_NONICKNAMEGIVEN for missing nick in NICK command
- 432 ERR_ERRONEUSNICKNAME for invalid nick format
- 433 ERR_NICKNAMEINUSE for taken nicks
- 442 ERR_NOTONCHANNEL for non-member channel actions
- 461 ERR_NEEDMOREPARAMS for missing required parameters

Error responses use the IRC numeric format:
  {"command":"4xx","from":"server","to":"nick","body":["..."],"params":[...]}

HTTP status codes are now reserved for transport-level concerns:
- 400 for malformed HTTP requests (bad JSON)
- 401 for authentication failures
- 500 for internal server errors

Successful message sends changed from 201 to 200 since HTTP
status codes should not encode IRC-level semantics.

README.md

@@ -845,11 +845,10 @@ the server to the client (never C2S) and use 3-digit string codes in the
 | `442` | ERR_NOTONCHANNEL    | Action on unjoined channel | `{"command":"442","to":"alice","params":["#general"],"body":["You're not on that channel"]}` |
 | `482` | ERR_CHANOPRIVSNEEDED | Non-op tries op action | `{"command":"482","to":"alice","params":["#general"],"body":["You're not channel operator"]}` |
 
-**Note:** Numeric replies are now implemented. All IRC command responses
+**Note:** Numeric replies are planned for full implementation. The current MVP
-(success and error) are delivered as numeric replies through the message queue.
+returns standard HTTP error responses (4xx/5xx with JSON error bodies) instead
-HTTP error codes are reserved for transport-level issues (auth failures,
+of numeric replies for error conditions. Numeric replies in the message queue
-malformed requests, server errors). The `params` field in the message envelope
+will be added post-MVP.
-carries IRC-style parameters (e.g., channel name, target nick).
 
 ### Channel Modes
 
@@ -1055,8 +1054,8 @@ reference with all required and optional fields.
 
 | Command   | Required Fields     | Optional      | Response Status |
 |-----------|---------------------|---------------|-----------------|
-| `PRIVMSG` | `to`, `body`        | `meta`        | 200 OK          |
+| `PRIVMSG` | `to`, `body`        | `meta`        | 201 Created     |
-| `NOTICE`  | `to`, `body`        | `meta`        | 200 OK          |
+| `NOTICE`  | `to`, `body`        | `meta`        | 201 Created     |
 | `JOIN`    | `to`                |               | 200 OK          |
 | `PART`    | `to`                | `body`        | 200 OK          |
 | `NICK`    | `body`              |               | 200 OK          |
@@ -1064,44 +1063,18 @@ reference with all required and optional fields.
 | `QUIT`    |                     | `body`        | 200 OK          |
 | `PING`    |                     |               | 200 OK          |
 
-All IRC commands return HTTP 200 OK. IRC-level success and error responses
+**Errors (all commands):**
-are delivered as **numeric replies** through the message queue (see
-[Numeric Replies](#numeric-replies) below). HTTP error codes (4xx/5xx) are
-reserved for transport-level problems: malformed JSON (400), missing/invalid
-auth tokens (401), and server errors (500).
-
-**HTTP errors (transport-level only):**
 
 | Status | Error | When |
 |--------|-------|------|
-| 400    | `invalid request` | Malformed JSON or empty command |
+| 400    | `invalid request` | Malformed JSON |
+| 400    | `to field required` | Missing `to` for commands that need it |
+| 400    | `body required` | Missing `body` for commands that need it |
+| 400    | `unknown command: X` | Unrecognized command |
 | 401    | `unauthorized` | Missing or invalid auth token |
-| 500    | `internal error` | Server-side failure |
+| 404    | `channel not found` | Target channel doesn't exist |
-
+| 404    | `user not found` | DM target nick doesn't exist |
-**IRC numeric error replies (delivered via message queue):**
+| 409    | `nick already in use` | NICK target is taken |
-
-| Numeric | Name | When |
-|---------|------|------|
-| 401     | ERR_NOSUCHNICK | DM target nick doesn't exist |
-| 403     | ERR_NOSUCHCHANNEL | Target channel doesn't exist or invalid name |
-| 421     | ERR_UNKNOWNCOMMAND | Unrecognized command |
-| 432     | ERR_ERRONEUSNICKNAME | Invalid nickname format |
-| 433     | ERR_NICKNAMEINUSE | NICK target is taken |
-| 442     | ERR_NOTONCHANNEL | Not a member of the target channel |
-| 461     | ERR_NEEDMOREPARAMS | Missing required fields (to, body) |
-
-**IRC numeric success replies (delivered via message queue):**
-
-| Numeric | Name | When |
-|---------|------|------|
-| 001     | RPL_WELCOME | Sent on session creation/login |
-| 331     | RPL_NOTOPIC | Channel has no topic (on JOIN) |
-| 332     | RPL_TOPIC | Channel topic (on JOIN, TOPIC set) |
-| 353     | RPL_NAMREPLY | Channel member list (on JOIN) |
-| 366     | RPL_ENDOFNAMES | End of NAMES list (on JOIN) |
-| 375     | RPL_MOTDSTART | Start of MOTD |
-| 372     | RPL_MOTD | MOTD line |
-| 376     | RPL_ENDOFMOTD | End of MOTD |
 
 ### GET /api/v1/history — Message History
 

internal/db/queries.go

@@ -35,7 +35,6 @@ type IRCMessage struct {
 	Command string          `json:"command"`
 	From    string          `json:"from,omitempty"`
 	To      string          `json:"to,omitempty"`
-	Params  json.RawMessage `json:"params,omitempty"`
 	Body    json.RawMessage `json:"body,omitempty"`
 	TS      string          `json:"ts"`
 	Meta    json.RawMessage `json:"meta,omitempty"`
@@ -492,17 +491,12 @@ func (database *Database) GetSessionChannelIDs(
 func (database *Database) InsertMessage(
 	ctx context.Context,
 	command, from, target string,
-	params json.RawMessage,
 	body json.RawMessage,
 	meta json.RawMessage,
 ) (int64, string, error) {
 	msgUUID := uuid.New().String()
 	now := time.Now().UTC()
 
-	if params == nil {
-		params = json.RawMessage("[]")
-	}
-
 	if body == nil {
 		body = json.RawMessage("[]")
 	}
@@ -514,10 +508,10 @@ func (database *Database) InsertMessage(
 	res, err := database.conn.ExecContext(ctx,
 		`INSERT INTO messages
 		 (uuid, command, msg_from, msg_to,
-		  params, body, meta, created_at)
+		  body, meta, created_at)
-		 VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
+		 VALUES (?, ?, ?, ?, ?, ?, ?)`,
 		msgUUID, command, from, target,
-		string(params), string(body), string(meta), now)
+		string(body), string(meta), now)
 	if err != nil {
 		return 0, "", fmt.Errorf(
 			"insert message: %w", err,
@@ -584,7 +578,7 @@ func (database *Database) PollMessages(
 	rows, err := database.conn.QueryContext(ctx,
 		`SELECT cq.id, m.uuid, m.command,
 		   m.msg_from, m.msg_to,
-		   m.params, m.body, m.meta, m.created_at
+		   m.body, m.meta, m.created_at
 		 FROM client_queues cq
 		 INNER JOIN messages m
 		   ON m.id = cq.message_id
@@ -648,7 +642,7 @@ func (database *Database) queryHistory(
 	if beforeID > 0 {
 		rows, err := database.conn.QueryContext(ctx,
 			`SELECT id, uuid, command, msg_from,
-			   msg_to, params, body, meta, created_at
+			   msg_to, body, meta, created_at
 			 FROM messages
 			 WHERE msg_to = ? AND id < ?
 			   AND command = 'PRIVMSG'
@@ -665,7 +659,7 @@ func (database *Database) queryHistory(
 
 	rows, err := database.conn.QueryContext(ctx,
 		`SELECT id, uuid, command, msg_from,
-		   msg_to, params, body, meta, created_at
+		   msg_to, body, meta, created_at
 		 FROM messages
 		 WHERE msg_to = ?
 		   AND command = 'PRIVMSG'
@@ -692,14 +686,14 @@ func scanMessages(
 		var (
 			msg        IRCMessage
 			qID        int64
-			params, body, meta string
+			body, meta string
 			createdAt  time.Time
 		)
 
 		err := rows.Scan(
 			&qID, &msg.ID, &msg.Command,
 			&msg.From, &msg.To,
-			&params, &body, &meta, &createdAt,
+			&body, &meta, &createdAt,
 		)
 		if err != nil {
 			return nil, fallbackQID, fmt.Errorf(
@@ -707,10 +701,6 @@ func scanMessages(
 			)
 		}
 
-		if params != "" && params != "[]" {
-			msg.Params = json.RawMessage(params)
-		}
-
 		msg.Body = json.RawMessage(body)
 		msg.Meta = json.RawMessage(meta)
 		msg.TS = createdAt.Format(time.RFC3339Nano)

internal/db/queries_test.go

@@ -383,7 +383,7 @@ func TestInsertMessage(t *testing.T) {
 	body := json.RawMessage(`["hello"]`)
 
 	dbID, msgUUID, err := database.InsertMessage(
-		ctx, "PRIVMSG", "poller", "#test", nil, body, nil,
+		ctx, "PRIVMSG", "poller", "#test", body, nil,
 	)
 	if err != nil {
 		t.Fatal(err)
@@ -417,7 +417,7 @@ func TestPollMessages(t *testing.T) {
 	body := json.RawMessage(`["hello"]`)
 
 	dbID, _, err := database.InsertMessage(
-		ctx, "PRIVMSG", "poller", "#test", nil, body, nil,
+		ctx, "PRIVMSG", "poller", "#test", body, nil,
 	)
 	if err != nil {
 		t.Fatal(err)
@@ -475,7 +475,7 @@ func TestGetHistory(t *testing.T) {
 	for range msgCount {
 		_, _, err := database.InsertMessage(
 			ctx, "PRIVMSG", "user", "#hist",
-			nil, json.RawMessage(`["msg"]`), nil,
+			json.RawMessage(`["msg"]`), nil,
 		)
 		if err != nil {
 			t.Fatal(err)
@@ -627,7 +627,7 @@ func TestEnqueueToClient(t *testing.T) {
 	body := json.RawMessage(`["test"]`)
 
 	dbID, _, err := database.InsertMessage(
-		ctx, "PRIVMSG", "sender", "#ch", nil, body, nil,
+		ctx, "PRIVMSG", "sender", "#ch", body, nil,
 	)
 	if err != nil {
 		t.Fatal(err)

internal/db/schema/001_initial.sql

@@ -50,7 +50,6 @@ CREATE TABLE IF NOT EXISTS messages (
     command TEXT NOT NULL DEFAULT 'PRIVMSG',
     msg_from TEXT NOT NULL DEFAULT '',
     msg_to TEXT NOT NULL DEFAULT '',
-    params TEXT NOT NULL DEFAULT '[]',
     body TEXT NOT NULL DEFAULT '[]',
     meta TEXT NOT NULL DEFAULT '{}',
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP

internal/handlers/api.go

@@ -28,6 +28,18 @@ const (
 	defaultHistLimit   = 50
 	maxHistLimit       = 500
 	cmdPrivmsg         = "PRIVMSG"
+
+	// IRC numeric reply codes per RFC 1459/2812.
+	ircErrNoSuchNick       = "401"
+	ircErrNoSuchChannel    = "403"
+	ircErrNoRecipient      = "411"
+	ircErrNoTextToSend     = "412"
+	ircErrUnknownCommand   = "421"
+	ircErrNoNicknameGiven  = "431"
+	ircErrErroneusNickname = "432"
+	ircErrNicknameInUse    = "433"
+	ircErrNotOnChannel     = "442"
+	ircErrNeedMoreParams   = "461"
 )
 
 func (hdlr *Handlers) maxBodySize() int64 {
@@ -63,6 +75,43 @@ func (hdlr *Handlers) authSession(
 	return sessionID, clientID, nick, nil
 }
 
+// serverName returns the configured server name or the
+// default "neoirc".
+func (hdlr *Handlers) serverName() string {
+	if hdlr.params.Config.ServerName != "" {
+		return hdlr.params.Config.ServerName
+	}
+
+	return "neoirc"
+}
+
+// respondIRCError sends an IRC numeric error reply as a
+// JSON response with HTTP 200 OK. This is used for errors
+// in IRC command processing (as opposed to HTTP transport
+// errors). The params slice contains IRC-style positional
+// parameters (e.g. the target nick or channel).
+func (hdlr *Handlers) respondIRCError(
+	writer http.ResponseWriter,
+	request *http.Request,
+	nick, numeric, msg string,
+	params ...string,
+) {
+	resp := map[string]any{
+		"command": numeric,
+		"from":    hdlr.serverName(),
+		"to":      nick,
+		"body":    []string{msg},
+	}
+
+	if len(params) > 0 {
+		resp["params"] = params
+	}
+
+	hdlr.respondJSON(
+		writer, request, resp, http.StatusOK,
+	)
+}
+
 func (hdlr *Handlers) requireAuth(
 	writer http.ResponseWriter,
 	request *http.Request,
@@ -91,7 +140,7 @@ func (hdlr *Handlers) fanOut(
 	sessionIDs []int64,
 ) (string, error) {
 	dbID, msgUUID, err := hdlr.params.Database.InsertMessage(
-		request.Context(), command, from, target, nil, body, nil,
+		request.Context(), command, from, target, body, nil,
 	)
 	if err != nil {
 		return "", fmt.Errorf("insert message: %w", err)
@@ -185,7 +234,7 @@ func (hdlr *Handlers) handleCreateSession(
 		return
 	}
 
-	hdlr.deliverMOTD(request, clientID, sessionID, payload.Nick)
+	hdlr.deliverMOTD(request, clientID, sessionID)
 
 	hdlr.respondJSON(writer, request, map[string]any{
 		"id":    sessionID,
@@ -219,76 +268,45 @@ func (hdlr *Handlers) handleCreateSessionError(
 	)
 }
 
-// deliverWelcome sends the RPL_WELCOME (001) numeric to a
-// new client.
-func (hdlr *Handlers) deliverWelcome(
-	request *http.Request,
-	clientID int64,
-	nick string,
-) {
-	ctx := request.Context()
-
-	hdlr.enqueueNumeric(
-		ctx, clientID, "001", nick, nil,
-		"Welcome to the network, "+nick,
-	)
-}
-
 // deliverMOTD sends the MOTD as IRC numeric messages to a
 // new client.
 func (hdlr *Handlers) deliverMOTD(
 	request *http.Request,
 	clientID, sessionID int64,
-	nick string,
 ) {
 	motd := hdlr.params.Config.MOTD
-	srvName := hdlr.serverName()
+	serverName := hdlr.serverName()
-
-	ctx := request.Context()
-
-	hdlr.deliverWelcome(request, clientID, nick)
 
 	if motd == "" {
-		hdlr.broker.Notify(sessionID)
-
 		return
 	}
 
+	ctx := request.Context()
+
 	hdlr.enqueueNumeric(
-		ctx, clientID, "375", nick, nil,
+		ctx, clientID, "375", serverName,
-		"- "+srvName+" Message of the Day -",
+		"- "+serverName+" Message of the Day -",
 	)
 
 	for line := range strings.SplitSeq(motd, "\n") {
 		hdlr.enqueueNumeric(
-			ctx, clientID, "372", nick, nil,
+			ctx, clientID, "372", serverName,
 			"- "+line,
 		)
 	}
 
 	hdlr.enqueueNumeric(
-		ctx, clientID, "376", nick, nil,
+		ctx, clientID, "376", serverName,
 		"End of /MOTD command.",
 	)
 
 	hdlr.broker.Notify(sessionID)
 }
 
-func (hdlr *Handlers) serverName() string {
-	name := hdlr.params.Config.ServerName
-	if name == "" {
-		return "neoirc"
-	}
-
-	return name
-}
-
 func (hdlr *Handlers) enqueueNumeric(
 	ctx context.Context,
 	clientID int64,
-	command, nick string,
+	command, serverName, text string,
-	params []string,
-	text string,
 ) {
 	body, err := json.Marshal([]string{text})
 	if err != nil {
@@ -299,22 +317,9 @@ func (hdlr *Handlers) enqueueNumeric(
 		return
 	}
 
-	var paramsJSON json.RawMessage
-
-	if len(params) > 0 {
-		paramsJSON, err = json.Marshal(params)
-		if err != nil {
-			hdlr.log.Error(
-				"marshal numeric params", "error", err,
-			)
-
-			return
-		}
-	}
-
 	dbID, _, insertErr := hdlr.params.Database.InsertMessage(
-		ctx, command, hdlr.serverName(), nick,
+		ctx, command, serverName, "",
-		paramsJSON, json.RawMessage(body), nil,
+		json.RawMessage(body), nil,
 	)
 	if insertErr != nil {
 		hdlr.log.Error(
@@ -572,7 +577,7 @@ func (hdlr *Handlers) HandleSendCommand() http.HandlerFunc {
 			writer, request.Body, hdlr.maxBodySize(),
 		)
 
-		sessionID, clientID, nick, ok :=
+		sessionID, _, nick, ok :=
 			hdlr.requireAuth(writer, request)
 		if !ok {
 			return
@@ -597,10 +602,10 @@ func (hdlr *Handlers) HandleSendCommand() http.HandlerFunc {
 		payload.To = strings.TrimSpace(payload.To)
 
 		if payload.Command == "" {
-			hdlr.respondError(
+			hdlr.respondIRCError(
 				writer, request,
-				"command required",
+				nick, ircErrUnknownCommand,
-				http.StatusBadRequest,
+				"No command given",
 			)
 
 			return
@@ -622,8 +627,7 @@ func (hdlr *Handlers) HandleSendCommand() http.HandlerFunc {
 		}
 
 		hdlr.dispatchCommand(
-			writer, request,
+			writer, request, sessionID, nick,
-			sessionID, clientID, nick,
 			payload.Command, payload.To,
 			payload.Body, bodyLines,
 		)
@@ -633,7 +637,7 @@ func (hdlr *Handlers) HandleSendCommand() http.HandlerFunc {
 func (hdlr *Handlers) dispatchCommand(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
+	sessionID int64,
 	nick, command, target string,
 	body json.RawMessage,
 	bodyLines func() []string,
@@ -641,30 +645,24 @@ func (hdlr *Handlers) dispatchCommand(
 	switch command {
 	case cmdPrivmsg, "NOTICE":
 		hdlr.handlePrivmsg(
-			writer, request,
+			writer, request, sessionID, nick,
-			sessionID, clientID, nick,
 			command, target, body, bodyLines,
 		)
 	case "JOIN":
 		hdlr.handleJoin(
-			writer, request,
+			writer, request, sessionID, nick, target,
-			sessionID, clientID, nick, target,
 		)
 	case "PART":
 		hdlr.handlePart(
-			writer, request,
+			writer, request, sessionID, nick, target, body,
-			sessionID, clientID, nick, target, body,
 		)
 	case "NICK":
 		hdlr.handleNick(
-			writer, request,
+			writer, request, sessionID, nick, bodyLines,
-			sessionID, clientID, nick, bodyLines,
 		)
 	case "TOPIC":
 		hdlr.handleTopic(
-			writer, request,
+			writer, request, nick, target, body, bodyLines,
-			sessionID, clientID, nick,
-			target, body, bodyLines,
 		)
 	case "QUIT":
 		hdlr.handleQuit(
@@ -674,63 +672,51 @@ func (hdlr *Handlers) dispatchCommand(
 		hdlr.respondJSON(writer, request,
 			map[string]string{
 				"command": "PONG",
-				"from":    hdlr.serverName(),
+				"from":    hdlr.params.Config.ServerName,
 			},
 			http.StatusOK)
 	default:
-		hdlr.enqueueNumeric(
+		hdlr.respondIRCError(
-			request.Context(), clientID,
+			writer, request,
-			"421", nick, []string{command},
+			nick, ircErrUnknownCommand,
-			"Unknown command",
+			command+" :Unknown command",
+			command,
 		)
-		hdlr.broker.Notify(sessionID)
-		hdlr.respondJSON(writer, request,
-			map[string]string{"status": "error"},
-			http.StatusOK)
 	}
 }
 
 func (hdlr *Handlers) handlePrivmsg(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
+	sessionID int64,
 	nick, command, target string,
 	body json.RawMessage,
 	bodyLines func() []string,
 ) {
 	if target == "" {
-		hdlr.enqueueNumeric(
+		hdlr.respondIRCError(
-			request.Context(), clientID,
+			writer, request,
-			"461", nick, []string{command},
+			nick, ircErrNoRecipient,
-			"Not enough parameters",
+			"No recipient given ("+command+")",
 		)
-		hdlr.broker.Notify(sessionID)
-		hdlr.respondJSON(writer, request,
-			map[string]string{"status": "error"},
-			http.StatusOK)
 
 		return
 	}
 
 	lines := bodyLines()
 	if len(lines) == 0 {
-		hdlr.enqueueNumeric(
+		hdlr.respondIRCError(
-			request.Context(), clientID,
+			writer, request,
-			"461", nick, []string{command},
+			nick, ircErrNoTextToSend,
-			"Not enough parameters",
+			"No text to send",
 		)
-		hdlr.broker.Notify(sessionID)
-		hdlr.respondJSON(writer, request,
-			map[string]string{"status": "error"},
-			http.StatusOK)
 
 		return
 	}
 
 	if strings.HasPrefix(target, "#") {
 		hdlr.handleChannelMsg(
-			writer, request,
+			writer, request, sessionID, nick,
-			sessionID, clientID, nick,
 			command, target, body,
 		)
 
@@ -738,36 +724,15 @@ func (hdlr *Handlers) handlePrivmsg(
 	}
 
 	hdlr.handleDirectMsg(
-		writer, request,
+		writer, request, sessionID, nick,
-		sessionID, clientID, nick,
 		command, target, body,
 	)
 }
 
-// respondIRCError enqueues a numeric error reply, notifies
-// the broker, and sends HTTP 200 with {"status":"error"}.
-func (hdlr *Handlers) respondIRCError(
-	writer http.ResponseWriter,
-	request *http.Request,
-	clientID, sessionID int64,
-	numeric, nick string,
-	params []string,
-	text string,
-) {
-	hdlr.enqueueNumeric(
-		request.Context(), clientID,
-		numeric, nick, params, text,
-	)
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "error"},
-		http.StatusOK)
-}
-
 func (hdlr *Handlers) handleChannelMsg(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
+	sessionID int64,
 	nick, command, target string,
 	body json.RawMessage,
 ) {
@@ -776,9 +741,10 @@ func (hdlr *Handlers) handleChannelMsg(
 	)
 	if err != nil {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"403", nick, []string{target},
+			nick, ircErrNoSuchChannel,
 			"No such channel",
+			target,
 		)
 
 		return
@@ -802,26 +768,15 @@ func (hdlr *Handlers) handleChannelMsg(
 
 	if !isMember {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"442", nick, []string{target},
+			nick, ircErrNotOnChannel,
 			"You're not on that channel",
+			target,
 		)
 
 		return
 	}
 
-	hdlr.sendChannelMsg(
-		writer, request, command, nick, target, body, chID,
-	)
-}
-
-func (hdlr *Handlers) sendChannelMsg(
-	writer http.ResponseWriter,
-	request *http.Request,
-	command, nick, target string,
-	body json.RawMessage,
-	chID int64,
-) {
 	memberIDs, err := hdlr.params.Database.GetChannelMemberIDs(
 		request.Context(), chID,
 	)
@@ -860,7 +815,7 @@ func (hdlr *Handlers) sendChannelMsg(
 func (hdlr *Handlers) handleDirectMsg(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
+	sessionID int64,
 	nick, command, target string,
 	body json.RawMessage,
 ) {
@@ -868,15 +823,12 @@ func (hdlr *Handlers) handleDirectMsg(
 		request.Context(), target,
 	)
 	if err != nil {
-		hdlr.enqueueNumeric(
+		hdlr.respondIRCError(
-			request.Context(), clientID,
+			writer, request,
-			"401", nick, []string{target},
+			nick, ircErrNoSuchNick,
 			"No such nick/channel",
+			target,
 		)
-		hdlr.broker.Notify(sessionID)
-		hdlr.respondJSON(writer, request,
-			map[string]string{"status": "error"},
-			http.StatusOK)
 
 		return
 	}
@@ -908,14 +860,15 @@ func (hdlr *Handlers) handleDirectMsg(
 func (hdlr *Handlers) handleJoin(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
+	sessionID int64,
 	nick, target string,
 ) {
 	if target == "" {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"461", nick, []string{"JOIN"},
+			nick, ircErrNeedMoreParams,
 			"Not enough parameters",
+			"JOIN",
 		)
 
 		return
@@ -928,26 +881,15 @@ func (hdlr *Handlers) handleJoin(
 
 	if !validChannelRe.MatchString(channel) {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"403", nick, []string{channel},
+			nick, ircErrNoSuchChannel,
 			"No such channel",
+			channel,
 		)
 
 		return
 	}
 
-	hdlr.executeJoin(
-		writer, request,
-		sessionID, clientID, nick, channel,
-	)
-}
-
-func (hdlr *Handlers) executeJoin(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, channel string,
-) {
 	chID, err := hdlr.params.Database.GetOrCreateChannel(
 		request.Context(), channel,
 	)
@@ -988,10 +930,6 @@ func (hdlr *Handlers) executeJoin(
 		request, "JOIN", nick, channel, nil, memberIDs,
 	)
 
-	hdlr.deliverJoinNumerics(
-		request, clientID, sessionID, nick, channel, chID,
-	)
-
 	hdlr.respondJSON(writer, request,
 		map[string]string{
 			"status":  "joined",
@@ -1000,96 +938,20 @@ func (hdlr *Handlers) executeJoin(
 		http.StatusOK)
 }
 
-// deliverJoinNumerics sends RPL_TOPIC/RPL_NOTOPIC,
-// RPL_NAMREPLY, and RPL_ENDOFNAMES to the joining client.
-func (hdlr *Handlers) deliverJoinNumerics(
-	request *http.Request,
-	clientID, sessionID int64,
-	nick, channel string,
-	chID int64,
-) {
-	ctx := request.Context()
-
-	chInfo, err := hdlr.params.Database.GetChannelByName(
-		ctx, channel,
-	)
-	if err == nil {
-		_ = chInfo // chInfo is the ID; topic comes from DB.
-	}
-
-	// Get topic from channel info.
-	channels, listErr := hdlr.params.Database.ListChannels(
-		ctx, sessionID,
-	)
-
-	topic := ""
-
-	if listErr == nil {
-		for _, ch := range channels {
-			if ch.Name == channel {
-				topic = ch.Topic
-
-				break
-			}
-		}
-	}
-
-	if topic != "" {
-		hdlr.enqueueNumeric(
-			ctx, clientID, "332", nick,
-			[]string{channel}, topic,
-		)
-	} else {
-		hdlr.enqueueNumeric(
-			ctx, clientID, "331", nick,
-			[]string{channel}, "No topic is set",
-		)
-	}
-
-	// Get member list for NAMES reply.
-	members, memErr := hdlr.params.Database.ChannelMembers(
-		ctx, chID,
-	)
-
-	if memErr == nil && len(members) > 0 {
-		nicks := make([]string, 0, len(members))
-
-		for _, mem := range members {
-			nicks = append(nicks, mem.Nick)
-		}
-
-		hdlr.enqueueNumeric(
-			ctx, clientID, "353", nick,
-			[]string{"=", channel},
-			strings.Join(nicks, " "),
-		)
-	}
-
-	hdlr.enqueueNumeric(
-		ctx, clientID, "366", nick,
-		[]string{channel}, "End of /NAMES list",
-	)
-
-	hdlr.broker.Notify(sessionID)
-}
-
 func (hdlr *Handlers) handlePart(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
+	sessionID int64,
 	nick, target string,
 	body json.RawMessage,
 ) {
 	if target == "" {
-		hdlr.enqueueNumeric(
+		hdlr.respondIRCError(
-			request.Context(), clientID,
+			writer, request,
-			"461", nick, []string{"PART"},
+			nick, ircErrNeedMoreParams,
 			"Not enough parameters",
+			"PART",
 		)
-		hdlr.broker.Notify(sessionID)
-		hdlr.respondJSON(writer, request,
-			map[string]string{"status": "error"},
-			http.StatusOK)
 
 		return
 	}
@@ -1103,15 +965,12 @@ func (hdlr *Handlers) handlePart(
 		request.Context(), channel,
 	)
 	if err != nil {
-		hdlr.enqueueNumeric(
+		hdlr.respondIRCError(
-			request.Context(), clientID,
+			writer, request,
-			"403", nick, []string{channel},
+			nick, ircErrNoSuchChannel,
 			"No such channel",
+			channel,
 		)
-		hdlr.broker.Notify(sessionID)
-		hdlr.respondJSON(writer, request,
-			map[string]string{"status": "error"},
-			http.StatusOK)
 
 		return
 	}
@@ -1155,16 +1014,16 @@ func (hdlr *Handlers) handlePart(
 func (hdlr *Handlers) handleNick(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
+	sessionID int64,
 	nick string,
 	bodyLines func() []string,
 ) {
 	lines := bodyLines()
 	if len(lines) == 0 {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"461", nick, []string{"NICK"},
+			nick, ircErrNoNicknameGiven,
-			"Not enough parameters",
+			"No nickname given",
 		)
 
 		return
@@ -1174,9 +1033,10 @@ func (hdlr *Handlers) handleNick(
 
 	if !validNickRe.MatchString(newNick) {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"432", nick, []string{newNick},
+			nick, ircErrErroneusNickname,
 			"Erroneous nickname",
+			newNick,
 		)
 
 		return
@@ -1192,27 +1052,16 @@ func (hdlr *Handlers) handleNick(
 		return
 	}
 
-	hdlr.executeNickChange(
-		writer, request,
-		sessionID, clientID, nick, newNick,
-	)
-}
-
-func (hdlr *Handlers) executeNickChange(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, newNick string,
-) {
 	err := hdlr.params.Database.ChangeNick(
 		request.Context(), sessionID, newNick,
 	)
 	if err != nil {
 		if strings.Contains(err.Error(), "UNIQUE") {
 			hdlr.respondIRCError(
-				writer, request, clientID, sessionID,
+				writer, request,
-				"433", nick, []string{newNick},
+				nick, ircErrNicknameInUse,
 				"Nickname is already in use",
+				newNick,
 			)
 
 			return
@@ -1262,7 +1111,7 @@ func (hdlr *Handlers) broadcastNick(
 
 	dbID, _, _ := hdlr.params.Database.InsertMessage(
 		request.Context(), "NICK", oldNick, "",
-		nil, json.RawMessage(nickBody), nil,
+		json.RawMessage(nickBody), nil,
 	)
 
 	_ = hdlr.params.Database.EnqueueToSession(
@@ -1294,16 +1143,16 @@ func (hdlr *Handlers) broadcastNick(
 func (hdlr *Handlers) handleTopic(
 	writer http.ResponseWriter,
 	request *http.Request,
-	sessionID, clientID int64,
 	nick, target string,
 	body json.RawMessage,
 	bodyLines func() []string,
 ) {
 	if target == "" {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"461", nick, []string{"TOPIC"},
+			nick, ircErrNeedMoreParams,
 			"Not enough parameters",
+			"TOPIC",
 		)
 
 		return
@@ -1312,59 +1161,47 @@ func (hdlr *Handlers) handleTopic(
 	lines := bodyLines()
 	if len(lines) == 0 {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"461", nick, []string{"TOPIC"},
+			nick, ircErrNeedMoreParams,
 			"Not enough parameters",
+			"TOPIC",
 		)
 
 		return
 	}
 
+	topic := strings.Join(lines, " ")
+
 	channel := target
 	if !strings.HasPrefix(channel, "#") {
 		channel = "#" + channel
 	}
 
+	err := hdlr.params.Database.SetTopic(
+		request.Context(), channel, topic,
+	)
+	if err != nil {
+		hdlr.log.Error(
+			"set topic failed", "error", err,
+		)
+		hdlr.respondError(
+			writer, request,
+			"internal error",
+			http.StatusInternalServerError,
+		)
+
+		return
+	}
+
 	chID, err := hdlr.params.Database.GetChannelByName(
 		request.Context(), channel,
 	)
 	if err != nil {
 		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
+			writer, request,
-			"403", nick, []string{channel},
+			nick, ircErrNoSuchChannel,
 			"No such channel",
-		)
+			channel,
-
-		return
-	}
-
-	hdlr.executeTopic(
-		writer, request,
-		sessionID, clientID, nick,
-		channel, strings.Join(lines, " "),
-		body, chID,
-	)
-}
-
-func (hdlr *Handlers) executeTopic(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, channel, topic string,
-	body json.RawMessage,
-	chID int64,
-) {
-	setErr := hdlr.params.Database.SetTopic(
-		request.Context(), channel, topic,
-	)
-	if setErr != nil {
-		hdlr.log.Error(
-			"set topic failed", "error", setErr,
-		)
-		hdlr.respondError(
-			writer, request,
-			"internal error",
-			http.StatusInternalServerError,
 		)
 
 		return
@@ -1378,12 +1215,6 @@ func (hdlr *Handlers) executeTopic(
 		request, "TOPIC", nick, channel, body, memberIDs,
 	)
 
-	hdlr.enqueueNumeric(
-		request.Context(), clientID,
-		"332", nick, []string{channel}, topic,
-	)
-	hdlr.broker.Notify(sessionID)
-
 	hdlr.respondJSON(writer, request,
 		map[string]string{
 			"status": "ok", "topic": topic,
@@ -1409,8 +1240,7 @@ func (hdlr *Handlers) handleQuit(
 
 	if len(channels) > 0 {
 		dbID, _, _ = hdlr.params.Database.InsertMessage(
-			request.Context(), "QUIT", nick, "",
+			request.Context(), "QUIT", nick, "", body, nil,
-			nil, body, nil,
 		)
 	}
 
@@ -1659,8 +1489,7 @@ func (hdlr *Handlers) cleanupUser(
 
 	if len(channels) > 0 {
 		quitDBID, _, _ = hdlr.params.Database.InsertMessage(
-			ctx, "QUIT", nick, "",
+			ctx, "QUIT", nick, "", nil, nil,
-			nil, nil, nil,
 		)
 	}
 

internal/handlers/api_test.go

@@ -462,19 +462,6 @@ func findMessage(
 	return false
 }
 
-func findNumeric(
-	msgs []map[string]any,
-	numeric string,
-) bool {
-	for _, msg := range msgs {
-		if msg[commandKey] == numeric {
-			return true
-		}
-	}
-
-	return false
-}
-
 // --- Tests ---
 
 func TestCreateSessionValid(t *testing.T) {
@@ -486,47 +473,6 @@ func TestCreateSessionValid(t *testing.T) {
 	}
 }
 
-func TestWelcomeNumeric(t *testing.T) {
-	tserver := newTestServer(t)
-	token := tserver.createSession("welcomer")
-
-	msgs, _ := tserver.pollMessages(token, 0)
-
-	if !findNumeric(msgs, "001") {
-		t.Fatalf(
-			"expected RPL_WELCOME (001), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestJoinNumerics(t *testing.T) {
-	tserver := newTestServer(t)
-	token := tserver.createSession("jnumtest")
-
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: joinCmd, toKey: "#numtest",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	if !findNumeric(msgs, "353") {
-		t.Fatalf(
-			"expected RPL_NAMREPLY (353), got %v",
-			msgs,
-		)
-	}
-
-	if !findNumeric(msgs, "366") {
-		t.Fatalf(
-			"expected RPL_ENDOFNAMES (366), got %v",
-			msgs,
-		)
-	}
-}
-
 func TestCreateSessionDuplicate(t *testing.T) {
 	tserver := newTestServer(t)
 	tserver.createSession("alice")
@@ -722,22 +668,17 @@ func TestJoinMissingTo(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("joiner3")
 
-	// Drain initial MOTD/welcome numerics.
+	status, result := tserver.sendCommand(
-	_, lastID := tserver.pollMessages(token, 0)
-
-	status, _ := tserver.sendCommand(
 		token, map[string]any{commandKey: joinCmd},
 	)
 	if status != http.StatusOK {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "461" {
-
-	if !findNumeric(msgs, "461") {
 		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
+			"expected IRC 461, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -794,21 +735,17 @@ func TestMessageMissingBody(t *testing.T) {
 		commandKey: joinCmd, toKey: "#test",
 	})
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(token, map[string]any{
-
-	status, _ := tserver.sendCommand(token, map[string]any{
 		commandKey: privmsgCmd, toKey: "#test",
 	})
 	if status != http.StatusOK {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "412" {
-
-	if !findNumeric(msgs, "461") {
 		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
+			"expected IRC 412, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -817,9 +754,7 @@ func TestMessageMissingTo(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("noto")
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(token, map[string]any{
-
-	status, _ := tserver.sendCommand(token, map[string]any{
 		commandKey: privmsgCmd,
 		bodyKey:    []string{"hello"},
 	})
@@ -827,12 +762,10 @@ func TestMessageMissingTo(t *testing.T) {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "411" {
-
-	if !findNumeric(msgs, "461") {
 		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
+			"expected IRC 411, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -847,10 +780,8 @@ func TestNonMemberCannotSend(t *testing.T) {
 		commandKey: joinCmd, toKey: "#private",
 	})
 
-	_, lastID := tserver.pollMessages(aliceToken, 0)
-
 	// Alice tries to send without joining.
-	status, _ := tserver.sendCommand(
+	status, result := tserver.sendCommand(
 		aliceToken,
 		map[string]any{
 			commandKey: privmsgCmd,
@@ -862,12 +793,10 @@ func TestNonMemberCannotSend(t *testing.T) {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(aliceToken, lastID)
+	if result[commandKey] != "442" {
-
-	if !findNumeric(msgs, "442") {
 		t.Fatalf(
-			"expected ERR_NOTONCHANNEL (442), got %v",
+			"expected IRC 442, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -917,9 +846,7 @@ func TestDMToNonexistentUser(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("dmsender")
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(token, map[string]any{
-
-	status, _ := tserver.sendCommand(token, map[string]any{
 		commandKey: privmsgCmd,
 		toKey:      "nobody",
 		bodyKey:    []string{"hello?"},
@@ -928,12 +855,10 @@ func TestDMToNonexistentUser(t *testing.T) {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "401" {
-
-	if !findNumeric(msgs, "401") {
 		t.Fatalf(
-			"expected ERR_NOSUCHNICK (401), got %v",
+			"expected IRC 401, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -981,9 +906,7 @@ func TestNickCollision(t *testing.T) {
 
 	tserver.createSession("taken_nick")
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(token, map[string]any{
-
-	status, _ := tserver.sendCommand(token, map[string]any{
 		commandKey: "NICK",
 		bodyKey:    []string{"taken_nick"},
 	})
@@ -991,12 +914,10 @@ func TestNickCollision(t *testing.T) {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "433" {
-
-	if !findNumeric(msgs, "433") {
 		t.Fatalf(
-			"expected ERR_NICKNAMEINUSE (433), got %v",
+			"expected IRC 433, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -1005,9 +926,7 @@ func TestNickInvalid(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("nickval")
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(token, map[string]any{
-
-	status, _ := tserver.sendCommand(token, map[string]any{
 		commandKey: "NICK",
 		bodyKey:    []string{"bad nick!"},
 	})
@@ -1015,12 +934,10 @@ func TestNickInvalid(t *testing.T) {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "432" {
-
-	if !findNumeric(msgs, "432") {
 		t.Fatalf(
-			"expected ERR_ERRONEUSNICKNAME (432), got %v",
+			"expected IRC 432, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -1029,21 +946,17 @@ func TestNickEmptyBody(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("nicknobody")
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(
-
-	status, _ := tserver.sendCommand(
 		token, map[string]any{commandKey: "NICK"},
 	)
 	if status != http.StatusOK {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "431" {
-
-	if !findNumeric(msgs, "461") {
 		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
+			"expected IRC 431, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -1081,9 +994,7 @@ func TestTopicMissingTo(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("topicnoto")
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(token, map[string]any{
-
-	status, _ := tserver.sendCommand(token, map[string]any{
 		commandKey: "TOPIC",
 		bodyKey:    []string{"topic"},
 	})
@@ -1091,12 +1002,10 @@ func TestTopicMissingTo(t *testing.T) {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "461" {
-
-	if !findNumeric(msgs, "461") {
 		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
+			"expected IRC 461, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -1109,21 +1018,17 @@ func TestTopicMissingBody(t *testing.T) {
 		commandKey: joinCmd, toKey: "#topictest",
 	})
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(token, map[string]any{
-
-	status, _ := tserver.sendCommand(token, map[string]any{
 		commandKey: "TOPIC", toKey: "#topictest",
 	})
 	if status != http.StatusOK {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "461" {
-
-	if !findNumeric(msgs, "461") {
 		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
+			"expected IRC 461, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -1192,21 +1097,17 @@ func TestUnknownCommand(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("cmdtest")
 
-	_, lastID := tserver.pollMessages(token, 0)
+	status, result := tserver.sendCommand(
-
-	status, _ := tserver.sendCommand(
 		token, map[string]any{commandKey: "BOGUS"},
 	)
 	if status != http.StatusOK {
 		t.Fatalf("expected 200, got %d", status)
 	}
 
-	msgs, _ := tserver.pollMessages(token, lastID)
+	if result[commandKey] != "421" {
-
-	if !findNumeric(msgs, "421") {
 		t.Fatalf(
-			"expected ERR_UNKNOWNCOMMAND (421), got %v",
+			"expected IRC 421, got %v",
-			msgs,
+			result[commandKey],
 		)
 	}
 }
@@ -1215,11 +1116,18 @@ func TestEmptyCommand(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("emptycmd")
 
-	status, _ := tserver.sendCommand(
+	status, result := tserver.sendCommand(
 		token, map[string]any{commandKey: ""},
 	)
-	if status != http.StatusBadRequest {
+	if status != http.StatusOK {
-		t.Fatalf("expected 400, got %d", status)
+		t.Fatalf("expected 200, got %d", status)
+	}
+
+	if result[commandKey] != "421" {
+		t.Fatalf(
+			"expected IRC 421, got %v",
+			result[commandKey],
+		)
 	}
 }
 
@@ -1454,18 +1362,12 @@ func TestLongPollTimeout(t *testing.T) {
 	tserver := newTestServer(t)
 	token := tserver.createSession("lp_timeout")
 
-	// Drain initial welcome/MOTD numerics.
-	_, lastID := tserver.pollMessages(token, 0)
-
 	start := time.Now()
 
 	resp, err := doRequestAuth(
 		t,
 		http.MethodGet,
-		tserver.url(fmt.Sprintf(
+		tserver.url(apiMessages+"?timeout=1"),
-			"%s?timeout=1&after=%d",
-			apiMessages, lastID,
-		)),
 		token,
 		nil,
 	)

internal/handlers/auth.go

@@ -80,7 +80,7 @@ func (hdlr *Handlers) handleRegister(
 		return
 	}
 
-	hdlr.deliverMOTD(request, clientID, sessionID, payload.Nick)
+	hdlr.deliverMOTD(request, clientID, sessionID)
 
 	hdlr.respondJSON(writer, request, map[string]any{
 		"id":    sessionID,
@@ -162,7 +162,7 @@ func (hdlr *Handlers) handleLogin(
 		return
 	}
 
-	sessionID, clientID, token, err :=
+	sessionID, _, token, err :=
 		hdlr.params.Database.LoginUser(
 			request.Context(),
 			payload.Nick,
@@ -178,10 +178,6 @@ func (hdlr *Handlers) handleLogin(
 		return
 	}
 
-	hdlr.deliverMOTD(
-		request, clientID, sessionID, payload.Nick,
-	)
-
 	hdlr.respondJSON(writer, request, map[string]any{
 		"id":    sessionID,
 		"nick":  payload.Nick,