refactor: shared service layer, default IRC port, smaller functions

Wire up service.Service in HTTP handlers and delegate cleanupUser to svc.BroadcastQuit for consistent quit/part logic across transports. Default IRC_LISTEN_ADDR to :6667, remove unused import, fix all lint issues (dogsled, funcorder, wrapcheck, varnamelen, nolintlint). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
feat: add traditional IRC wire protocol listener on configurable port
2026-03-25 13:39:32 -07:00 · 2026-03-25 13:00:39 -07:00
10 changed files with 1043 additions and 3170 deletions
--- a/2
+++ b/2
@@ -53,7 +53,7 @@ RUN apk add --no-cache ca-certificates \
 COPY --from=builder /neoircd /usr/local/bin/neoircd

 USER neoirc
-EXPOSE 8080 6667
+EXPOSE 8080
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
    CMD wget -qO- http://localhost:8080/.well-known/healthcheck.json || exit 1
 ENTRYPOINT ["neoircd"]
--- a/README.md
+++ b/README.md
@@ -1080,8 +1080,8 @@ the server to the client (never C2S) and use 3-digit string codes in the
 | `001` | RPL_WELCOME         | After session creation | `{"command":"001","to":"alice","body":["Welcome to the network, alice"]}` |
 | `002` | RPL_YOURHOST        | After session creation | `{"command":"002","to":"alice","body":["Your host is neoirc, running version 0.1"]}` |
 | `003` | RPL_CREATED         | After session creation | `{"command":"003","to":"alice","body":["This server was created 2026-02-10"]}` |
-| `004` | RPL_MYINFO          | After session creation | `{"command":"004","to":"alice","params":["neoirc","0.1","","ikmnostl"]}` |
-| `005` | RPL_ISUPPORT        | After session creation | `{"command":"005","to":"alice","params":["CHANTYPES=#","NICKLEN=32","PREFIX=(ov)@+","CHANMODES=b,k,Hl,imnst","NETWORK=neoirc"],"body":["are supported by this server"]}` |
+| `004` | RPL_MYINFO          | After session creation | `{"command":"004","to":"alice","params":["neoirc","0.1","","mnst"]}` |
+| `005` | RPL_ISUPPORT        | After session creation | `{"command":"005","to":"alice","params":["CHANTYPES=#","NICKLEN=32","PREFIX=(ov)@+","CHANMODES=,,H,mnst","NETWORK=neoirc"],"body":["are supported by this server"]}` |
 | `221` | RPL_UMODEIS         | In response to user MODE query | `{"command":"221","to":"alice","body":["+"]}` |
 | `251` | RPL_LUSERCLIENT     | On connect or LUSERS command | `{"command":"251","to":"alice","body":["There are 5 users and 0 invisible on 1 servers"]}` |
 | `252` | RPL_LUSEROP         | On connect or LUSERS command | `{"command":"252","to":"alice","params":["0"],"body":["operator(s) online"]}` |
@@ -1129,15 +1129,12 @@ Inspired by IRC, simplified:

 | Mode | Name           | Meaning | Status |
 |------|----------------|---------|--------|
-| `+b` | Ban            | Prevents matching hostmasks from joining or sending (parameter: `nick!user@host` mask with wildcards) | **Enforced** |
-| `+i` | Invite-only    | Only invited users can join; use `INVITE nick #channel` to invite | **Enforced** |
-| `+k` | Channel key    | Requires a password to join (parameter: key string) | **Enforced** |
-| `+l` | User limit     | Maximum number of members allowed in the channel (parameter: integer) | **Enforced** |
 | `+m` | Moderated      | Only voiced (`+v`) users and operators (`+o`) can send | **Enforced** |
-| `+n` | No external    | Only channel members can send messages to the channel | **Enforced** |
-| `+s` | Secret         | Channel hidden from LIST and WHOIS for non-members | **Enforced** |
 | `+t` | Topic lock     | Only operators can change the topic (default: ON) | **Enforced** |
+| `+n` | No external    | Only channel members can send messages to the channel | **Enforced** |
 | `+H` | Hashcash       | Requires proof-of-work for PRIVMSG (parameter: bits, e.g. `+H 20`) | **Enforced** |
+| `+i` | Invite-only    | Only invited users can join | Not yet enforced |
+| `+s` | Secret         | Channel hidden from LIST response | Not yet enforced |

 **User channel modes (set per-user per-channel):**

@@ -1149,42 +1146,6 @@ Inspired by IRC, simplified:
 **Channel creator auto-op:** The first user to JOIN a channel (creating it)
 automatically receives `+o` operator status.

-**Ban system (+b):** Operators can ban users by hostmask pattern with wildcard
-matching (`*` and `?`). `MODE #channel +b` with no argument lists current bans.
-Bans prevent both joining and sending messages.
-
-```
-MODE #channel +b *!*@*.example.com   — ban all users from example.com
-MODE #channel -b *!*@*.example.com   — remove the ban
-MODE #channel +b                     — list all bans (RPL_BANLIST 367/368)
-```
-
-**Invite-only (+i):** When set, users must be invited by an operator before
-joining. The `INVITE` command records an invite that is consumed on JOIN.
-
-```
-MODE #channel +i                     — set invite-only
-INVITE nick #channel                 — invite a user (operator only on +i channels)
-```
-
-**Channel key (+k):** Requires a password to join the channel.
-
-```
-MODE #channel +k secretpass          — set a channel key
-MODE #channel -k *                   — remove the key
-JOIN #channel secretpass             — join with key
-```
-
-**User limit (+l):** Caps the number of members in the channel.
-
-```
-MODE #channel +l 50                  — set limit to 50 members
-MODE #channel -l                     — remove the limit
-```
-
-**Secret (+s):** Hides the channel from `LIST` for non-members and from
-`WHOIS` channel lists when the querier is not in the same channel.
-
 **KICK command:** Channel operators can remove users with `KICK #channel nick
 [:reason]`. The kicked user and all channel members receive the KICK message.

@@ -1193,7 +1154,7 @@ RPL_AWAY), and skips hashcash validation on +H channels (servers and services
 use NOTICE).

 **ISUPPORT:** The server advertises `PREFIX=(ov)@+` and
-`CHANMODES=b,k,Hl,imnst` in RPL_ISUPPORT (005).
+`CHANMODES=,,H,mnst` in RPL_ISUPPORT (005).

 ### Per-Channel Hashcash (Anti-Spam)

@@ -2291,15 +2252,17 @@ neoirc includes an optional traditional IRC wire protocol listener (RFC
 backward compatibility with existing IRC clients like irssi, weechat, hexchat,
 and others.

-### Configuration
+### Enabling

-The IRC listener is **enabled by default** on `:6667`. To disable it, set
-`IRC_LISTEN_ADDR` to an empty string:
+Set the `IRC_LISTEN_ADDR` environment variable to a TCP address:

 ```bash
-IRC_LISTEN_ADDR=
+IRC_LISTEN_ADDR=:6667
 ```

+When unset or empty, the IRC listener is disabled and only the HTTP/JSON API is
+available.
+
 ### Supported Commands

 | Category   | Commands                                             |
@@ -2334,13 +2297,13 @@ connected via the HTTP API can communicate in the same channels seamlessly.

 ### Docker Usage

-To expose the IRC port in Docker (the listener is enabled by default on
-`:6667`):
+To expose the IRC port in Docker:

 ```bash
 docker run -d \
  -p 8080:8080 \
  -p 6667:6667 \
+  -e IRC_LISTEN_ADDR=:6667 \
  -v neoirc-data:/var/lib/neoirc \
  neoirc
 ```
@@ -2799,7 +2762,7 @@ guess is borne by the server (bcrypt), not the client.
 - [x] **Client output queue pruning** — delete old client output queue entries per `QUEUE_MAX_AGE`
 - [x] **Message rotation** — prune messages older than `MESSAGE_MAX_AGE`
 - [x] **Channel modes** — enforce `+m` (moderated), `+t` (topic lock), `+n` (no external)
- [x] **Channel modes (tier 2)** — enforce `+i` (invite-only), `+s` (secret), `+b` (ban), `+k` (key), `+l` (limit)
+- [ ] **Channel modes (tier 2)** — enforce `+i` (invite-only), `+s` (secret), `+b` (ban), `+k` (key), `+l` (limit)
 - [x] **User channel modes** — `+o` (operator), `+v` (voice) with NAMES prefixes
 - [x] **KICK command** — operator-only channel kick with broadcast
 - [x] **MODE command** — query and set channel/user modes
--- a/internal/db/queries.go
+++ b/internal/db/queries.go
@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 	"time"

 	"git.eeqj.de/sneak/neoirc/pkg/irc"
@@ -1836,534 +1835,3 @@ func (database *Database) PruneSpentHashcash(

 	return deleted, nil
 }
-
-// --- Tier 2: Ban system (+b) ---
-
-// BanInfo represents a channel ban entry.
-type BanInfo struct {
-	Mask      string
-	SetBy     string
-	CreatedAt time.Time
-}
-
-// AddChannelBan inserts a ban mask for a channel.
-func (database *Database) AddChannelBan(
-	ctx context.Context,
-	channelID int64,
-	mask, setBy string,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO channel_bans
-		 (channel_id, mask, set_by, created_at)
-		 VALUES (?, ?, ?, ?)`,
-		channelID, mask, setBy, time.Now())
-	if err != nil {
-		return fmt.Errorf("add channel ban: %w", err)
-	}
-
-	return nil
-}
-
-// RemoveChannelBan removes a ban mask from a channel.
-func (database *Database) RemoveChannelBan(
-	ctx context.Context,
-	channelID int64,
-	mask string,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`DELETE FROM channel_bans
-		 WHERE channel_id = ? AND mask = ?`,
-		channelID, mask)
-	if err != nil {
-		return fmt.Errorf("remove channel ban: %w", err)
-	}
-
-	return nil
-}
-
-// ListChannelBans returns all bans for a channel.
-//
-//nolint:dupl // different query+type vs filtered variant
-func (database *Database) ListChannelBans(
-	ctx context.Context,
-	channelID int64,
-) ([]BanInfo, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT mask, set_by, created_at
-		 FROM channel_bans
-		 WHERE channel_id = ?
-		 ORDER BY created_at ASC`,
-		channelID)
-	if err != nil {
-		return nil, fmt.Errorf("list channel bans: %w", err)
-	}
-
-	defer func() { _ = rows.Close() }()
-
-	var bans []BanInfo
-
-	for rows.Next() {
-		var ban BanInfo
-
-		if scanErr := rows.Scan(
-			&ban.Mask, &ban.SetBy, &ban.CreatedAt,
-		); scanErr != nil {
-			return nil, fmt.Errorf(
-				"scan channel ban: %w", scanErr,
-			)
-		}
-
-		bans = append(bans, ban)
-	}
-
-	if rowErr := rows.Err(); rowErr != nil {
-		return nil, fmt.Errorf(
-			"iterate channel bans: %w", rowErr,
-		)
-	}
-
-	return bans, nil
-}
-
-// IsSessionBanned checks if a session's hostmask matches
-// any ban in the channel. Returns true if banned.
-func (database *Database) IsSessionBanned(
-	ctx context.Context,
-	channelID, sessionID int64,
-) (bool, error) {
-	// Get the session's hostmask parts.
-	var nick, username, hostname string
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT nick, username, hostname
-		 FROM sessions WHERE id = ?`,
-		sessionID,
-	).Scan(&nick, &username, &hostname)
-	if err != nil {
-		return false, fmt.Errorf(
-			"get session hostmask: %w", err,
-		)
-	}
-
-	hostmask := FormatHostmask(nick, username, hostname)
-
-	// Get all ban masks for the channel.
-	bans, banErr := database.ListChannelBans(ctx, channelID)
-	if banErr != nil {
-		return false, banErr
-	}
-
-	for _, ban := range bans {
-		if MatchBanMask(ban.Mask, hostmask) {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
-// MatchBanMask checks if hostmask matches a ban pattern
-// using IRC-style wildcard matching (* and ?).
-func MatchBanMask(pattern, hostmask string) bool {
-	return wildcardMatch(
-		strings.ToLower(pattern),
-		strings.ToLower(hostmask),
-	)
-}
-
-// wildcardMatch implements simple glob-style matching
-// with * (any sequence) and ? (any single character).
-func wildcardMatch(pattern, str string) bool {
-	for len(pattern) > 0 {
-		switch pattern[0] {
-		case '*':
-			// Skip consecutive asterisks.
-			for len(pattern) > 0 && pattern[0] == '*' {
-				pattern = pattern[1:]
-			}
-
-			if len(pattern) == 0 {
-				return true
-			}
-
-			for i := 0; i <= len(str); i++ {
-				if wildcardMatch(pattern, str[i:]) {
-					return true
-				}
-			}
-
-			return false
-		case '?':
-			if len(str) == 0 {
-				return false
-			}
-
-			pattern = pattern[1:]
-			str = str[1:]
-		default:
-			if len(str) == 0 || pattern[0] != str[0] {
-				return false
-			}
-
-			pattern = pattern[1:]
-			str = str[1:]
-		}
-	}
-
-	return len(str) == 0
-}
-
-// --- Tier 2: Invite-only (+i) ---
-
-// IsChannelInviteOnly checks if a channel has +i mode.
-func (database *Database) IsChannelInviteOnly(
-	ctx context.Context,
-	channelID int64,
-) (bool, error) {
-	var isInviteOnly int
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT is_invite_only FROM channels
-		 WHERE id = ?`,
-		channelID,
-	).Scan(&isInviteOnly)
-	if err != nil {
-		return false, fmt.Errorf(
-			"check invite only: %w", err,
-		)
-	}
-
-	return isInviteOnly != 0, nil
-}
-
-// SetChannelInviteOnly sets or unsets +i mode.
-func (database *Database) SetChannelInviteOnly(
-	ctx context.Context,
-	channelID int64,
-	inviteOnly bool,
-) error {
-	val := 0
-	if inviteOnly {
-		val = 1
-	}
-
-	_, err := database.conn.ExecContext(ctx,
-		`UPDATE channels
-		 SET is_invite_only = ?, updated_at = ?
-		 WHERE id = ?`,
-		val, time.Now(), channelID)
-	if err != nil {
-		return fmt.Errorf(
-			"set invite only: %w", err,
-		)
-	}
-
-	return nil
-}
-
-// AddChannelInvite records that a session has been
-// invited to a channel.
-func (database *Database) AddChannelInvite(
-	ctx context.Context,
-	channelID, sessionID int64,
-	invitedBy string,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO channel_invites
-		 (channel_id, session_id, invited_by, created_at)
-		 VALUES (?, ?, ?, ?)`,
-		channelID, sessionID, invitedBy, time.Now())
-	if err != nil {
-		return fmt.Errorf("add channel invite: %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
-}
-
-// ClearChannelInvite removes a session's invite to a
-// channel (called after successful JOIN).
-func (database *Database) ClearChannelInvite(
-	ctx context.Context,
-	channelID, sessionID int64,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`DELETE FROM channel_invites
-		 WHERE channel_id = ? AND session_id = ?`,
-		channelID, sessionID)
-	if err != nil {
-		return fmt.Errorf("clear invite: %w", err)
-	}
-
-	return nil
-}
-
-// --- Tier 2: Secret (+s) ---
-
-// IsChannelSecret checks if a channel has +s mode.
-func (database *Database) IsChannelSecret(
-	ctx context.Context,
-	channelID int64,
-) (bool, error) {
-	var isSecret int
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT is_secret FROM channels
-		 WHERE id = ?`,
-		channelID,
-	).Scan(&isSecret)
-	if err != nil {
-		return false, fmt.Errorf(
-			"check secret: %w", err,
-		)
-	}
-
-	return isSecret != 0, nil
-}
-
-// SetChannelSecret sets or unsets +s mode.
-func (database *Database) SetChannelSecret(
-	ctx context.Context,
-	channelID int64,
-	secret bool,
-) error {
-	val := 0
-	if secret {
-		val = 1
-	}
-
-	_, err := database.conn.ExecContext(ctx,
-		`UPDATE channels
-		 SET is_secret = ?, updated_at = ?
-		 WHERE id = ?`,
-		val, time.Now(), channelID)
-	if err != nil {
-		return fmt.Errorf("set secret: %w", err)
-	}
-
-	return nil
-}
-
-// ListAllChannelsWithCountsFiltered returns all channels
-// with member counts, excluding secret channels that
-// the given session is not a member of.
-//
-//nolint:dupl // different query+type vs ListChannelBans
-func (database *Database) ListAllChannelsWithCountsFiltered(
-	ctx context.Context,
-	sessionID int64,
-) ([]ChannelInfoFull, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT c.name, COUNT(cm.id) AS member_count,
-		        c.topic
-		 FROM channels c
-		 LEFT JOIN channel_members cm
-		   ON cm.channel_id = c.id
-		 WHERE c.is_secret = 0
-		    OR c.id IN (
-		       SELECT channel_id FROM channel_members
-		       WHERE session_id = ?
-		    )
-		 GROUP BY c.id
-		 ORDER BY c.name ASC`,
-		sessionID)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"list channels filtered: %w", err,
-		)
-	}
-
-	defer func() { _ = rows.Close() }()
-
-	var channels []ChannelInfoFull
-
-	for rows.Next() {
-		var chanInfo ChannelInfoFull
-
-		if scanErr := rows.Scan(
-			&chanInfo.Name,
-			&chanInfo.MemberCount,
-			&chanInfo.Topic,
-		); scanErr != nil {
-			return nil, fmt.Errorf(
-				"scan channel: %w", scanErr,
-			)
-		}
-
-		channels = append(channels, chanInfo)
-	}
-
-	if rowErr := rows.Err(); rowErr != nil {
-		return nil, fmt.Errorf(
-			"iterate channels: %w", rowErr,
-		)
-	}
-
-	return channels, nil
-}
-
-// GetSessionChannelsFiltered returns channels a session
-// belongs to, optionally excluding secret channels for
-// WHOIS (when the querier is not in the same channel).
-// If querierID == targetID, returns all channels.
-func (database *Database) GetSessionChannelsFiltered(
-	ctx context.Context,
-	targetSID, querierSID int64,
-) ([]ChannelInfo, error) {
-	// If querying yourself, return all channels.
-	if targetSID == querierSID {
-		return database.GetSessionChannels(ctx, targetSID)
-	}
-
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT c.id, c.name, c.topic
-		 FROM channels c
-		 JOIN channel_members cm
-		   ON cm.channel_id = c.id
-		 WHERE cm.session_id = ?
-		   AND (c.is_secret = 0
-		        OR c.id IN (
-		           SELECT channel_id FROM channel_members
-		           WHERE session_id = ?
-		        ))
-		 ORDER BY c.name ASC`,
-		targetSID, querierSID)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"get session channels filtered: %w", err,
-		)
-	}
-
-	defer func() { _ = rows.Close() }()
-
-	var channels []ChannelInfo
-
-	for rows.Next() {
-		var chanInfo ChannelInfo
-
-		if scanErr := rows.Scan(
-			&chanInfo.ID,
-			&chanInfo.Name,
-			&chanInfo.Topic,
-		); scanErr != nil {
-			return nil, fmt.Errorf(
-				"scan channel: %w", scanErr,
-			)
-		}
-
-		channels = append(channels, chanInfo)
-	}
-
-	if rowErr := rows.Err(); rowErr != nil {
-		return nil, fmt.Errorf(
-			"iterate channels: %w", rowErr,
-		)
-	}
-
-	return channels, nil
-}
-
-// --- Tier 2: Channel Key (+k) ---
-
-// GetChannelKey returns the key for a channel (empty
-// string means no key set).
-func (database *Database) GetChannelKey(
-	ctx context.Context,
-	channelID int64,
-) (string, error) {
-	var key string
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT channel_key FROM channels
-		 WHERE id = ?`,
-		channelID,
-	).Scan(&key)
-	if err != nil {
-		return "", fmt.Errorf("get channel key: %w", err)
-	}
-
-	return key, nil
-}
-
-// SetChannelKey sets or clears the key for a channel.
-func (database *Database) SetChannelKey(
-	ctx context.Context,
-	channelID int64,
-	key string,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`UPDATE channels
-		 SET channel_key = ?, updated_at = ?
-		 WHERE id = ?`,
-		key, time.Now(), channelID)
-	if err != nil {
-		return fmt.Errorf("set channel key: %w", err)
-	}
-
-	return nil
-}
-
-// --- Tier 2: User Limit (+l) ---
-
-// GetChannelUserLimit returns the user limit for a
-// channel (0 means no limit).
-func (database *Database) GetChannelUserLimit(
-	ctx context.Context,
-	channelID int64,
-) (int, error) {
-	var limit int
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT user_limit FROM channels
-		 WHERE id = ?`,
-		channelID,
-	).Scan(&limit)
-	if err != nil {
-		return 0, fmt.Errorf(
-			"get channel user limit: %w", err,
-		)
-	}
-
-	return limit, nil
-}
-
-// SetChannelUserLimit sets the user limit for a channel.
-func (database *Database) SetChannelUserLimit(
-	ctx context.Context,
-	channelID int64,
-	limit int,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`UPDATE channels
-		 SET user_limit = ?, updated_at = ?
-		 WHERE id = ?`,
-		limit, time.Now(), channelID)
-	if err != nil {
-		return fmt.Errorf(
-			"set channel user limit: %w", err,
-		)
-	}
-
-	return nil
-}
--- a/internal/db/queries_test.go
+++ b/internal/db/queries_test.go
@@ -1017,474 +1017,3 @@ func TestGetOperCount(t *testing.T) {
 		t.Fatalf("expected 1 oper, got %d", count)
 	}
 }
-
-// --- Tier 2 Tests ---
-
-func TestWildcardMatch(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		pattern string
-		input   string
-		match   bool
-	}{
-		{"*!*@*", "nick!user@host", true},
-		{"*!*@*.example.com", "nick!user@foo.example.com", true},
-		{"*!*@*.example.com", "nick!user@other.net", false},
-		{"badnick!*@*", "badnick!user@host", true},
-		{"badnick!*@*", "goodnick!user@host", false},
-		{"nick!user@host", "nick!user@host", true},
-		{"nick!user@host", "nick!user@other", false},
-		{"*", "anything", true},
-		{"?ick!*@*", "nick!user@host", true},
-		{"?ick!*@*", "nn!user@host", false},
-		// Case-insensitive.
-		{"Nick!*@*", "nick!user@host", true},
-	}
-
-	for _, tc := range tests {
-		result := db.MatchBanMask(tc.pattern, tc.input)
-		if result != tc.match {
-			t.Errorf(
-				"MatchBanMask(%q, %q) = %v, want %v",
-				tc.pattern, tc.input, result, tc.match,
-			)
-		}
-	}
-}
-
-func TestChannelBanCRUD(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	chID, err := database.GetOrCreateChannel(ctx, "#test")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// No bans initially.
-	bans, err := database.ListChannelBans(ctx, chID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(bans) != 0 {
-		t.Fatalf("expected 0 bans, got %d", len(bans))
-	}
-
-	// Add a ban.
-	err = database.AddChannelBan(
-		ctx, chID, "*!*@evil.com", "op",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	bans, err = database.ListChannelBans(ctx, chID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(bans) != 1 {
-		t.Fatalf("expected 1 ban, got %d", len(bans))
-	}
-
-	if bans[0].Mask != "*!*@evil.com" {
-		t.Fatalf("wrong mask: %s", bans[0].Mask)
-	}
-
-	// Duplicate add is ignored (OR IGNORE).
-	err = database.AddChannelBan(
-		ctx, chID, "*!*@evil.com", "op2",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	bans, _ = database.ListChannelBans(ctx, chID)
-	if len(bans) != 1 {
-		t.Fatalf("expected 1 ban after dup, got %d", len(bans))
-	}
-
-	// Remove ban.
-	err = database.RemoveChannelBan(
-		ctx, chID, "*!*@evil.com",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	bans, _ = database.ListChannelBans(ctx, chID)
-	if len(bans) != 0 {
-		t.Fatalf("expected 0 bans after remove, got %d", len(bans))
-	}
-}
-
-func TestIsSessionBanned(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid, _, _, err := database.CreateSession(
-		ctx, "victim", "victim", "evil.com", "",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	chID, err := database.GetOrCreateChannel(ctx, "#bantest")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Not banned initially.
-	banned, err := database.IsSessionBanned(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if banned {
-		t.Fatal("should not be banned initially")
-	}
-
-	// Add ban matching the hostmask.
-	err = database.AddChannelBan(
-		ctx, chID, "*!*@evil.com", "op",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	banned, err = database.IsSessionBanned(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !banned {
-		t.Fatal("should be banned")
-	}
-}
-
-func TestChannelInviteOnly(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	chID, err := database.GetOrCreateChannel(ctx, "#invite")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Default: not invite-only.
-	isIO, err := database.IsChannelInviteOnly(ctx, chID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if isIO {
-		t.Fatal("should not be invite-only by default")
-	}
-
-	// Set invite-only.
-	err = database.SetChannelInviteOnly(ctx, chID, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	isIO, _ = database.IsChannelInviteOnly(ctx, chID)
-	if !isIO {
-		t.Fatal("should be invite-only")
-	}
-
-	// Unset.
-	err = database.SetChannelInviteOnly(ctx, chID, false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	isIO, _ = database.IsChannelInviteOnly(ctx, chID)
-	if isIO {
-		t.Fatal("should not be invite-only")
-	}
-}
-
-func TestChannelInviteCRUD(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid, _, _, err := database.CreateSession(
-		ctx, "invited", "", "", "",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	chID, err := database.GetOrCreateChannel(ctx, "#inv")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// No invite initially.
-	has, err := database.HasChannelInvite(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if has {
-		t.Fatal("should not have invite")
-	}
-
-	// Add invite.
-	err = database.AddChannelInvite(ctx, chID, sid, "op")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	has, _ = database.HasChannelInvite(ctx, chID, sid)
-	if !has {
-		t.Fatal("should have invite")
-	}
-
-	// Clear invite.
-	err = database.ClearChannelInvite(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	has, _ = database.HasChannelInvite(ctx, chID, sid)
-	if has {
-		t.Fatal("invite should be cleared")
-	}
-}
-
-func TestChannelSecret(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	chID, err := database.GetOrCreateChannel(ctx, "#secret")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Default: not secret.
-	isSec, err := database.IsChannelSecret(ctx, chID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if isSec {
-		t.Fatal("should not be secret by default")
-	}
-
-	err = database.SetChannelSecret(ctx, chID, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	isSec, _ = database.IsChannelSecret(ctx, chID)
-	if !isSec {
-		t.Fatal("should be secret")
-	}
-}
-
-// createTestSession is a helper to create a session and
-// return only the session ID.
-func createTestSession(
-	t *testing.T,
-	database *db.Database,
-	nick string,
-) int64 {
-	t.Helper()
-
-	sid, _, _, err := database.CreateSession(
-		t.Context(), nick, "", "", "",
-	)
-	if err != nil {
-		t.Fatalf("create session %s: %v", nick, err)
-	}
-
-	return sid
-}
-
-func TestSecretChannelFiltering(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	// Create two sessions.
-	sid1 := createTestSession(t, database, "member")
-	sid2 := createTestSession(t, database, "outsider")
-
-	// Create a secret channel.
-	chID, _ := database.GetOrCreateChannel(ctx, "#secret")
-	_ = database.SetChannelSecret(ctx, chID, true)
-	_ = database.JoinChannel(ctx, chID, sid1)
-
-	// Create a non-secret channel.
-	chID2, _ := database.GetOrCreateChannel(ctx, "#public")
-	_ = database.JoinChannel(ctx, chID2, sid1)
-
-	// Member should see both.
-	list, err := database.ListAllChannelsWithCountsFiltered(
-		ctx, sid1,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(list) != 2 {
-		t.Fatalf("member should see 2 channels, got %d", len(list))
-	}
-
-	// Outsider should only see public.
-	list, _ = database.ListAllChannelsWithCountsFiltered(
-		ctx, sid2,
-	)
-	if len(list) != 1 {
-		t.Fatalf("outsider should see 1 channel, got %d", len(list))
-	}
-
-	if list[0].Name != "#public" {
-		t.Fatalf("outsider should see #public, got %s", list[0].Name)
-	}
-}
-
-func TestWhoisChannelFiltering(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid1 := createTestSession(t, database, "target")
-	sid2 := createTestSession(t, database, "querier")
-
-	// Create secret channel, target joins it.
-	chID, _ := database.GetOrCreateChannel(ctx, "#hidden")
-	_ = database.SetChannelSecret(ctx, chID, true)
-	_ = database.JoinChannel(ctx, chID, sid1)
-
-	// Querier (non-member) should not see the channel.
-	channels, err := database.GetSessionChannelsFiltered(
-		ctx, sid1, sid2,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(channels) != 0 {
-		t.Fatalf(
-			"querier should see 0 channels, got %d",
-			len(channels),
-		)
-	}
-
-	// Target querying self should see it.
-	channels, _ = database.GetSessionChannelsFiltered(
-		ctx, sid1, sid1,
-	)
-	if len(channels) != 1 {
-		t.Fatalf(
-			"self-query should see 1 channel, got %d",
-			len(channels),
-		)
-	}
-}
-
-//nolint:dupl // structurally similar to TestChannelUserLimit
-func TestChannelKey(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	chID, err := database.GetOrCreateChannel(ctx, "#keyed")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Default: no key.
-	key, err := database.GetChannelKey(ctx, chID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if key != "" {
-		t.Fatalf("expected empty key, got %q", key)
-	}
-
-	// Set key.
-	err = database.SetChannelKey(ctx, chID, "secret123")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	key, _ = database.GetChannelKey(ctx, chID)
-	if key != "secret123" {
-		t.Fatalf("expected secret123, got %q", key)
-	}
-
-	// Clear key.
-	err = database.SetChannelKey(ctx, chID, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	key, _ = database.GetChannelKey(ctx, chID)
-	if key != "" {
-		t.Fatalf("expected empty key, got %q", key)
-	}
-}
-
-//nolint:dupl // structurally similar to TestChannelKey
-func TestChannelUserLimit(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	chID, err := database.GetOrCreateChannel(ctx, "#limited")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Default: no limit.
-	limit, err := database.GetChannelUserLimit(ctx, chID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if limit != 0 {
-		t.Fatalf("expected 0 limit, got %d", limit)
-	}
-
-	// Set limit.
-	err = database.SetChannelUserLimit(ctx, chID, 50)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	limit, _ = database.GetChannelUserLimit(ctx, chID)
-	if limit != 50 {
-		t.Fatalf("expected 50, got %d", limit)
-	}
-
-	// Clear limit.
-	err = database.SetChannelUserLimit(ctx, chID, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	limit, _ = database.GetChannelUserLimit(ctx, chID)
-	if limit != 0 {
-		t.Fatalf("expected 0, got %d", limit)
-	}
-}
--- a/internal/db/schema/001_initial.sql
+++ b/internal/db/schema/001_initial.sql
@@ -42,36 +42,10 @@ CREATE TABLE IF NOT EXISTS channels (
    hashcash_bits INTEGER NOT NULL DEFAULT 0,
    is_moderated INTEGER NOT NULL DEFAULT 0,
    is_topic_locked INTEGER NOT NULL DEFAULT 1,
-    is_invite_only INTEGER NOT NULL DEFAULT 0,
-    is_secret INTEGER NOT NULL DEFAULT 0,
-    channel_key TEXT NOT NULL DEFAULT '',
-    user_limit INTEGER NOT NULL DEFAULT 0,
    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );

-- Channel bans
-CREATE TABLE IF NOT EXISTS channel_bans (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    channel_id INTEGER NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
-    mask TEXT NOT NULL,
-    set_by TEXT NOT NULL,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE(channel_id, mask)
-);
-CREATE INDEX IF NOT EXISTS idx_channel_bans_channel ON channel_bans(channel_id);
-
-- Channel invites (in-memory would be simpler but DB survives restarts)
-CREATE TABLE IF NOT EXISTS channel_invites (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    channel_id INTEGER NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
-    session_id INTEGER NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
-    invited_by TEXT NOT NULL DEFAULT '',
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE(channel_id, session_id)
-);
-CREATE INDEX IF NOT EXISTS idx_channel_invites_channel ON channel_invites(channel_id);
-
 -- Channel members
 CREATE TABLE IF NOT EXISTS channel_members (
    id INTEGER PRIMARY KEY AUTOINCREMENT,
--- a/internal/handlers/api.go
+++ b/internal/handlers/api.go
--- a/internal/handlers/api_test.go
+++ b/internal/handlers/api_test.go
@@ -28,7 +28,6 @@ import (
 	"git.eeqj.de/sneak/neoirc/internal/logger"
 	"git.eeqj.de/sneak/neoirc/internal/middleware"
 	"git.eeqj.de/sneak/neoirc/internal/server"
-	"git.eeqj.de/sneak/neoirc/internal/service"
 	"git.eeqj.de/sneak/neoirc/internal/stats"
 	"go.uber.org/fx"
 	"go.uber.org/fx/fxtest"
@@ -208,14 +207,6 @@ func newTestHandlers(
 	hcheck *healthcheck.Healthcheck,
 	tracker *stats.Tracker,
 ) (*handlers.Handlers, error) {
-	brk := broker.New()
-	svc := service.New(service.Params{ //nolint:exhaustruct
-		Logger:   log,
-		Config:   cfg,
-		Database: database,
-		Broker:   brk,
-	})
-
 	hdlr, err := handlers.New(lifecycle, handlers.Params{ //nolint:exhaustruct
 		Logger:      log,
 		Globals:     globs,
@@ -223,8 +214,7 @@ func newTestHandlers(
 		Database:    database,
 		Healthcheck: hcheck,
 		Stats:       tracker,
-		Broker:      brk,
-		Service:     svc,
+		Broker:      broker.New(),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("test handlers: %w", err)
@@ -4390,486 +4380,3 @@ func TestKickDefaultReason(t *testing.T) {
 		)
 	}
 }
-
-// --- Tier 2 Handler Tests ---
-
-const (
-	inviteCmd    = "INVITE"
-	joinedStatus = "joined"
-)
-
-// TestBanAddRemoveList verifies +b add, list, and -b
-// remove via MODE commands.
-func TestBanAddRemoveList(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("banop")
-
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#bans",
-	})
-
-	// Add a ban.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#bans",
-		bodyKey:    []string{"+b", "*!*@evil.com"},
-	})
-
-	_, lastID := tserver.pollMessages(opToken, 0)
-
-	// List bans (+b with no argument).
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#bans",
-		bodyKey:    []string{"+b"},
-	})
-
-	msgs, _ := tserver.pollMessages(opToken, lastID)
-
-	// Should have RPL_BANLIST (367).
-	banMsg := findNumericWithParams(msgs, "367")
-	if banMsg == nil {
-		t.Fatalf("expected 367 RPL_BANLIST, got %v", msgs)
-	}
-
-	// Should have RPL_ENDOFBANLIST (368).
-	if !findNumeric(msgs, "368") {
-		t.Fatal("expected 368 RPL_ENDOFBANLIST")
-	}
-
-	// Remove the ban.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#bans",
-		bodyKey:    []string{"-b", "*!*@evil.com"},
-	})
-
-	_, lastID = tserver.pollMessages(opToken, lastID)
-
-	// List again — should be empty (just end-of-list).
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#bans",
-		bodyKey:    []string{"+b"},
-	})
-
-	msgs, _ = tserver.pollMessages(opToken, lastID)
-	banMsg = findNumericWithParams(msgs, "367")
-	if banMsg != nil {
-		t.Fatal("expected no 367 after ban removal")
-	}
-
-	if !findNumeric(msgs, "368") {
-		t.Fatal("expected 368 RPL_ENDOFBANLIST")
-	}
-}
-
-// TestBanBlocksJoin verifies that a banned user cannot
-// join a channel.
-func TestBanBlocksJoin(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("banop2")
-	userToken := tserver.createSession("banned2")
-
-	// Op creates channel and sets a ban.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#banjoin",
-	})
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#banjoin",
-		bodyKey:    []string{"+b", "banned2!*@*"},
-	})
-
-	// Banned user tries to join.
-	_, lastID := tserver.pollMessages(userToken, 0)
-	tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd, toKey: "#banjoin",
-	})
-
-	msgs, _ := tserver.pollMessages(userToken, lastID)
-
-	// Should get ERR_BANNEDFROMCHAN (474).
-	if !findNumeric(msgs, "474") {
-		t.Fatalf("expected 474 ERR_BANNEDFROMCHAN, got %v", msgs)
-	}
-}
-
-// TestBanBlocksPrivmsg verifies that a banned user who
-// is already in a channel cannot send messages.
-func TestBanBlocksPrivmsg(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("banmsgop")
-	userToken := tserver.createSession("banmsgusr")
-
-	// Both join.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#banmsg",
-	})
-	tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd, toKey: "#banmsg",
-	})
-
-	// Op bans the user.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#banmsg",
-		bodyKey:    []string{"+b", "banmsgusr!*@*"},
-	})
-
-	// User tries to send a message.
-	_, lastID := tserver.pollMessages(userToken, 0)
-	tserver.sendCommand(userToken, map[string]any{
-		commandKey: privmsgCmd,
-		toKey:      "#banmsg",
-		bodyKey:    []string{"hello"},
-	})
-
-	msgs, _ := tserver.pollMessages(userToken, lastID)
-
-	// Should get ERR_CANNOTSENDTOCHAN (404).
-	if !findNumeric(msgs, "404") {
-		t.Fatalf("expected 404 ERR_CANNOTSENDTOCHAN, got %v", msgs)
-	}
-}
-
-// TestInviteOnlyJoin verifies +i behavior: join rejected
-// without invite, accepted with invite.
-func TestInviteOnlyJoin(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("invop")
-	userToken := tserver.createSession("invusr")
-
-	// Op creates channel and sets +i.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#invonly",
-	})
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#invonly",
-		bodyKey:    []string{"+i"},
-	})
-
-	// User tries to join without invite.
-	_, lastID := tserver.pollMessages(userToken, 0)
-	tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd, toKey: "#invonly",
-	})
-
-	msgs, _ := tserver.pollMessages(userToken, lastID)
-
-	if !findNumeric(msgs, "473") {
-		t.Fatalf(
-			"expected 473 ERR_INVITEONLYCHAN, got %v",
-			msgs,
-		)
-	}
-
-	// Op invites user.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: inviteCmd,
-		bodyKey:    []string{"invusr", "#invonly"},
-	})
-
-	// User tries again — should succeed with invite.
-	_, result := tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd, toKey: "#invonly",
-	})
-
-	if result[statusKey] != joinedStatus {
-		t.Fatalf(
-			"expected join to succeed with invite, got %v",
-			result,
-		)
-	}
-}
-
-// TestSecretChannelHiddenFromList verifies +s hides a
-// channel from LIST for non-members.
-func TestSecretChannelHiddenFromList(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("secop")
-	outsiderToken := tserver.createSession("secout")
-
-	// Op creates secret channel.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#secret",
-	})
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#secret",
-		bodyKey:    []string{"+s"},
-	})
-
-	// Outsider does LIST.
-	_, lastID := tserver.pollMessages(outsiderToken, 0)
-	tserver.sendCommand(outsiderToken, map[string]any{
-		commandKey: "LIST",
-	})
-
-	msgs, _ := tserver.pollMessages(outsiderToken, lastID)
-
-	// Should NOT see #secret in any 322 (RPL_LIST).
-	for _, msg := range msgs {
-		code, ok := msg["code"].(float64)
-		if !ok || int(code) != 322 {
-			continue
-		}
-
-		params := getNumericParams(msg)
-		for _, p := range params {
-			if p == "#secret" {
-				t.Fatal("outsider should not see #secret in LIST")
-			}
-		}
-	}
-
-	// Member does LIST — should see it.
-	_, lastID = tserver.pollMessages(opToken, 0)
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: "LIST",
-	})
-
-	msgs, _ = tserver.pollMessages(opToken, lastID)
-
-	found := false
-
-	for _, msg := range msgs {
-		code, ok := msg["code"].(float64)
-		if !ok || int(code) != 322 {
-			continue
-		}
-
-		params := getNumericParams(msg)
-		for _, p := range params {
-			if p == "#secret" {
-				found = true
-			}
-		}
-	}
-
-	if !found {
-		t.Fatal("member should see #secret in LIST")
-	}
-}
-
-// TestChannelKeyJoin verifies +k behavior: wrong/missing
-// key is rejected, correct key allows join.
-func TestChannelKeyJoin(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("keyop")
-	userToken := tserver.createSession("keyusr")
-
-	// Op creates keyed channel.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#keyed",
-	})
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#keyed",
-		bodyKey:    []string{"+k", "mykey"},
-	})
-
-	// User tries without key.
-	_, lastID := tserver.pollMessages(userToken, 0)
-	tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd, toKey: "#keyed",
-	})
-
-	msgs, _ := tserver.pollMessages(userToken, lastID)
-
-	if !findNumeric(msgs, "475") {
-		t.Fatalf(
-			"expected 475 ERR_BADCHANNELKEY, got %v",
-			msgs,
-		)
-	}
-
-	// User tries with wrong key.
-	tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd,
-		toKey:      "#keyed",
-		bodyKey:    []string{"wrongkey"},
-	})
-
-	msgs, _ = tserver.pollMessages(userToken, lastID)
-	if !findNumeric(msgs, "475") {
-		t.Fatalf(
-			"expected 475 ERR_BADCHANNELKEY for wrong key, got %v",
-			msgs,
-		)
-	}
-
-	// User tries with correct key.
-	_, result := tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd,
-		toKey:      "#keyed",
-		bodyKey:    []string{"mykey"},
-	})
-
-	if result[statusKey] != joinedStatus {
-		t.Fatalf(
-			"expected join to succeed with correct key, got %v",
-			result,
-		)
-	}
-}
-
-// TestUserLimitEnforcement verifies +l behavior: blocks
-// join when at capacity.
-func TestUserLimitEnforcement(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("limop")
-	user1Token := tserver.createSession("limusr1")
-	user2Token := tserver.createSession("limusr2")
-
-	// Op creates channel with limit 2.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#limited",
-	})
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd,
-		toKey:      "#limited",
-		bodyKey:    []string{"+l", "2"},
-	})
-
-	// User1 joins — should succeed (2 members now: op + user1).
-	_, result := tserver.sendCommand(user1Token, map[string]any{
-		commandKey: joinCmd, toKey: "#limited",
-	})
-	if result[statusKey] != joinedStatus {
-		t.Fatalf("user1 should join, got %v", result)
-	}
-
-	// User2 tries to join — should fail (at limit: 2/2).
-	_, lastID := tserver.pollMessages(user2Token, 0)
-	tserver.sendCommand(user2Token, map[string]any{
-		commandKey: joinCmd, toKey: "#limited",
-	})
-
-	msgs, _ := tserver.pollMessages(user2Token, lastID)
-
-	if !findNumeric(msgs, "471") {
-		t.Fatalf(
-			"expected 471 ERR_CHANNELISFULL, got %v",
-			msgs,
-		)
-	}
-}
-
-// TestModeStringIncludesNewModes verifies that querying
-// channel mode returns the new modes (+i, +s, +k, +l).
-func TestModeStringIncludesNewModes(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("modestrop")
-
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#modestr",
-	})
-
-	// Set all tier 2 modes.
-	for _, modeChange := range [][]string{
-		{"+i"}, {"+s"}, {"+k", "pw"}, {"+l", "50"},
-	} {
-		tserver.sendCommand(opToken, map[string]any{
-			commandKey: modeCmd,
-			toKey:      "#modestr",
-			bodyKey:    modeChange,
-		})
-	}
-
-	_, lastID := tserver.pollMessages(opToken, 0)
-
-	// Query mode.
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: modeCmd, toKey: "#modestr",
-	})
-
-	msgs, _ := tserver.pollMessages(opToken, lastID)
-	modeMsg := findNumericWithParams(msgs, "324")
-
-	if modeMsg == nil {
-		t.Fatal("expected 324 RPL_CHANNELMODEIS")
-	}
-
-	params := getNumericParams(modeMsg)
-	if len(params) < 2 {
-		t.Fatalf("too few params in 324: %v", params)
-	}
-
-	modeString := params[1]
-
-	for _, c := range []string{"i", "s", "k", "l"} {
-		if !strings.Contains(modeString, c) {
-			t.Fatalf(
-				"mode string %q missing %q",
-				modeString, c,
-			)
-		}
-	}
-}
-
-// TestISUPPORT verifies the 005 numeric includes the
-// updated CHANMODES string.
-func TestISUPPORT(t *testing.T) {
-	tserver := newTestServer(t)
-	token := tserver.createSession("isupport")
-
-	msgs, _ := tserver.pollMessages(token, 0)
-
-	isupp := findNumericWithParams(msgs, "005")
-	if isupp == nil {
-		t.Fatal("expected 005 RPL_ISUPPORT")
-	}
-
-	body, _ := isupp["body"].(string)
-	params := getNumericParams(isupp)
-
-	combined := body + " " + strings.Join(params, " ")
-
-	if !strings.Contains(combined, "CHANMODES=b,k,Hl,imnst") {
-		t.Fatalf(
-			"ISUPPORT missing updated CHANMODES, got body=%q params=%v",
-			body, params,
-		)
-	}
-}
-
-// TestNonOpCannotSetModes verifies non-operators
-// cannot set +i, +s, +k, +l, +b.
-func TestNonOpCannotSetModes(t *testing.T) {
-	tserver := newTestServer(t)
-	opToken := tserver.createSession("modeopx")
-	userToken := tserver.createSession("modeusrx")
-
-	tserver.sendCommand(opToken, map[string]any{
-		commandKey: joinCmd, toKey: "#noperm",
-	})
-	tserver.sendCommand(userToken, map[string]any{
-		commandKey: joinCmd, toKey: "#noperm",
-	})
-
-	modes := [][]string{
-		{"+i"}, {"+s"}, {"+k", "key"}, {"+l", "10"},
-		{"+b", "bad!*@*"},
-	}
-
-	for _, modeChange := range modes {
-		_, lastID := tserver.pollMessages(userToken, 0)
-		tserver.sendCommand(userToken, map[string]any{
-			commandKey: modeCmd,
-			toKey:      "#noperm",
-			bodyKey:    modeChange,
-		})
-
-		msgs, _ := tserver.pollMessages(userToken, lastID)
-
-		// Should get 482 ERR_CHANOPRIVSNEEDED.
-		if !findNumeric(msgs, "482") {
-			t.Fatalf(
-				"expected 482 for %v, got %v",
-				modeChange, msgs,
-			)
-		}
-	}
-}
--- a/internal/ircserver/commands.go
+++ b/internal/ircserver/commands.go
@@ -118,7 +118,7 @@ func (c *Conn) handlePrivmsg(
 	body, _ := json.Marshal([]string{text}) //nolint:errchkjson

 	if strings.HasPrefix(target, "#") {
-		_, _, err := c.svc.SendChannelMessage(
+		_, err := c.svc.SendChannelMessage(
 			ctx, c.sessionID, c.nick,
 			msg.Command, target, body, nil,
 		)
@@ -179,7 +179,7 @@ func (c *Conn) joinChannel(
 	channel string,
 ) {
 	result, err := c.svc.JoinChannel(
-		ctx, c.sessionID, c.nick, channel, "",
+		ctx, c.sessionID, c.nick, channel,
 	)
 	if err != nil {
 		c.sendIRCError(err)
--- a/internal/service/service.go
+++ b/internal/service/service.go
@@ -4,7 +4,6 @@ package service

 import (
 	"context"
-	"crypto/subtle"
 	"encoding/json"
 	"fmt"
 	"log/slog"
@@ -110,19 +109,16 @@ func excludeSession(

 // SendChannelMessage validates membership and moderation,
 // then fans out a message to all channel members except
-// the sender. Returns the database row ID, message UUID,
-// and any error. The dbID lets callers enqueue the same
-// message to the sender when echo is needed (HTTP
-// transport).
+// the sender.
 func (s *Service) SendChannelMessage(
 	ctx context.Context,
 	sessionID int64,
 	nick, command, channel string,
 	body, meta json.RawMessage,
-) (int64, string, error) {
+) (string, error) {
 	chID, err := s.DB.GetChannelByName(ctx, channel)
 	if err != nil {
-		return 0, "", &IRCError{
+		return "", &IRCError{
 			irc.ErrNoSuchChannel,
 			[]string{channel},
 			"No such channel",
@@ -133,25 +129,13 @@ func (s *Service) SendChannelMessage(
 		ctx, chID, sessionID,
 	)
 	if !isMember {
-		return 0, "", &IRCError{
+		return "", &IRCError{
 			irc.ErrCannotSendToChan,
 			[]string{channel},
 			"Cannot send to channel",
 		}
 	}

-	// Ban check — banned users cannot send messages.
-	isBanned, banErr := s.DB.IsSessionBanned(
-		ctx, chID, sessionID,
-	)
-	if banErr == nil && isBanned {
-		return 0, "", &IRCError{
-			irc.ErrCannotSendToChan,
-			[]string{channel},
-			"Cannot send to channel (+b)",
-		}
-	}
-
 	moderated, _ := s.DB.IsChannelModerated(ctx, chID)
 	if moderated {
 		isOp, _ := s.DB.IsChannelOperator(
@@ -162,7 +146,7 @@ func (s *Service) SendChannelMessage(
 		)

 		if !isOp && !isVoiced {
-			return 0, "", &IRCError{
+			return "", &IRCError{
 				irc.ErrCannotSendToChan,
 				[]string{channel},
 				"Cannot send to channel (+m)",
@@ -173,15 +157,15 @@ func (s *Service) SendChannelMessage(
 	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	recipients := excludeSession(memberIDs, sessionID)

-	dbID, uuid, fanErr := s.FanOut(
+	_, uuid, fanErr := s.FanOut(
 		ctx, command, nick, channel,
 		nil, body, meta, recipients,
 	)
 	if fanErr != nil {
-		return 0, "", fanErr
+		return "", fanErr
 	}

-	return dbID, uuid, nil
+	return uuid, nil
 }

 // SendDirectMessage validates the target and sends a
@@ -226,7 +210,7 @@ func (s *Service) SendDirectMessage(
 func (s *Service) JoinChannel(
 	ctx context.Context,
 	sessionID int64,
-	nick, channel, suppliedKey string,
+	nick, channel string,
 ) (*JoinResult, error) {
 	chID, err := s.DB.GetOrCreateChannel(ctx, channel)
 	if err != nil {
@@ -238,15 +222,6 @@ func (s *Service) JoinChannel(
 	)
 	isCreator := countErr == nil && memberCount == 0

-	if !isCreator {
-		if joinErr := checkJoinRestrictions(
-			ctx, s.DB, chID, sessionID,
-			channel, suppliedKey, memberCount,
-		); joinErr != nil {
-			return nil, joinErr
-		}
-	}
-
 	if isCreator {
 		err = s.DB.JoinChannelAsOperator(
 			ctx, chID, sessionID,
@@ -259,9 +234,6 @@ func (s *Service) JoinChannel(
 		return nil, fmt.Errorf("join channel: %w", err)
 	}

-	// Clear invite after successful join.
-	_ = s.DB.ClearChannelInvite(ctx, chID, sessionID)
-
 	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
 	body, _ := json.Marshal([]string{channel}) //nolint:errchkjson

@@ -477,9 +449,7 @@ func (s *Service) ChangeNick(
 }

 // BroadcastQuit broadcasts a QUIT to all channel peers,
-// parts all channels, and deletes the session. Uses the
-// FanOut pattern: one message row fanned out to all unique
-// peer sessions.
+// parts all channels, and deletes the session.
 func (s *Service) BroadcastQuit(
 	ctx context.Context,
 	sessionID int64,
@@ -511,18 +481,19 @@ func (s *Service) BroadcastQuit(
 		}
 	}

-	if len(notified) > 0 {
-		recipients := make([]int64, 0, len(notified))
-		for sid := range notified {
-			recipients = append(recipients, sid)
+	body, _ := json.Marshal([]string{reason}) //nolint:errchkjson
+
+	for sid := range notified {
+		dbID, _, insErr := s.DB.InsertMessage(
+			ctx, irc.CmdQuit, nick, "",
+			nil, body, nil,
+		)
+		if insErr != nil {
+			continue
 		}

-		body, _ := json.Marshal([]string{reason}) //nolint:errchkjson
-
-		_, _, _ = s.FanOut(
-			ctx, irc.CmdQuit, nick, "",
-			nil, body, nil, recipients,
-		)
+		_ = s.DB.EnqueueToSession(ctx, sid, dbID)
+		s.Broker.Notify(sid)
 	}

 	for _, ch := range channels {
@@ -558,16 +529,7 @@ func (s *Service) Oper(
 	cfgName := s.Config.OperName
 	cfgPassword := s.Config.OperPassword

-	// Use constant-time comparison and return the same
-	// error for all failures to prevent information
-	// leakage about valid operator names.
-	if cfgName == "" || cfgPassword == "" ||
-		subtle.ConstantTimeCompare(
-			[]byte(name), []byte(cfgName),
-		) != 1 ||
-		subtle.ConstantTimeCompare(
-			[]byte(password), []byte(cfgPassword),
-		) != 1 {
+	if cfgName == "" || cfgPassword == "" {
 		return &IRCError{
 			irc.ErrNoOperHost,
 			nil,
@@ -575,6 +537,14 @@ func (s *Service) Oper(
 		}
 	}

+	if name != cfgName || password != cfgPassword {
+		return &IRCError{
+			irc.ErrPasswdMismatch,
+			nil,
+			"Password incorrect",
+		}
+	}
+
 	_ = s.DB.SetSessionOper(ctx, sessionID, true)

 	return nil
@@ -675,18 +645,6 @@ func (s *Service) SetChannelFlag(
 		); err != nil {
 			return fmt.Errorf("set topic locked: %w", err)
 		}
-	case 'i':
-		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(
-			ctx, chID, setting,
-		); err != nil {
-			return fmt.Errorf("set secret: %w", err)
-		}
 	}

 	return nil
@@ -779,61 +737,3 @@ func (s *Service) broadcastNickChange(
 		}
 	}
 }
-
-// checkJoinRestrictions validates Tier 2 join conditions:
-// bans, invite-only, channel key, and user limit.
-func checkJoinRestrictions(
-	ctx context.Context,
-	database *db.Database,
-	chID, sessionID int64,
-	channel, suppliedKey string,
-	memberCount int64,
-) error {
-	isBanned, banErr := database.IsSessionBanned(
-		ctx, chID, sessionID,
-	)
-	if banErr == nil && isBanned {
-		return &IRCError{
-			Code:    irc.ErrBannedFromChan,
-			Params:  []string{channel},
-			Message: "Cannot join channel (+b)",
-		}
-	}
-
-	isInviteOnly, ioErr := database.IsChannelInviteOnly(
-		ctx, chID,
-	)
-	if ioErr == nil && isInviteOnly {
-		hasInvite, invErr := database.HasChannelInvite(
-			ctx, chID, sessionID,
-		)
-		if invErr != nil || !hasInvite {
-			return &IRCError{
-				Code:    irc.ErrInviteOnlyChan,
-				Params:  []string{channel},
-				Message: "Cannot join channel (+i)",
-			}
-		}
-	}
-
-	key, keyErr := database.GetChannelKey(ctx, chID)
-	if keyErr == nil && key != "" && suppliedKey != key {
-		return &IRCError{
-			Code:    irc.ErrBadChannelKey,
-			Params:  []string{channel},
-			Message: "Cannot join channel (+k)",
-		}
-	}
-
-	limit, limErr := database.GetChannelUserLimit(ctx, chID)
-	if limErr == nil && limit > 0 &&
-		memberCount >= int64(limit) {
-		return &IRCError{
-			Code:    irc.ErrChannelIsFull,
-			Params:  []string{channel},
-			Message: "Cannot join channel (+l)",
-		}
-	}
-
-	return nil
-}
--- a/internal/service/service_test.go
+++ b/internal/service/service_test.go
@@ -1,365 +0,0 @@
-// Tests use a global viper instance for configuration,
-// making parallel execution unsafe.
-//
-//nolint:paralleltest
-package service_test
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"testing"
-
-	"git.eeqj.de/sneak/neoirc/internal/broker"
-	"git.eeqj.de/sneak/neoirc/internal/config"
-	"git.eeqj.de/sneak/neoirc/internal/db"
-	"git.eeqj.de/sneak/neoirc/internal/globals"
-	"git.eeqj.de/sneak/neoirc/internal/logger"
-	"git.eeqj.de/sneak/neoirc/internal/service"
-	"git.eeqj.de/sneak/neoirc/pkg/irc"
-	"go.uber.org/fx"
-	"go.uber.org/fx/fxtest"
-	"golang.org/x/crypto/bcrypt"
-)
-
-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
-	db     *db.Database
-	broker *broker.Broker
-	app    *fxtest.App
-}
-
-func newTestEnv(t *testing.T) *testEnv {
-	t.Helper()
-
-	dbURL := fmt.Sprintf(
-		"file:svc_test_%p?mode=memory&cache=shared",
-		t,
-	)
-
-	var (
-		database *db.Database
-		svc      *service.Service
-	)
-
-	brk := broker.New()
-
-	app := fxtest.New(t,
-		fx.Provide(
-			func() *globals.Globals {
-				return &globals.Globals{ //nolint:exhaustruct
-					Appname: "neoirc-test",
-					Version: "test",
-				}
-			},
-			logger.New,
-			func(
-				lifecycle fx.Lifecycle,
-				globs *globals.Globals,
-				log *logger.Logger,
-			) (*config.Config, error) {
-				cfg, err := config.New(
-					lifecycle, config.Params{ //nolint:exhaustruct
-						Globals: globs, Logger: log,
-					},
-				)
-				if err != nil {
-					return nil, fmt.Errorf(
-						"test config: %w", err,
-					)
-				}
-
-				cfg.DBURL = dbURL
-				cfg.Port = 0
-				cfg.OperName = "admin"
-				cfg.OperPassword = "secret"
-
-				return cfg, nil
-			},
-			func(
-				lifecycle fx.Lifecycle,
-				log *logger.Logger,
-				cfg *config.Config,
-			) (*db.Database, error) {
-				return db.New(lifecycle, db.Params{ //nolint:exhaustruct
-					Logger: log, Config: cfg,
-				})
-			},
-			func() *broker.Broker { return brk },
-			service.New,
-		),
-		fx.Populate(&database, &svc),
-	)
-
-	app.RequireStart()
-
-	t.Cleanup(func() {
-		app.RequireStop()
-	})
-
-	return &testEnv{
-		svc:    svc,
-		db:     database,
-		broker: brk,
-		app:    app,
-	}
-}
-
-// createSession is a test helper that creates a session
-// and returns the session ID.
-func createSession(
-	ctx context.Context,
-	t *testing.T,
-	database *db.Database,
-	nick string,
-) int64 {
-	t.Helper()
-
-	sessionID, _, _, err := database.CreateSession(
-		ctx, nick, nick, "localhost", "127.0.0.1",
-	)
-	if err != nil {
-		t.Fatalf("create session %s: %v", nick, err)
-	}
-
-	return sessionID
-}
-
-func TestFanOut(t *testing.T) {
-	env := newTestEnv(t)
-	ctx := t.Context()
-
-	sid1 := createSession(ctx, t, env.db, "alice")
-	sid2 := createSession(ctx, t, env.db, "bob")
-
-	body, _ := json.Marshal([]string{"hello"}) //nolint:errchkjson
-
-	dbID, uuid, err := env.svc.FanOut(
-		ctx, irc.CmdPrivmsg, "alice", "#test",
-		nil, body, nil,
-		[]int64{sid1, sid2},
-	)
-	if err != nil {
-		t.Fatalf("FanOut: %v", err)
-	}
-
-	if dbID == 0 {
-		t.Error("expected non-zero dbID")
-	}
-
-	if uuid == "" {
-		t.Error("expected non-empty UUID")
-	}
-}
-
-func TestJoinChannel(t *testing.T) {
-	env := newTestEnv(t)
-	ctx := t.Context()
-
-	sid := createSession(ctx, t, env.db, "alice")
-
-	result, err := env.svc.JoinChannel(
-		ctx, sid, "alice", "#general", "",
-	)
-	if err != nil {
-		t.Fatalf("JoinChannel: %v", err)
-	}
-
-	if result.ChannelID == 0 {
-		t.Error("expected non-zero channel ID")
-	}
-
-	if !result.IsCreator {
-		t.Error("first joiner should be creator")
-	}
-
-	// Second user joins — not creator.
-	sid2 := createSession(ctx, t, env.db, "bob")
-
-	result2, err := env.svc.JoinChannel(
-		ctx, sid2, "bob", "#general", "",
-	)
-	if err != nil {
-		t.Fatalf("JoinChannel bob: %v", err)
-	}
-
-	if result2.IsCreator {
-		t.Error("second joiner should not be creator")
-	}
-
-	if result2.ChannelID != result.ChannelID {
-		t.Error("both should join the same channel")
-	}
-}
-
-func TestPartChannel(t *testing.T) {
-	env := newTestEnv(t)
-	ctx := t.Context()
-
-	sid := createSession(ctx, t, env.db, "alice")
-
-	_, err := env.svc.JoinChannel(
-		ctx, sid, "alice", "#general", "",
-	)
-	if err != nil {
-		t.Fatalf("JoinChannel: %v", err)
-	}
-
-	err = env.svc.PartChannel(
-		ctx, sid, "alice", "#general", "bye",
-	)
-	if err != nil {
-		t.Fatalf("PartChannel: %v", err)
-	}
-
-	// Parting a non-existent channel returns error.
-	err = env.svc.PartChannel(
-		ctx, sid, "alice", "#nonexistent", "",
-	)
-	if err == nil {
-		t.Error("expected error for non-existent channel")
-	}
-
-	var ircErr *service.IRCError
-	if !errors.As(err, &ircErr) {
-		t.Errorf("expected IRCError, got %T", err)
-	}
-}
-
-func TestSendChannelMessage(t *testing.T) {
-	env := newTestEnv(t)
-	ctx := t.Context()
-
-	sid1 := createSession(ctx, t, env.db, "alice")
-	sid2 := createSession(ctx, t, env.db, "bob")
-
-	_, err := env.svc.JoinChannel(
-		ctx, sid1, "alice", "#chat", "",
-	)
-	if err != nil {
-		t.Fatalf("join alice: %v", err)
-	}
-
-	_, err = env.svc.JoinChannel(
-		ctx, sid2, "bob", "#chat", "",
-	)
-	if err != nil {
-		t.Fatalf("join bob: %v", err)
-	}
-
-	body, _ := json.Marshal([]string{"hello world"}) //nolint:errchkjson
-
-	dbID, uuid, err := env.svc.SendChannelMessage(
-		ctx, sid1, "alice",
-		irc.CmdPrivmsg, "#chat", body, nil,
-	)
-	if err != nil {
-		t.Fatalf("SendChannelMessage: %v", err)
-	}
-
-	if dbID == 0 {
-		t.Error("expected non-zero dbID")
-	}
-
-	if uuid == "" {
-		t.Error("expected non-empty UUID")
-	}
-
-	// Non-member cannot send.
-	sid3 := createSession(ctx, t, env.db, "charlie")
-
-	_, _, err = env.svc.SendChannelMessage(
-		ctx, sid3, "charlie",
-		irc.CmdPrivmsg, "#chat", body, nil,
-	)
-	if err == nil {
-		t.Error("expected error for non-member send")
-	}
-}
-
-func TestBroadcastQuit(t *testing.T) {
-	env := newTestEnv(t)
-	ctx := t.Context()
-
-	sid1 := createSession(ctx, t, env.db, "alice")
-	sid2 := createSession(ctx, t, env.db, "bob")
-
-	_, err := env.svc.JoinChannel(
-		ctx, sid1, "alice", "#room", "",
-	)
-	if err != nil {
-		t.Fatalf("join alice: %v", err)
-	}
-
-	_, err = env.svc.JoinChannel(
-		ctx, sid2, "bob", "#room", "",
-	)
-	if err != nil {
-		t.Fatalf("join bob: %v", err)
-	}
-
-	// BroadcastQuit should not panic and should clean up.
-	env.svc.BroadcastQuit(
-		ctx, sid1, "alice", "Goodbye",
-	)
-
-	// Session should be deleted.
-	_, lookupErr := env.db.GetSessionByNick(ctx, "alice")
-	if lookupErr == nil {
-		t.Error("expected session to be deleted after quit")
-	}
-}
-
-func TestSendChannelMessage_Moderated(t *testing.T) {
-	env := newTestEnv(t)
-	ctx := t.Context()
-
-	sid1 := createSession(ctx, t, env.db, "alice")
-	sid2 := createSession(ctx, t, env.db, "bob")
-
-	result, err := env.svc.JoinChannel(
-		ctx, sid1, "alice", "#modchat", "",
-	)
-	if err != nil {
-		t.Fatalf("join alice: %v", err)
-	}
-
-	_, err = env.svc.JoinChannel(
-		ctx, sid2, "bob", "#modchat", "",
-	)
-	if err != nil {
-		t.Fatalf("join bob: %v", err)
-	}
-
-	// Set channel to moderated.
-	chID := result.ChannelID
-	_ = env.svc.SetChannelFlag(ctx, chID, 'm', true)
-
-	body, _ := json.Marshal([]string{"test"}) //nolint:errchkjson
-
-	// Bob (non-op, non-voiced) should fail to send.
-	_, _, err = env.svc.SendChannelMessage(
-		ctx, sid2, "bob",
-		irc.CmdPrivmsg, "#modchat", body, nil,
-	)
-	if err == nil {
-		t.Error("expected error for non-voiced user in moderated channel")
-	}
-
-	// Alice (operator) should succeed.
-	_, _, err = env.svc.SendChannelMessage(
-		ctx, sid1, "alice",
-		irc.CmdPrivmsg, "#modchat", body, nil,
-	)
-	if err != nil {
-		t.Errorf("operator should be able to send in moderated channel: %v", err)
-	}
-}