feat: add IRC wire protocol listener with shared service layer

Adds a backward-compatible IRC wire protocol listener (RFC 1459/2812)
with a shared service layer used by both IRC and HTTP transports.

- TCP listener on configurable port (default :6667)
- Full IRC protocol: NICK, USER, JOIN, PART, PRIVMSG, MODE, TOPIC, etc.
- Shared service layer (internal/service/) for consistent code paths
- Tier 2 join restrictions (ban, invite-only, key, limit) in service layer
- Ban check on PRIVMSG in service layer
- SetChannelFlag handles +i and +s modes
- Command dispatch via map[string]cmdHandler pattern
- EXPOSE 6667 in Dockerfile
- Service layer unit tests

closes #89

internal/db/db.go

@@ -135,21 +135,13 @@ type migration struct {
 func (database *Database) runMigrations(
 	ctx context.Context,
 ) error {
-	bootstrap, err := SchemaFiles.ReadFile(
-		"schema/000.sql",
-	)
+	_, err := database.conn.ExecContext(ctx,
+		`CREATE TABLE IF NOT EXISTS schema_migrations (
+		 version INTEGER PRIMARY KEY,
+		 applied_at DATETIME DEFAULT CURRENT_TIMESTAMP)`)
 	if err != nil {
 		return fmt.Errorf(
-			"read bootstrap migration: %w", err,
-		)
-	}
-
-	_, err = database.conn.ExecContext(
-		ctx, string(bootstrap),
-	)
-	if err != nil {
-		return fmt.Errorf(
-			"execute bootstrap migration: %w", err,
+			"create schema_migrations: %w", err,
 		)
 	}
 
@@ -278,11 +270,6 @@ func (database *Database) loadMigrations() (
 			continue
 		}
 
-		// Skip bootstrap migration; it is executed separately.
-		if version == 0 {
-			continue
-		}
-
 		content, readErr := SchemaFiles.ReadFile(
 			"schema/" + entry.Name(),
 		)

internal/db/queries.go

@@ -2165,52 +2165,6 @@ func (database *Database) SetChannelSecret(
 	return nil
 }
 
-// --- No External Messages (+n) ---
-
-// IsChannelNoExternal checks if a channel has +n mode.
-func (database *Database) IsChannelNoExternal(
-	ctx context.Context,
-	channelID int64,
-) (bool, error) {
-	var isNoExternal int
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT is_no_external FROM channels
-		 WHERE id = ?`,
-		channelID,
-	).Scan(&isNoExternal)
-	if err != nil {
-		return false, fmt.Errorf(
-			"check no external: %w", err,
-		)
-	}
-
-	return isNoExternal != 0, nil
-}
-
-// SetChannelNoExternal sets or unsets +n mode.
-func (database *Database) SetChannelNoExternal(
-	ctx context.Context,
-	channelID int64,
-	noExternal bool,
-) error {
-	val := 0
-	if noExternal {
-		val = 1
-	}
-
-	_, err := database.conn.ExecContext(ctx,
-		`UPDATE channels
-		 SET is_no_external = ?, updated_at = ?
-		 WHERE id = ?`,
-		val, time.Now(), channelID)
-	if err != nil {
-		return fmt.Errorf("set no external: %w", err)
-	}
-
-	return nil
-}
-
 // ListAllChannelsWithCountsFiltered returns all channels
 // with member counts, excluding secret channels that
 // the given session is not a member of.

internal/db/schema/000.sql

@@ -1,6 +0,0 @@
--- Bootstrap: create the schema_migrations table itself.
-CREATE TABLE IF NOT EXISTS schema_migrations (
-    version INTEGER PRIMARY KEY,
-    applied_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-INSERT OR IGNORE INTO schema_migrations (version) VALUES (0);

internal/db/schema/001_initial.sql

@@ -44,7 +44,6 @@ CREATE TABLE IF NOT EXISTS channels (
     is_topic_locked INTEGER NOT NULL DEFAULT 1,
     is_invite_only INTEGER NOT NULL DEFAULT 0,
     is_secret INTEGER NOT NULL DEFAULT 0,
-    is_no_external INTEGER NOT NULL DEFAULT 1,
     channel_key TEXT NOT NULL DEFAULT '',
     user_limit INTEGER NOT NULL DEFAULT 0,
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,

internal/handlers/api.go

@@ -2016,14 +2016,62 @@ func (hdlr *Handlers) handleChannelMode(
 }
 
 // buildChannelModeString constructs the current mode
-// string for a channel by delegating to the service
-// layer's QueryChannelMode, which returns the complete
-// mode string including all flags and parameters.
+// string for a channel, including +n (always on), +t, +m,
+// +i, +s, +k, +l, and +H with their parameters.
 func (hdlr *Handlers) buildChannelModeString(
 	ctx context.Context,
 	chID int64,
 ) string {
-	return hdlr.svc.QueryChannelMode(ctx, chID)
+	modes := "+n"
+
+	isInviteOnly, ioErr := hdlr.params.Database.
+		IsChannelInviteOnly(ctx, chID)
+	if ioErr == nil && isInviteOnly {
+		modes += "i"
+	}
+
+	isModerated, modErr := hdlr.params.Database.
+		IsChannelModerated(ctx, chID)
+	if modErr == nil && isModerated {
+		modes += "m"
+	}
+
+	isSecret, secErr := hdlr.params.Database.
+		IsChannelSecret(ctx, chID)
+	if secErr == nil && isSecret {
+		modes += "s"
+	}
+
+	isTopicLocked, tlErr := hdlr.params.Database.
+		IsChannelTopicLocked(ctx, chID)
+	if tlErr == nil && isTopicLocked {
+		modes += "t"
+	}
+
+	var modeParams string
+
+	key, keyErr := hdlr.params.Database.
+		GetChannelKey(ctx, chID)
+	if keyErr == nil && key != "" {
+		modes += "k"
+		modeParams += " " + key
+	}
+
+	limit, limErr := hdlr.params.Database.
+		GetChannelUserLimit(ctx, chID)
+	if limErr == nil && limit > 0 {
+		modes += "l"
+		modeParams += " " + strconv.Itoa(limit)
+	}
+
+	bits, bitsErr := hdlr.params.Database.
+		GetChannelHashcashBits(ctx, chID)
+	if bitsErr == nil && bits > 0 {
+		modes += "H"
+		modeParams += " " + strconv.Itoa(bits)
+	}
+
+	return modes + modeParams
 }
 
 // queryChannelMode sends RPL_CHANNELMODEIS and

internal/ircserver/commands.go

@@ -490,124 +490,6 @@ func (c *Conn) handleChannelMode(
 	)
 }
 
-// modeResult holds the delta strings produced by a
-// single mode-char application.
-type modeResult struct {
-	applied     string
-	appliedArgs string
-	consumed    int
-	skip        bool
-}
-
-// applyHashcashMode handles +H/-H (hashcash difficulty).
-func (c *Conn) applyHashcashMode(
-	ctx context.Context,
-	chID int64,
-	adding bool,
-	args []string,
-	argIdx int,
-) modeResult {
-	if !adding {
-		_ = c.database.SetChannelHashcashBits(
-			ctx, chID, 0,
-		)
-
-		return modeResult{
-			applied:     "-H",
-			appliedArgs: "",
-			consumed:    0,
-			skip:        false,
-		}
-	}
-
-	if argIdx >= len(args) {
-		return modeResult{
-			applied:     "",
-			appliedArgs: "",
-			consumed:    0,
-			skip:        true,
-		}
-	}
-
-	bitsStr := args[argIdx]
-
-	bits, parseErr := strconv.Atoi(bitsStr)
-	if parseErr != nil ||
-		bits < 1 || bits > maxHashcashBits {
-		c.sendNumeric(
-			irc.ErrUnknownMode, "H",
-			"is unknown mode char to me",
-		)
-
-		return modeResult{
-			applied:     "",
-			appliedArgs: "",
-			consumed:    1,
-			skip:        true,
-		}
-	}
-
-	_ = c.database.SetChannelHashcashBits(
-		ctx, chID, bits,
-	)
-
-	return modeResult{
-		applied:     "+H",
-		appliedArgs: " " + bitsStr,
-		consumed:    1,
-		skip:        false,
-	}
-}
-
-// applyMemberMode handles +o/-o and +v/-v.
-func (c *Conn) applyMemberMode(
-	ctx context.Context,
-	chID int64,
-	channel string,
-	modeChar rune,
-	adding bool,
-	args []string,
-	argIdx int,
-) modeResult {
-	if argIdx >= len(args) {
-		return modeResult{
-			applied:     "",
-			appliedArgs: "",
-			consumed:    0,
-			skip:        true,
-		}
-	}
-
-	targetNick := args[argIdx]
-
-	err := c.svc.ApplyMemberMode(
-		ctx, chID, channel,
-		targetNick, modeChar, adding,
-	)
-	if err != nil {
-		c.sendIRCError(err)
-
-		return modeResult{
-			applied:     "",
-			appliedArgs: "",
-			consumed:    1,
-			skip:        true,
-		}
-	}
-
-	prefix := "+"
-	if !adding {
-		prefix = "-"
-	}
-
-	return modeResult{
-		applied:     prefix + string(modeChar),
-		appliedArgs: " " + targetNick,
-		consumed:    1,
-		skip:        false,
-	}
-}
-
 // applyChannelModes applies mode changes using the
 // service for individual mode operations.
 func (c *Conn) applyChannelModes(
@@ -623,57 +505,52 @@ func (c *Conn) applyChannelModes(
 	appliedArgs := ""
 
 	for _, modeChar := range modeStr {
-		var res modeResult
-
 		switch modeChar {
 		case '+':
 			adding = true
-
-			continue
 		case '-':
 			adding = false
-
-			continue
-		case 'i', 'm', 'n', 's', 't':
+		case 'm', 't':
 			_ = c.svc.SetChannelFlag(
 				ctx, chID, modeChar, adding,
 			)
 
-			prefix := "+"
-			if !adding {
-				prefix = "-"
+			if adding {
+				applied += "+" + string(modeChar)
+			} else {
+				applied += "-" + string(modeChar)
+			}
+		case 'o', 'v':
+			if argIdx >= len(args) {
+				break
 			}
 
-			res = modeResult{
-				applied:     prefix + string(modeChar),
-				appliedArgs: "",
-				consumed:    0,
-				skip:        false,
-			}
-		case 'H':
-			res = c.applyHashcashMode(
-				ctx, chID, adding, args, argIdx,
-			)
-		case 'o', 'v':
-			res = c.applyMemberMode(
+			targetNick := args[argIdx]
+			argIdx++
+
+			err := c.svc.ApplyMemberMode(
 				ctx, chID, channel,
-				modeChar, adding, args, argIdx,
+				targetNick, modeChar, adding,
 			)
+			if err != nil {
+				c.sendIRCError(err)
+
+				continue
+			}
+
+			if adding {
+				applied += "+" + string(modeChar)
+			} else {
+				applied += "-" + string(modeChar)
+			}
+
+			appliedArgs += " " + targetNick
 		default:
 			c.sendNumeric(
 				irc.ErrUnknownMode,
 				string(modeChar),
 				"is unknown mode char to me",
 			)
-
-			continue
-		}
-
-		argIdx += res.consumed
-
-		if !res.skip {
-			applied += res.applied
-			appliedArgs += res.appliedArgs
 		}
 	}
 

internal/ircserver/conn.go

@@ -19,16 +19,15 @@ import (
 )
 
 const (
-	maxLineLen      = 512
-	readTimeout     = 5 * time.Minute
-	writeTimeout    = 30 * time.Second
-	dnsTimeout      = 3 * time.Second
-	pollInterval    = 100 * time.Millisecond
-	pingInterval    = 90 * time.Second
-	pongDeadline    = 30 * time.Second
-	maxNickLen      = 32
-	minPasswordLen  = 8
-	maxHashcashBits = 40
+	maxLineLen     = 512
+	readTimeout    = 5 * time.Minute
+	writeTimeout   = 30 * time.Second
+	dnsTimeout     = 3 * time.Second
+	pollInterval   = 100 * time.Millisecond
+	pingInterval   = 90 * time.Second
+	pongDeadline   = 30 * time.Second
+	maxNickLen     = 32
+	minPasswordLen = 8
 )
 
 // cmdHandler is the signature for registered IRC command
@@ -435,7 +434,7 @@ func (c *Conn) deliverWelcome() {
 		"CHANTYPES=#",
 		"NICKLEN=32",
 		"PREFIX=(ov)@+",
-		"CHANMODES=,,H,imnst",
+		"CHANMODES=,,H,mnst",
 		"NETWORK="+c.serverSfx,
 		"are supported by this server",
 	)

internal/ircserver/export_test.go

@@ -19,9 +19,12 @@ func NewTestServer(
 	database *db.Database,
 	brk *broker.Broker,
 ) *Server {
-	svc := service.NewTestService(
-		database, brk, cfg, log,
-	)
+	svc := &service.Service{
+		DB:     database,
+		Broker: brk,
+		Config: cfg,
+		Log:    log,
+	}
 
 	return &Server{ //nolint:exhaustruct
 		log:      log,

internal/ircserver/integration_test.go

@@ -1,913 +0,0 @@
-package ircserver_test
-
-import (
-	"strings"
-	"testing"
-	"time"
-)
-
-// TestIntegrationTwoClients is a comprehensive integration
-// test that spawns the IRC server programmatically, connects
-// two real TCP clients, and verifies all major IRC features
-// including cross-client message delivery.
-//
-// The test runs sequentially through IRC features because
-// both clients share the same channel state.  Each section
-// builds on the previous one (e.g. alice and bob must be
-// JOINed before PRIVMSG can be tested).
-//
-//nolint:cyclop,funlen,maintidx // integration test
-func TestIntegrationTwoClients(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	alice := env.dial(t)
-	bob := env.dial(t)
-
-	// ── Registration ──────────────────────────────────
-
-	aliceWelcome := alice.register("alice")
-	assertContains(
-		t, aliceWelcome, " 001 ", "RPL_WELCOME alice",
-	)
-	assertContains(
-		t, aliceWelcome, " 002 ", "RPL_YOURHOST alice",
-	)
-	assertContains(
-		t, aliceWelcome, " 003 ", "RPL_CREATED alice",
-	)
-	assertContains(
-		t, aliceWelcome, " 004 ", "RPL_MYINFO alice",
-	)
-	assertContains(
-		t, aliceWelcome, "alice",
-		"nick in welcome burst",
-	)
-
-	bobWelcome := bob.register("bob")
-	assertContains(
-		t, bobWelcome, " 001 ", "RPL_WELCOME bob",
-	)
-	assertContains(
-		t, bobWelcome, "bob",
-		"nick in welcome burst",
-	)
-
-	// ── JOIN and cross-client visibility ──────────────
-
-	alice.send("JOIN #integration")
-	aliceJoinLines := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 366 ")
-	})
-	assertContains(
-		t, aliceJoinLines, "JOIN",
-		"alice receives JOIN echo",
-	)
-	assertContains(
-		t, aliceJoinLines, " 366 ",
-		"RPL_ENDOFNAMES for alice",
-	)
-
-	bob.send("JOIN #integration")
-	bobJoinLines := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 366 ")
-	})
-	assertContains(
-		t, bobJoinLines, "JOIN",
-		"bob receives JOIN echo",
-	)
-
-	// Alice should see bob's JOIN via relay.
-	aliceSeesBob := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "JOIN") &&
-			strings.Contains(l, "bob")
-	})
-	assertContains(
-		t, aliceSeesBob, "bob",
-		"alice sees bob's JOIN",
-	)
-
-	// ── PRIVMSG (channel) — alice to bob ──────────────
-
-	alice.send("PRIVMSG #integration :hello from alice")
-
-	bobGetsMsg := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "hello from alice")
-	})
-	assertContains(
-		t, bobGetsMsg, "hello from alice",
-		"bob receives alice's channel message",
-	)
-
-	// ── PRIVMSG (channel) — bob to alice ──────────────
-
-	bob.send("PRIVMSG #integration :hello from bob")
-
-	aliceGetsMsg := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "hello from bob")
-	})
-	assertContains(
-		t, aliceGetsMsg, "hello from bob",
-		"alice receives bob's channel message",
-	)
-
-	// ── PRIVMSG (DM) — alice to bob ──────────────────
-
-	alice.send("PRIVMSG bob :secret message")
-
-	bobDM := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "secret message")
-	})
-	assertContains(
-		t, bobDM, "secret message",
-		"bob receives alice's DM",
-	)
-	assertContains(
-		t, bobDM, "alice",
-		"DM from field is alice",
-	)
-
-	// ── PRIVMSG (DM) — bob to alice ──────────────────
-
-	bob.send("PRIVMSG alice :reply to you")
-
-	aliceDM := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "reply to you")
-	})
-	assertContains(
-		t, aliceDM, "reply to you",
-		"alice receives bob's DM",
-	)
-
-	// ── NOTICE (channel) ──────────────────────────────
-
-	alice.send("NOTICE #integration :notice msg")
-
-	bobNotice := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "notice msg")
-	})
-	assertContains(
-		t, bobNotice, "NOTICE",
-		"bob receives NOTICE command",
-	)
-	assertContains(
-		t, bobNotice, "notice msg",
-		"bob receives NOTICE text",
-	)
-
-	// ── NOTICE (DM) ──────────────────────────────────
-
-	bob.send("NOTICE alice :dm notice")
-
-	aliceNotice := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "dm notice")
-	})
-	assertContains(
-		t, aliceNotice, "dm notice",
-		"alice receives DM NOTICE",
-	)
-
-	// ── TOPIC ─────────────────────────────────────────
-	// alice is the channel creator so she is +o.
-
-	alice.send("TOPIC #integration :Integration Test Topic")
-
-	aliceTopic := alice.readUntil(func(l string) bool {
-		return strings.Contains(
-			l, "Integration Test Topic",
-		)
-	})
-	assertContains(
-		t, aliceTopic, "Integration Test Topic",
-		"alice sees TOPIC echo",
-	)
-
-	bobTopic := bob.readUntil(func(l string) bool {
-		return strings.Contains(
-			l, "Integration Test Topic",
-		)
-	})
-	assertContains(
-		t, bobTopic, "Integration Test Topic",
-		"bob receives TOPIC change",
-	)
-
-	// ── MODE (query) ──────────────────────────────────
-
-	alice.send("MODE #integration")
-
-	aliceMode := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 324 ")
-	})
-	assertContains(
-		t, aliceMode, " 324 ",
-		"RPL_CHANNELMODEIS",
-	)
-
-	// ── MODE (+m moderated, then -m) ──────────────────
-
-	alice.send("MODE #integration +m")
-
-	aliceModeM := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "MODE") &&
-			strings.Contains(l, "+m")
-	})
-	assertContains(
-		t, aliceModeM, "+m",
-		"alice sees MODE +m echo",
-	)
-
-	bobModeM := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "+m")
-	})
-	assertContains(
-		t, bobModeM, "+m",
-		"bob sees MODE +m relay",
-	)
-
-	// Revert moderated mode.
-	alice.send("MODE #integration -m")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "-m")
-	})
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "-m")
-	})
-
-	// ── MODE (+v voice, then -v) ──────────────────────
-
-	alice.send("MODE #integration +v bob")
-
-	aliceVoice := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "+v")
-	})
-	assertContains(
-		t, aliceVoice, "+v",
-		"alice sees +v echo",
-	)
-
-	bobVoice := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "+v")
-	})
-	assertContains(
-		t, bobVoice, "+v",
-		"bob receives +v relay",
-	)
-
-	// Remove voice.
-	alice.send("MODE #integration -v bob")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "-v")
-	})
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "-v")
-	})
-
-	// ── NAMES ─────────────────────────────────────────
-
-	alice.send("NAMES #integration")
-
-	aliceNames := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 366 ")
-	})
-	assertContains(
-		t, aliceNames, " 353 ",
-		"RPL_NAMREPLY",
-	)
-	assertContains(
-		t, aliceNames, " 366 ",
-		"RPL_ENDOFNAMES",
-	)
-
-	// Both nicks should appear in the name list.
-	foundBothNames := false
-	for _, line := range aliceNames {
-		if strings.Contains(line, " 353 ") &&
-			strings.Contains(line, "alice") &&
-			strings.Contains(line, "bob") {
-			foundBothNames = true
-
-			break
-		}
-	}
-
-	if !foundBothNames {
-		t.Error("NAMES reply should list both alice and bob")
-	}
-
-	// ── LIST ──────────────────────────────────────────
-
-	alice.send("LIST")
-
-	aliceList := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 323 ")
-	})
-	assertContains(
-		t, aliceList, " 322 ",
-		"RPL_LIST entry",
-	)
-	assertContains(
-		t, aliceList, "#integration",
-		"LIST includes #integration",
-	)
-	assertContains(
-		t, aliceList, " 323 ", //nolint:misspell // IRC RPL_LISTEND
-		"RPL_LISTEND", //nolint:misspell // IRC term
-	)
-
-	// ── WHO ───────────────────────────────────────────
-
-	bob.send("WHO #integration")
-
-	bobWho := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 315 ")
-	})
-	assertContains(
-		t, bobWho, " 352 ",
-		"RPL_WHOREPLY",
-	)
-	assertContains(
-		t, bobWho, " 315 ",
-		"RPL_ENDOFWHO",
-	)
-
-	// ── WHOIS ─────────────────────────────────────────
-
-	alice.send("WHOIS bob")
-
-	aliceWhois := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 318 ")
-	})
-	assertContains(
-		t, aliceWhois, " 311 ",
-		"RPL_WHOISUSER",
-	)
-	assertContains(
-		t, aliceWhois, " 312 ",
-		"RPL_WHOISSERVER",
-	)
-	assertContains(
-		t, aliceWhois, " 318 ",
-		"RPL_ENDOFWHOIS",
-	)
-
-	// ── WHOIS with channels ───────────────────────────
-
-	bob.send("WHOIS alice")
-
-	bobWhois := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 318 ")
-	})
-	assertContains(
-		t, bobWhois, " 319 ",
-		"RPL_WHOISCHANNELS",
-	)
-	assertContains(
-		t, bobWhois, "#integration",
-		"WHOIS shows #integration channel",
-	)
-
-	// ── LUSERS ────────────────────────────────────────
-
-	alice.send("LUSERS")
-
-	aliceLusers := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 255 ")
-	})
-	assertContains(
-		t, aliceLusers, " 251 ",
-		"RPL_LUSERCLIENT",
-	)
-	assertContains(
-		t, aliceLusers, " 255 ",
-		"RPL_LUSERME",
-	)
-
-	// ── NICK change ───────────────────────────────────
-
-	bob.send("NICK bobby")
-
-	bobNick := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "NICK") &&
-			strings.Contains(l, "bobby")
-	})
-	assertContains(
-		t, bobNick, "bobby",
-		"bob sees NICK change to bobby",
-	)
-
-	// alice should see the nick change relayed.
-	aliceNick := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "bobby")
-	})
-	assertContains(
-		t, aliceNick, "NICK",
-		"alice sees NICK command",
-	)
-	assertContains(
-		t, aliceNick, "bobby",
-		"alice sees new nick bobby",
-	)
-
-	// Change it back for remaining tests.
-	bob.send("NICK bob")
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "bob")
-	})
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "NICK") &&
-			strings.Contains(l, "bob")
-	})
-
-	// ── Duplicate NICK ────────────────────────────────
-
-	bob.send("NICK alice")
-
-	bobDupNick := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 433 ")
-	})
-	assertContains(
-		t, bobDupNick, " 433 ",
-		"ERR_NICKNAMEINUSE",
-	)
-
-	// ── KICK ──────────────────────────────────────────
-	// alice is op; she kicks bob.
-
-	alice.send("KICK #integration bob :testing kick")
-
-	aliceKick := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "KICK")
-	})
-	assertContains(
-		t, aliceKick, "KICK",
-		"alice sees KICK echo",
-	)
-	assertContains(
-		t, aliceKick, "bob",
-		"KICK mentions bob",
-	)
-
-	bobKick := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "KICK")
-	})
-	assertContains(
-		t, bobKick, "KICK",
-		"bob receives KICK",
-	)
-	assertContains(
-		t, bobKick, "testing kick",
-		"KICK reason is relayed",
-	)
-
-	// bob rejoins.
-	bob.joinAndDrain("#integration")
-
-	// Drain alice's view of the rejoin.
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "JOIN") &&
-			strings.Contains(l, "bob")
-	})
-
-	// ── KICK non-op should fail ───────────────────────
-
-	bob.send("KICK #integration alice :nope")
-
-	bobKickFail := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 482 ")
-	})
-	assertContains(
-		t, bobKickFail, " 482 ",
-		"ERR_CHANOPRIVSNEEDED",
-	)
-
-	// ── TOPIC lock (+t default) ───────────────────────
-	// +t is default, so bob should not be able to set
-	// topic.
-
-	bob.send("TOPIC #integration :bob tries topic")
-
-	bobTopicFail := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 482 ")
-	})
-	assertContains(
-		t, bobTopicFail, " 482 ",
-		"ERR_CHANOPRIVSNEEDED for topic",
-	)
-
-	// ── PING / PONG ───────────────────────────────────
-
-	alice.send("PING :testtoken")
-
-	alicePong := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "PONG")
-	})
-	assertContains(
-		t, alicePong, "PONG",
-		"PONG response received",
-	)
-
-	// ── Unknown command ───────────────────────────────
-
-	bob.send("FOOBAR")
-
-	bobUnknown := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 421 ")
-	})
-	assertContains(
-		t, bobUnknown, " 421 ",
-		"ERR_UNKNOWNCOMMAND",
-	)
-
-	// ── MOTD ──────────────────────────────────────────
-
-	alice.send("MOTD")
-
-	aliceMOTD := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 376 ")
-	})
-	assertContains(
-		t, aliceMOTD, " 376 ",
-		"RPL_ENDOFMOTD",
-	)
-
-	// ── AWAY (set, check via DM, clear) ───────────────
-
-	alice.send("AWAY :gone fishing")
-
-	aliceAway := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 306 ")
-	})
-	assertContains(
-		t, aliceAway, " 306 ",
-		"RPL_NOWAWAY",
-	)
-
-	// bob DMs alice — should get RPL_AWAY.
-	bob.send("PRIVMSG alice :are you there?")
-
-	bobAwayReply := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 301 ")
-	})
-	assertContains(
-		t, bobAwayReply, " 301 ",
-		"RPL_AWAY for bob when messaging alice",
-	)
-	assertContains(
-		t, bobAwayReply, "gone fishing",
-		"away message relayed",
-	)
-
-	// Clear away.
-	alice.send("AWAY")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 305 ")
-	})
-
-	// ── PASS (set password post-registration) ─────────
-
-	alice.send("PASS :mypassword123")
-
-	alicePass := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "Password set")
-	})
-	assertContains(
-		t, alicePass, "Password set",
-		"password set confirmation",
-	)
-
-	// ── MODE -t/+t topic lock toggle ──────────────────
-
-	alice.send("MODE #integration -t")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "-t")
-	})
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "-t")
-	})
-
-	// Now bob should be able to set topic.
-	bob.send("TOPIC #integration :bob sets topic now")
-
-	bobTopicOK := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "bob sets topic now")
-	})
-	assertContains(
-		t, bobTopicOK, "bob sets topic now",
-		"bob can set topic after -t",
-	)
-
-	// alice sees the topic change.
-	aliceTopicRelay := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "bob sets topic now")
-	})
-	assertContains(
-		t, aliceTopicRelay, "bob sets topic now",
-		"alice sees bob's topic after -t",
-	)
-
-	// Restore +t.
-	alice.send("MODE #integration +t")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "+t")
-	})
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "+t")
-	})
-
-	// ── DM to nonexistent nick ────────────────────────
-
-	alice.send("PRIVMSG nobody123 :hello")
-
-	aliceNoSuch := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 401 ")
-	})
-	assertContains(
-		t, aliceNoSuch, " 401 ",
-		"ERR_NOSUCHNICK",
-	)
-
-	// ── PART with reason ──────────────────────────────
-
-	bob.send("PART #integration :bye for now")
-
-	bobPart := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "PART")
-	})
-	assertContains(
-		t, bobPart, "PART",
-		"bob sees PART echo",
-	)
-
-	// alice sees bob PART via relay.
-	alicePart := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "PART") &&
-			strings.Contains(l, "bob")
-	})
-	assertContains(
-		t, alicePart, "bob",
-		"alice sees bob's PART",
-	)
-	assertContains(
-		t, alicePart, "bye for now",
-		"PART reason is relayed",
-	)
-
-	// bob rejoins for remaining tests.
-	bob.joinAndDrain("#integration")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "JOIN") &&
-			strings.Contains(l, "bob")
-	})
-
-	// ── PART non-existent channel ─────────────────────
-
-	bob.send("PART #nonexistent")
-
-	bobPartFail := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 403 ") ||
-			strings.Contains(l, " 442 ")
-	})
-
-	foundPartErr := false
-	for _, line := range bobPartFail {
-		if strings.Contains(line, " 403 ") ||
-			strings.Contains(line, " 442 ") {
-			foundPartErr = true
-
-			break
-		}
-	}
-
-	if !foundPartErr {
-		t.Error(
-			"expected ERR_NOSUCHCHANNEL or " +
-				"ERR_NOTONCHANNEL",
-		)
-	}
-
-	// ── User MODE query ───────────────────────────────
-
-	alice.send("MODE alice")
-
-	aliceUMode := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 221 ")
-	})
-	assertContains(
-		t, aliceUMode, " 221 ",
-		"RPL_UMODEIS",
-	)
-
-	// ── Multiple channel operation ────────────────────
-
-	alice.send("JOIN #second")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 366 ")
-	})
-
-	bob.send("JOIN #second")
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 366 ")
-	})
-
-	// Drain alice seeing bob join.
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "JOIN") &&
-			strings.Contains(l, "bob")
-	})
-
-	alice.send("PRIVMSG #second :cross-channel test")
-
-	bobCross := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "cross-channel test")
-	})
-	assertContains(
-		t, bobCross, "cross-channel test",
-		"bob receives message in #second",
-	)
-
-	// Clean up #second.
-	alice.send("PART #second")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "PART")
-	})
-	bob.send("PART #second")
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "PART")
-	})
-
-	// ── QUIT ──────────────────────────────────────────
-
-	bob.send("QUIT :integration test done")
-
-	bobQuit := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "ERROR")
-	})
-	assertContains(
-		t, bobQuit, "integration test done",
-		"QUIT reason echoed",
-	)
-
-	// alice should see bob's QUIT via relay.
-	aliceQuit := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "QUIT") &&
-			strings.Contains(l, "bob")
-	})
-	assertContains(
-		t, aliceQuit, "bob",
-		"alice sees bob's QUIT",
-	)
-}
-
-// TestIntegrationModeSecret tests +s (secret) channel
-// mode — verifies that +s can be set and the mode is
-// reflected in MODE queries.
-func TestIntegrationModeSecret(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	alice := env.dial(t)
-	alice.register("alice")
-
-	alice.joinAndDrain("#secretroom")
-
-	// Set +s.
-	alice.send("MODE #secretroom +s")
-	aliceLines := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "+s")
-	})
-	assertContains(
-		t, aliceLines, "+s",
-		"alice sees MODE +s confirmation",
-	)
-
-	// Verify mode is reflected in query.
-	alice.send("MODE #secretroom")
-	modeLines := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, " 324 ")
-	})
-	assertContains(
-		t, modeLines, "s",
-		"channel mode includes s",
-	)
-}
-
-// TestIntegrationModeModerated tests +m (moderated) mode
-// — non-voiced users cannot send.
-func TestIntegrationModeModerated(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	alice := env.dial(t)
-	alice.register("alice")
-
-	bob := env.dial(t)
-	bob.register("bob")
-
-	alice.joinAndDrain("#modtest")
-	bob.joinAndDrain("#modtest")
-
-	// Drain alice's view of bob's join.
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "JOIN") &&
-			strings.Contains(l, "bob")
-	})
-
-	// Set +m.
-	alice.send("MODE #modtest +m")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "+m")
-	})
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "+m")
-	})
-
-	// bob should get an error trying to send.
-	bob.send("PRIVMSG #modtest :should fail")
-	bobLines := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, " 404 ") ||
-			strings.Contains(l, " 482 ")
-	})
-
-	foundModErr := false
-	for _, line := range bobLines {
-		if strings.Contains(line, " 404 ") ||
-			strings.Contains(line, " 482 ") {
-			foundModErr = true
-
-			break
-		}
-	}
-
-	if !foundModErr {
-		t.Error(
-			"non-voiced user should not be able to send " +
-				"in +m channel",
-		)
-	}
-
-	// Grant +v to bob, then he should be able to send.
-	alice.send("MODE #modtest +v bob")
-	alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "+v")
-	})
-	bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "+v")
-	})
-
-	bob.send("PRIVMSG #modtest :voiced message")
-	aliceLines := alice.readUntil(func(l string) bool {
-		return strings.Contains(l, "voiced message")
-	})
-	assertContains(
-		t, aliceLines, "voiced message",
-		"alice receives voiced bob's message",
-	)
-}
-
-// TestIntegrationThirdClientObserver verifies that a third
-// client observing the same channel receives messages from
-// the other two.
-func TestIntegrationThirdClientObserver(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	alice := env.dial(t)
-	alice.register("alice")
-
-	bob := env.dial(t)
-	bob.register("bob")
-
-	carol := env.dial(t)
-	carol.register("carol")
-
-	alice.joinAndDrain("#trio")
-	bob.joinAndDrain("#trio")
-	carol.joinAndDrain("#trio")
-
-	// Drain join notifications.
-	time.Sleep(100 * time.Millisecond)
-
-	// alice sends; both bob and carol should receive.
-	alice.send("PRIVMSG #trio :hello trio")
-
-	bobLines := bob.readUntil(func(l string) bool {
-		return strings.Contains(l, "hello trio")
-	})
-	assertContains(
-		t, bobLines, "hello trio",
-		"bob receives trio message",
-	)
-
-	carolLines := carol.readUntil(func(l string) bool {
-		return strings.Contains(l, "hello trio")
-	})
-	assertContains(
-		t, carolLines, "hello trio",
-		"carol receives trio message",
-	)
-}

internal/service/service.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
-	"strconv"
 	"strings"
 
 	"git.eeqj.de/sneak/neoirc/internal/broker"
@@ -31,35 +30,19 @@ type Params struct {
 
 // Service provides shared business logic for IRC commands.
 type Service struct {
-	db     *db.Database
-	broker *broker.Broker
-	config *config.Config
-	log    *slog.Logger
+	DB     *db.Database
+	Broker *broker.Broker
+	Config *config.Config
+	Log    *slog.Logger
 }
 
 // New creates a new Service.
 func New(params Params) *Service {
 	return &Service{
-		db:     params.Database,
-		broker: params.Broker,
-		config: params.Config,
-		log:    params.Logger.Get(),
-	}
-}
-
-// NewTestService creates a Service for use in tests
-// outside the service package.
-func NewTestService(
-	database *db.Database,
-	brk *broker.Broker,
-	cfg *config.Config,
-	log *slog.Logger,
-) *Service {
-	return &Service{
-		db:     database,
-		broker: brk,
-		config: cfg,
-		log:    log,
+		DB:     params.Database,
+		Broker: params.Broker,
+		Config: params.Config,
+		Log:    params.Logger.Get(),
 	}
 }
 
@@ -93,7 +76,7 @@ func (s *Service) FanOut(
 	params, body, meta json.RawMessage,
 	sessionIDs []int64,
 ) (int64, string, error) {
-	dbID, msgUUID, err := s.db.InsertMessage(
+	dbID, msgUUID, err := s.DB.InsertMessage(
 		ctx, command, from, to, params, body, meta,
 	)
 	if err != nil {
@@ -101,8 +84,8 @@ func (s *Service) FanOut(
 	}
 
 	for _, sid := range sessionIDs {
-		_ = s.db.EnqueueToSession(ctx, sid, dbID)
-		s.broker.Notify(sid)
+		_ = s.DB.EnqueueToSession(ctx, sid, dbID)
+		s.Broker.Notify(sid)
 	}
 
 	return dbID, msgUUID, nil
@@ -137,7 +120,7 @@ func (s *Service) SendChannelMessage(
 	nick, command, channel string,
 	body, meta json.RawMessage,
 ) (int64, string, error) {
-	chID, err := s.db.GetChannelByName(ctx, channel)
+	chID, err := s.DB.GetChannelByName(ctx, channel)
 	if err != nil {
 		return 0, "", &IRCError{
 			irc.ErrNoSuchChannel,
@@ -146,7 +129,7 @@ func (s *Service) SendChannelMessage(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, sessionID,
 	)
 	if !isMember {
@@ -158,7 +141,7 @@ func (s *Service) SendChannelMessage(
 	}
 
 	// Ban check — banned users cannot send messages.
-	isBanned, banErr := s.db.IsSessionBanned(
+	isBanned, banErr := s.DB.IsSessionBanned(
 		ctx, chID, sessionID,
 	)
 	if banErr == nil && isBanned {
@@ -169,12 +152,12 @@ func (s *Service) SendChannelMessage(
 		}
 	}
 
-	moderated, _ := s.db.IsChannelModerated(ctx, chID)
+	moderated, _ := s.DB.IsChannelModerated(ctx, chID)
 	if moderated {
-		isOp, _ := s.db.IsChannelOperator(
+		isOp, _ := s.DB.IsChannelOperator(
 			ctx, chID, sessionID,
 		)
-		isVoiced, _ := s.db.IsChannelVoiced(
+		isVoiced, _ := s.DB.IsChannelVoiced(
 			ctx, chID, sessionID,
 		)
 
@@ -187,7 +170,7 @@ func (s *Service) SendChannelMessage(
 		}
 	}
 
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
+	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	recipients := excludeSession(memberIDs, sessionID)
 
 	dbID, uuid, fanErr := s.FanOut(
@@ -210,7 +193,7 @@ func (s *Service) SendDirectMessage(
 	nick, command, target string,
 	body, meta json.RawMessage,
 ) (*DirectMsgResult, error) {
-	targetSID, err := s.db.GetSessionByNick(ctx, target)
+	targetSID, err := s.DB.GetSessionByNick(ctx, target)
 	if err != nil {
 		return nil, &IRCError{
 			irc.ErrNoSuchNick,
@@ -219,7 +202,7 @@ func (s *Service) SendDirectMessage(
 		}
 	}
 
-	away, _ := s.db.GetAway(ctx, targetSID)
+	away, _ := s.DB.GetAway(ctx, targetSID)
 
 	recipients := []int64{targetSID}
 	if targetSID != sessionID {
@@ -245,19 +228,19 @@ func (s *Service) JoinChannel(
 	sessionID int64,
 	nick, channel, suppliedKey string,
 ) (*JoinResult, error) {
-	chID, err := s.db.GetOrCreateChannel(ctx, channel)
+	chID, err := s.DB.GetOrCreateChannel(ctx, channel)
 	if err != nil {
 		return nil, fmt.Errorf("get/create channel: %w", err)
 	}
 
-	memberCount, countErr := s.db.CountChannelMembers(
+	memberCount, countErr := s.DB.CountChannelMembers(
 		ctx, chID,
 	)
 	isCreator := countErr == nil && memberCount == 0
 
 	if !isCreator {
 		if joinErr := checkJoinRestrictions(
-			ctx, s.db, chID, sessionID,
+			ctx, s.DB, chID, sessionID,
 			channel, suppliedKey, memberCount,
 		); joinErr != nil {
 			return nil, joinErr
@@ -265,11 +248,11 @@ func (s *Service) JoinChannel(
 	}
 
 	if isCreator {
-		err = s.db.JoinChannelAsOperator(
+		err = s.DB.JoinChannelAsOperator(
 			ctx, chID, sessionID,
 		)
 	} else {
-		err = s.db.JoinChannel(ctx, chID, sessionID)
+		err = s.DB.JoinChannel(ctx, chID, sessionID)
 	}
 
 	if err != nil {
@@ -277,9 +260,9 @@ func (s *Service) JoinChannel(
 	}
 
 	// Clear invite after successful join.
-	_ = s.db.ClearChannelInvite(ctx, chID, sessionID)
+	_ = s.DB.ClearChannelInvite(ctx, chID, sessionID)
 
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
+	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	body, _ := json.Marshal([]string{channel}) //nolint:errchkjson
 
 	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
@@ -301,7 +284,7 @@ func (s *Service) PartChannel(
 	sessionID int64,
 	nick, channel, reason string,
 ) error {
-	chID, err := s.db.GetChannelByName(ctx, channel)
+	chID, err := s.DB.GetChannelByName(ctx, channel)
 	if err != nil {
 		return &IRCError{
 			irc.ErrNoSuchChannel,
@@ -310,7 +293,7 @@ func (s *Service) PartChannel(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, sessionID,
 	)
 	if !isMember {
@@ -321,7 +304,7 @@ func (s *Service) PartChannel(
 		}
 	}
 
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
+	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	recipients := excludeSession(memberIDs, sessionID)
 	body, _ := json.Marshal([]string{reason}) //nolint:errchkjson
 
@@ -330,8 +313,8 @@ func (s *Service) PartChannel(
 		nil, body, nil, recipients,
 	)
 
-	s.db.PartChannel(ctx, chID, sessionID) //nolint:errcheck,gosec
-	s.db.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
+	s.DB.PartChannel(ctx, chID, sessionID) //nolint:errcheck,gosec
+	s.DB.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
 
 	return nil
 }
@@ -343,7 +326,7 @@ func (s *Service) SetTopic(
 	sessionID int64,
 	nick, channel, topic string,
 ) error {
-	chID, err := s.db.GetChannelByName(ctx, channel)
+	chID, err := s.DB.GetChannelByName(ctx, channel)
 	if err != nil {
 		return &IRCError{
 			irc.ErrNoSuchChannel,
@@ -352,7 +335,7 @@ func (s *Service) SetTopic(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, sessionID,
 	)
 	if !isMember {
@@ -363,9 +346,9 @@ func (s *Service) SetTopic(
 		}
 	}
 
-	topicLocked, _ := s.db.IsChannelTopicLocked(ctx, chID)
+	topicLocked, _ := s.DB.IsChannelTopicLocked(ctx, chID)
 	if topicLocked {
-		isOp, _ := s.db.IsChannelOperator(
+		isOp, _ := s.DB.IsChannelOperator(
 			ctx, chID, sessionID,
 		)
 		if !isOp {
@@ -377,15 +360,15 @@ func (s *Service) SetTopic(
 		}
 	}
 
-	if setErr := s.db.SetTopic(
+	if setErr := s.DB.SetTopic(
 		ctx, channel, topic,
 	); setErr != nil {
 		return fmt.Errorf("set topic: %w", setErr)
 	}
 
-	_ = s.db.SetTopicMeta(ctx, channel, topic, nick)
+	_ = s.DB.SetTopicMeta(ctx, channel, topic, nick)
 
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
+	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	body, _ := json.Marshal([]string{topic}) //nolint:errchkjson
 
 	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
@@ -404,7 +387,7 @@ func (s *Service) KickUser(
 	sessionID int64,
 	nick, channel, targetNick, reason string,
 ) error {
-	chID, err := s.db.GetChannelByName(ctx, channel)
+	chID, err := s.DB.GetChannelByName(ctx, channel)
 	if err != nil {
 		return &IRCError{
 			irc.ErrNoSuchChannel,
@@ -413,7 +396,7 @@ func (s *Service) KickUser(
 		}
 	}
 
-	isOp, _ := s.db.IsChannelOperator(
+	isOp, _ := s.DB.IsChannelOperator(
 		ctx, chID, sessionID,
 	)
 	if !isOp {
@@ -424,7 +407,7 @@ func (s *Service) KickUser(
 		}
 	}
 
-	targetSID, err := s.db.GetSessionByNick(
+	targetSID, err := s.DB.GetSessionByNick(
 		ctx, targetNick,
 	)
 	if err != nil {
@@ -435,7 +418,7 @@ func (s *Service) KickUser(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, targetSID,
 	)
 	if !isMember {
@@ -446,7 +429,7 @@ func (s *Service) KickUser(
 		}
 	}
 
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
+	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	body, _ := json.Marshal([]string{reason}) //nolint:errchkjson
 	params, _ := json.Marshal(                //nolint:errchkjson
 		[]string{targetNick},
@@ -457,8 +440,8 @@ func (s *Service) KickUser(
 		params, body, nil, memberIDs,
 	)
 
-	s.db.PartChannel(ctx, chID, targetSID) //nolint:errcheck,gosec
-	s.db.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
+	s.DB.PartChannel(ctx, chID, targetSID) //nolint:errcheck,gosec
+	s.DB.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
 
 	return nil
 }
@@ -470,7 +453,7 @@ func (s *Service) ChangeNick(
 	sessionID int64,
 	oldNick, newNick string,
 ) error {
-	err := s.db.ChangeNick(ctx, sessionID, newNick)
+	err := s.DB.ChangeNick(ctx, sessionID, newNick)
 	if err != nil {
 		if strings.Contains(err.Error(), "UNIQUE") ||
 			db.IsUniqueConstraintError(err) {
@@ -502,7 +485,7 @@ func (s *Service) BroadcastQuit(
 	sessionID int64,
 	nick, reason string,
 ) {
-	channels, err := s.db.GetSessionChannels(
+	channels, err := s.DB.GetSessionChannels(
 		ctx, sessionID,
 	)
 	if err != nil {
@@ -512,7 +495,7 @@ func (s *Service) BroadcastQuit(
 	notified := make(map[int64]bool)
 
 	for _, ch := range channels {
-		memberIDs, memErr := s.db.GetChannelMemberIDs(
+		memberIDs, memErr := s.DB.GetChannelMemberIDs(
 			ctx, ch.ID,
 		)
 		if memErr != nil {
@@ -543,11 +526,11 @@ func (s *Service) BroadcastQuit(
 	}
 
 	for _, ch := range channels {
-		s.db.PartChannel(ctx, ch.ID, sessionID) //nolint:errcheck,gosec
-		s.db.DeleteChannelIfEmpty(ctx, ch.ID)   //nolint:errcheck,gosec
+		s.DB.PartChannel(ctx, ch.ID, sessionID) //nolint:errcheck,gosec
+		s.DB.DeleteChannelIfEmpty(ctx, ch.ID)   //nolint:errcheck,gosec
 	}
 
-	s.db.DeleteSession(ctx, sessionID) //nolint:errcheck,gosec
+	s.DB.DeleteSession(ctx, sessionID) //nolint:errcheck,gosec
 }
 
 // SetAway sets or clears the away message. Returns true
@@ -557,7 +540,7 @@ func (s *Service) SetAway(
 	sessionID int64,
 	message string,
 ) (bool, error) {
-	err := s.db.SetAway(ctx, sessionID, message)
+	err := s.DB.SetAway(ctx, sessionID, message)
 	if err != nil {
 		return false, fmt.Errorf("set away: %w", err)
 	}
@@ -572,8 +555,8 @@ func (s *Service) Oper(
 	sessionID int64,
 	name, password string,
 ) error {
-	cfgName := s.config.OperName
-	cfgPassword := s.config.OperPassword
+	cfgName := s.Config.OperName
+	cfgPassword := s.Config.OperPassword
 
 	// Use constant-time comparison and return the same
 	// error for all failures to prevent information
@@ -592,7 +575,7 @@ func (s *Service) Oper(
 		}
 	}
 
-	_ = s.db.SetSessionOper(ctx, sessionID, true)
+	_ = s.DB.SetSessionOper(ctx, sessionID, true)
 
 	return nil
 }
@@ -604,7 +587,7 @@ func (s *Service) ValidateChannelOp(
 	sessionID int64,
 	channel string,
 ) (int64, error) {
-	chID, err := s.db.GetChannelByName(ctx, channel)
+	chID, err := s.DB.GetChannelByName(ctx, channel)
 	if err != nil {
 		return 0, &IRCError{
 			irc.ErrNoSuchChannel,
@@ -613,7 +596,7 @@ func (s *Service) ValidateChannelOp(
 		}
 	}
 
-	isOp, _ := s.db.IsChannelOperator(
+	isOp, _ := s.DB.IsChannelOperator(
 		ctx, chID, sessionID,
 	)
 	if !isOp {
@@ -636,7 +619,7 @@ func (s *Service) ApplyMemberMode(
 	mode rune,
 	adding bool,
 ) error {
-	targetSID, err := s.db.GetSessionByNick(
+	targetSID, err := s.DB.GetSessionByNick(
 		ctx, targetNick,
 	)
 	if err != nil {
@@ -647,7 +630,7 @@ func (s *Service) ApplyMemberMode(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, targetSID,
 	)
 	if !isMember {
@@ -660,11 +643,11 @@ func (s *Service) ApplyMemberMode(
 
 	switch mode {
 	case 'o':
-		_ = s.db.SetChannelMemberOperator(
+		_ = s.DB.SetChannelMemberOperator(
 			ctx, chID, targetSID, adding,
 		)
 	case 'v':
-		_ = s.db.SetChannelMemberVoiced(
+		_ = s.DB.SetChannelMemberVoiced(
 			ctx, chID, targetSID, adding,
 		)
 	}
@@ -672,8 +655,7 @@ func (s *Service) ApplyMemberMode(
 	return nil
 }
 
-// SetChannelFlag applies a simple boolean channel mode
-// (+m/-m, +t/-t, +i/-i, +s/-s, +n/-n).
+// SetChannelFlag applies +m/-m or +t/-t on a channel.
 func (s *Service) SetChannelFlag(
 	ctx context.Context,
 	chID int64,
@@ -682,37 +664,29 @@ func (s *Service) SetChannelFlag(
 ) error {
 	switch flag {
 	case 'm':
-		if err := s.db.SetChannelModerated(
+		if err := s.DB.SetChannelModerated(
 			ctx, chID, setting,
 		); err != nil {
 			return fmt.Errorf("set moderated: %w", err)
 		}
 	case 't':
-		if err := s.db.SetChannelTopicLocked(
+		if err := s.DB.SetChannelTopicLocked(
 			ctx, chID, setting,
 		); err != nil {
 			return fmt.Errorf("set topic locked: %w", err)
 		}
 	case 'i':
-		if err := s.db.SetChannelInviteOnly(
+		if err := s.DB.SetChannelInviteOnly(
 			ctx, chID, setting,
 		); err != nil {
 			return fmt.Errorf("set invite only: %w", err)
 		}
 	case 's':
-		if err := s.db.SetChannelSecret(
+		if err := s.DB.SetChannelSecret(
 			ctx, chID, setting,
 		); err != nil {
 			return fmt.Errorf("set secret: %w", err)
 		}
-	case 'n':
-		if err := s.db.SetChannelNoExternal(
-			ctx, chID, setting,
-		); err != nil {
-			return fmt.Errorf(
-				"set no external: %w", err,
-			)
-		}
 	}
 
 	return nil
@@ -726,7 +700,7 @@ func (s *Service) BroadcastMode(
 	chID int64,
 	modeText string,
 ) {
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
+	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	body, _ := json.Marshal([]string{modeText}) //nolint:errchkjson
 
 	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
@@ -735,60 +709,24 @@ func (s *Service) BroadcastMode(
 	)
 }
 
-// QueryChannelMode returns the complete channel mode
-// string including all flags and parameterized modes.
+// QueryChannelMode returns the channel mode string.
 func (s *Service) QueryChannelMode(
 	ctx context.Context,
 	chID int64,
 ) string {
 	modes := "+"
 
-	noExternal, _ := s.db.IsChannelNoExternal(ctx, chID)
-	if noExternal {
-		modes += "n"
-	}
-
-	inviteOnly, _ := s.db.IsChannelInviteOnly(ctx, chID)
-	if inviteOnly {
-		modes += "i"
-	}
-
-	moderated, _ := s.db.IsChannelModerated(ctx, chID)
+	moderated, _ := s.DB.IsChannelModerated(ctx, chID)
 	if moderated {
 		modes += "m"
 	}
 
-	secret, _ := s.db.IsChannelSecret(ctx, chID)
-	if secret {
-		modes += "s"
-	}
-
-	topicLocked, _ := s.db.IsChannelTopicLocked(ctx, chID)
+	topicLocked, _ := s.DB.IsChannelTopicLocked(ctx, chID)
 	if topicLocked {
 		modes += "t"
 	}
 
-	var modeParams string
-
-	key, _ := s.db.GetChannelKey(ctx, chID)
-	if key != "" {
-		modes += "k"
-		modeParams += " " + key
-	}
-
-	limit, _ := s.db.GetChannelUserLimit(ctx, chID)
-	if limit > 0 {
-		modes += "l"
-		modeParams += " " + strconv.Itoa(limit)
-	}
-
-	bits, _ := s.db.GetChannelHashcashBits(ctx, chID)
-	if bits > 0 {
-		modes += "H"
-		modeParams += " " + strconv.Itoa(bits)
-	}
-
-	return modes + modeParams
+	return modes
 }
 
 // broadcastNickChange notifies channel peers of a nick
@@ -798,7 +736,7 @@ func (s *Service) broadcastNickChange(
 	sessionID int64,
 	oldNick, newNick string,
 ) {
-	channels, err := s.db.GetSessionChannels(
+	channels, err := s.DB.GetSessionChannels(
 		ctx, sessionID,
 	)
 	if err != nil {
@@ -808,7 +746,7 @@ func (s *Service) broadcastNickChange(
 	body, _ := json.Marshal([]string{newNick}) //nolint:errchkjson
 	notified := make(map[int64]bool)
 
-	dbID, _, insErr := s.db.InsertMessage(
+	dbID, _, insErr := s.DB.InsertMessage(
 		ctx, irc.CmdNick, oldNick, "",
 		nil, body, nil,
 	)
@@ -817,12 +755,12 @@ func (s *Service) broadcastNickChange(
 	}
 
 	// Notify the user themselves (for multi-client sync).
-	_ = s.db.EnqueueToSession(ctx, sessionID, dbID)
-	s.broker.Notify(sessionID)
+	_ = s.DB.EnqueueToSession(ctx, sessionID, dbID)
+	s.Broker.Notify(sessionID)
 	notified[sessionID] = true
 
 	for _, ch := range channels {
-		memberIDs, memErr := s.db.GetChannelMemberIDs(
+		memberIDs, memErr := s.DB.GetChannelMemberIDs(
 			ctx, ch.ID,
 		)
 		if memErr != nil {
@@ -836,8 +774,8 @@ func (s *Service) broadcastNickChange(
 
 			notified[mid] = true
 
-			_ = s.db.EnqueueToSession(ctx, mid, dbID)
-			s.broker.Notify(mid)
+			_ = s.DB.EnqueueToSession(ctx, mid, dbID)
+			s.Broker.Notify(mid)
 		}
 	}
 }