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>

Dockerfile

@@ -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"]

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"]}` |
+| `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=b,k,Hl,imnst","NETWORK=neoirc"],"body":["are supported by this server"]}` |
+| `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
+Set the `IRC_LISTEN_ADDR` environment variable to a TCP address:
-`IRC_LISTEN_ADDR` to an empty string:
 
 ```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
+To expose the IRC port in Docker:
-`:6667`):
 
 ```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

cmd/neoirc-cli/main.go

@@ -1,7 +1,7 @@
 // Package main is the entry point for the neoirc-cli client.
 package main
 
-import "sneak.berlin/go/neoirc/internal/cli"
+import "git.eeqj.de/sneak/neoirc/internal/cli"
 
 func main() {
 	cli.Run()

cmd/neoircd/main.go

@@ -2,19 +2,19 @@
 package main
 
 import (
+	"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/handlers"
+	"git.eeqj.de/sneak/neoirc/internal/healthcheck"
+	"git.eeqj.de/sneak/neoirc/internal/ircserver"
+	"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"
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/handlers"
-	"sneak.berlin/go/neoirc/internal/healthcheck"
-	"sneak.berlin/go/neoirc/internal/ircserver"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/internal/middleware"
-	"sneak.berlin/go/neoirc/internal/server"
-	"sneak.berlin/go/neoirc/internal/service"
-	"sneak.berlin/go/neoirc/internal/stats"
 )
 
 var (

go.mod

@@ -1,4 +1,4 @@
-module sneak.berlin/go/neoirc
+module git.eeqj.de/sneak/neoirc
 
 go 1.24.0
 

internal/broker/broker_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"sneak.berlin/go/neoirc/internal/broker"
+	"git.eeqj.de/sneak/neoirc/internal/broker"
 )
 
 func TestNewBroker(t *testing.T) {

internal/cli/api/client.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"sneak.berlin/go/neoirc/pkg/irc"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 )
 
 const (

internal/cli/api/hashcash.go

@@ -8,7 +8,7 @@ import (
 	"math/big"
 	"time"
 
-	"sneak.berlin/go/neoirc/internal/hashcash"
+	"git.eeqj.de/sneak/neoirc/internal/hashcash"
 )
 
 const (

internal/cli/app.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	api "sneak.berlin/go/neoirc/internal/cli/api"
+	api "git.eeqj.de/sneak/neoirc/internal/cli/api"
-	"sneak.berlin/go/neoirc/pkg/irc"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 )
 
 const (

internal/config/config.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"log/slog"
 
+	"git.eeqj.de/sneak/neoirc/internal/globals"
+	"git.eeqj.de/sneak/neoirc/internal/logger"
 	"github.com/spf13/viper"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/logger"
 
 	_ "github.com/joho/godotenv/autoload" // loads .env file
 )

internal/db/db.go

@@ -12,9 +12,9 @@ import (
 	"strconv"
 	"strings"
 
+	"git.eeqj.de/sneak/neoirc/internal/config"
+	"git.eeqj.de/sneak/neoirc/internal/logger"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/logger"
 
 	_ "github.com/joho/godotenv/autoload" // .env
 	_ "modernc.org/sqlite"                // driver
@@ -135,21 +135,13 @@ type migration struct {
 func (database *Database) runMigrations(
 	ctx context.Context,
 ) error {
-	bootstrap, err := SchemaFiles.ReadFile(
+	_, err := database.conn.ExecContext(ctx,
-		"schema/000.sql",
+		`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,
+			"create schema_migrations: %w", err,
-		)
-	}
-
-	_, err = database.conn.ExecContext(
-		ctx, string(bootstrap),
-	)
-	if err != nil {
-		return fmt.Errorf(
-			"execute bootstrap migration: %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/main_test.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
+	"git.eeqj.de/sneak/neoirc/internal/db"
 	"golang.org/x/crypto/bcrypt"
-	"sneak.berlin/go/neoirc/internal/db"
 )
 
 func TestMain(m *testing.M) {

internal/db/queries.go

@@ -9,11 +9,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 	"time"
 
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 	"github.com/google/uuid"
-	"sneak.berlin/go/neoirc/pkg/irc"
 )
 
 const (
@@ -1836,580 +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
-}
-
-// --- 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.
-//
-//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
-}

internal/db/queries_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"sneak.berlin/go/neoirc/internal/db"
+	"git.eeqj.de/sneak/neoirc/internal/db"
 
 	_ "modernc.org/sqlite"
 )
@@ -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)
-	}
-}

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

@@ -42,37 +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,
-    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,
     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,

internal/handlers/api_test.go

@@ -18,21 +18,20 @@ import (
 	"testing"
 	"time"
 
+	"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/handlers"
+	"git.eeqj.de/sneak/neoirc/internal/hashcash"
+	"git.eeqj.de/sneak/neoirc/internal/healthcheck"
+	"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/stats"
 	"go.uber.org/fx"
 	"go.uber.org/fx/fxtest"
 	"golang.org/x/crypto/bcrypt"
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/handlers"
-	"sneak.berlin/go/neoirc/internal/hashcash"
-	"sneak.berlin/go/neoirc/internal/healthcheck"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/internal/middleware"
-	"sneak.berlin/go/neoirc/internal/server"
-	"sneak.berlin/go/neoirc/internal/service"
-	"sneak.berlin/go/neoirc/internal/stats"
 )
 
 func TestMain(m *testing.M) {
@@ -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,
+		Broker:      broker.New(),
-		Service:     svc,
 	})
 	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,
-			)
-		}
-	}
-}

internal/handlers/auth.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"sneak.berlin/go/neoirc/pkg/irc"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 )
 
 const minPasswordLength = 8

internal/handlers/handlers.go

@@ -9,17 +9,17 @@ import (
 	"net/http"
 	"time"
 
+	"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/hashcash"
+	"git.eeqj.de/sneak/neoirc/internal/healthcheck"
+	"git.eeqj.de/sneak/neoirc/internal/logger"
+	"git.eeqj.de/sneak/neoirc/internal/ratelimit"
+	"git.eeqj.de/sneak/neoirc/internal/service"
+	"git.eeqj.de/sneak/neoirc/internal/stats"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/hashcash"
-	"sneak.berlin/go/neoirc/internal/healthcheck"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/internal/ratelimit"
-	"sneak.berlin/go/neoirc/internal/service"
-	"sneak.berlin/go/neoirc/internal/stats"
 )
 
 var errUnauthorized = errors.New("unauthorized")

internal/hashcash/channel_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"sneak.berlin/go/neoirc/internal/hashcash"
+	"git.eeqj.de/sneak/neoirc/internal/hashcash"
 )
 
 const (

internal/hashcash/hashcash_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"sneak.berlin/go/neoirc/internal/hashcash"
+	"git.eeqj.de/sneak/neoirc/internal/hashcash"
 )
 
 const testBits = 2

internal/healthcheck/healthcheck.go

@@ -6,12 +6,12 @@ import (
 	"log/slog"
 	"time"
 
+	"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/stats"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/internal/stats"
 )
 
 // Params defines the dependencies for creating a Healthcheck.

internal/ircserver/commands.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"sneak.berlin/go/neoirc/internal/service"
+	"git.eeqj.de/sneak/neoirc/internal/service"
-	"sneak.berlin/go/neoirc/pkg/irc"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 )
 
 // sendIRCError maps a service.IRCError to an IRC numeric
@@ -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)
@@ -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
-
+		case 'm', 't':
-			continue
-		case 'i', 'm', 'n', 's', 't':
 			_ = c.svc.SetChannelFlag(
 				ctx, chID, modeChar, adding,
 			)
 
-			prefix := "+"
+			if adding {
-			if !adding {
+				applied += "+" + string(modeChar)
-				prefix = "-"
+			} else {
+				applied += "-" + string(modeChar)
+			}
+		case 'o', 'v':
+			if argIdx >= len(args) {
+				break
 			}
 
-			res = modeResult{
+			targetNick := args[argIdx]
-				applied:     prefix + string(modeChar),
+			argIdx++
-				appliedArgs: "",
+
-				consumed:    0,
+			err := c.svc.ApplyMemberMode(
-				skip:        false,
-			}
-		case 'H':
-			res = c.applyHashcashMode(
-				ctx, chID, adding, args, argIdx,
-			)
-		case 'o', 'v':
-			res = c.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

@@ -11,11 +11,11 @@ import (
 	"sync"
 	"time"
 
-	"sneak.berlin/go/neoirc/internal/broker"
+	"git.eeqj.de/sneak/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
+	"git.eeqj.de/sneak/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
+	"git.eeqj.de/sneak/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/service"
+	"git.eeqj.de/sneak/neoirc/internal/service"
-	"sneak.berlin/go/neoirc/pkg/irc"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 )
 
 const (
@@ -28,7 +28,6 @@ const (
 	pongDeadline   = 30 * time.Second
 	maxNickLen     = 32
 	minPasswordLen = 8
-	maxHashcashBits = 40
 )
 
 // 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

@@ -5,10 +5,10 @@ import (
 	"log/slog"
 	"net"
 
-	"sneak.berlin/go/neoirc/internal/broker"
+	"git.eeqj.de/sneak/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
+	"git.eeqj.de/sneak/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
+	"git.eeqj.de/sneak/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/service"
+	"git.eeqj.de/sneak/neoirc/internal/service"
 )
 
 // NewTestServer creates a Server suitable for testing.
@@ -19,9 +19,12 @@ func NewTestServer(
 	database *db.Database,
 	brk *broker.Broker,
 ) *Server {
-	svc := service.NewTestService(
+	svc := &service.Service{
-		database, brk, cfg, log,
+		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/ircserver/parser_test.go

@@ -3,7 +3,7 @@ package ircserver_test
 import (
 	"testing"
 
-	"sneak.berlin/go/neoirc/internal/ircserver"
+	"git.eeqj.de/sneak/neoirc/internal/ircserver"
 )
 
 //nolint:funlen // table-driven test

internal/ircserver/relay.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"sneak.berlin/go/neoirc/internal/db"
+	"git.eeqj.de/sneak/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/pkg/irc"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 )
 
 // relayMessages polls the client output queue and delivers

internal/ircserver/server.go

@@ -7,12 +7,12 @@ import (
 	"net"
 	"sync"
 
+	"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/logger"
+	"git.eeqj.de/sneak/neoirc/internal/service"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/internal/service"
 )
 
 // Params defines the dependencies for creating an IRC

internal/ircserver/server_test.go

@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
-	"sneak.berlin/go/neoirc/internal/broker"
+	"git.eeqj.de/sneak/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
+	"git.eeqj.de/sneak/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
+	"git.eeqj.de/sneak/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/ircserver"
+	"git.eeqj.de/sneak/neoirc/internal/ircserver"
 
 	_ "modernc.org/sqlite"
 )

internal/logger/logger.go

@@ -5,8 +5,8 @@ import (
 	"log/slog"
 	"os"
 
+	"git.eeqj.de/sneak/neoirc/internal/globals"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/globals"
 )
 
 // Params defines the dependencies for creating a Logger.

internal/middleware/middleware.go

@@ -7,6 +7,9 @@ import (
 	"net/http"
 	"time"
 
+	"git.eeqj.de/sneak/neoirc/internal/config"
+	"git.eeqj.de/sneak/neoirc/internal/globals"
+	"git.eeqj.de/sneak/neoirc/internal/logger"
 	basicauth "github.com/99designs/basicauth-go"
 	chimw "github.com/go-chi/chi/v5/middleware"
 	"github.com/go-chi/cors"
@@ -15,9 +18,6 @@ import (
 	"github.com/slok/go-http-metrics/middleware/std"
 	"github.com/spf13/viper"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/logger"
 )
 
 const corsMaxAge = 300

internal/ratelimit/ratelimit_test.go

@@ -3,7 +3,7 @@ package ratelimit_test
 import (
 	"testing"
 
-	"sneak.berlin/go/neoirc/internal/ratelimit"
+	"git.eeqj.de/sneak/neoirc/internal/ratelimit"
 )
 
 func TestNewCreatesLimiter(t *testing.T) {

internal/server/routes.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"sneak.berlin/go/neoirc/web"
+	"git.eeqj.de/sneak/neoirc/web"
 
 	sentryhttp "github.com/getsentry/sentry-go/http"
 	"github.com/go-chi/chi/v5"

internal/server/server.go

@@ -12,12 +12,12 @@ import (
 	"syscall"
 	"time"
 
+	"git.eeqj.de/sneak/neoirc/internal/config"
+	"git.eeqj.de/sneak/neoirc/internal/globals"
+	"git.eeqj.de/sneak/neoirc/internal/handlers"
+	"git.eeqj.de/sneak/neoirc/internal/logger"
+	"git.eeqj.de/sneak/neoirc/internal/middleware"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/handlers"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/internal/middleware"
 
 	"github.com/getsentry/sentry-go"
 	"github.com/go-chi/chi/v5"

internal/service/service.go

@@ -4,19 +4,17 @@ package service
 
 import (
 	"context"
-	"crypto/subtle"
 	"encoding/json"
 	"fmt"
 	"log/slog"
-	"strconv"
 	"strings"
 
+	"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/logger"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 	"go.uber.org/fx"
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/pkg/irc"
 )
 
 // Params defines the dependencies for creating a Service.
@@ -31,35 +29,19 @@ type Params struct {
 
 // Service provides shared business logic for IRC commands.
 type Service struct {
-	db     *db.Database
+	DB     *db.Database
-	broker *broker.Broker
+	Broker *broker.Broker
-	config *config.Config
+	Config *config.Config
-	log    *slog.Logger
+	Log    *slog.Logger
 }
 
 // New creates a new Service.
 func New(params Params) *Service {
 	return &Service{
-		db:     params.Database,
+		DB:     params.Database,
-		broker: params.Broker,
+		Broker: params.Broker,
-		config: params.Config,
+		Config: params.Config,
-		log:    params.Logger.Get(),
+		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,
 	}
 }
 
@@ -93,7 +75,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 +83,8 @@ func (s *Service) FanOut(
 	}
 
 	for _, sid := range sessionIDs {
-		_ = s.db.EnqueueToSession(ctx, sid, dbID)
+		_ = s.DB.EnqueueToSession(ctx, sid, dbID)
-		s.broker.Notify(sid)
+		s.Broker.Notify(sid)
 	}
 
 	return dbID, msgUUID, nil
@@ -127,59 +109,44 @@ 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,
+// the sender.
-// and any error. The dbID lets callers enqueue the same
-// message to the sender when echo is needed (HTTP
-// transport).
 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)
+	chID, err := s.DB.GetChannelByName(ctx, channel)
 	if err != nil {
-		return 0, "", &IRCError{
+		return "", &IRCError{
 			irc.ErrNoSuchChannel,
 			[]string{channel},
 			"No such channel",
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		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.
+	moderated, _ := s.DB.IsChannelModerated(ctx, chID)
-	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(
+		isOp, _ := s.DB.IsChannelOperator(
 			ctx, chID, sessionID,
 		)
-		isVoiced, _ := s.db.IsChannelVoiced(
+		isVoiced, _ := s.DB.IsChannelVoiced(
 			ctx, chID, sessionID,
 		)
 
 		if !isOp && !isVoiced {
-			return 0, "", &IRCError{
+			return "", &IRCError{
 				irc.ErrCannotSendToChan,
 				[]string{channel},
 				"Cannot send to channel (+m)",
@@ -187,18 +154,18 @@ 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(
+	_, 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
@@ -210,7 +177,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 +186,7 @@ func (s *Service) SendDirectMessage(
 		}
 	}
 
-	away, _ := s.db.GetAway(ctx, targetSID)
+	away, _ := s.DB.GetAway(ctx, targetSID)
 
 	recipients := []int64{targetSID}
 	if targetSID != sessionID {
@@ -243,43 +210,31 @@ 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)
+	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,
-			channel, suppliedKey, memberCount,
-		); joinErr != nil {
-			return nil, joinErr
-		}
-	}
-
 	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 {
 		return nil, fmt.Errorf("join channel: %w", err)
 	}
 
-	// Clear invite after successful join.
+	memberIDs, _ := s.DB.GetChannelMemberIDs(ctx, chID)
-	_ = s.db.ClearChannelInvite(ctx, chID, sessionID)
-
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
 	body, _ := json.Marshal([]string{channel}) //nolint:errchkjson
 
 	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
@@ -301,7 +256,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 +265,7 @@ func (s *Service) PartChannel(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, sessionID,
 	)
 	if !isMember {
@@ -321,7 +276,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 +285,8 @@ func (s *Service) PartChannel(
 		nil, body, nil, recipients,
 	)
 
-	s.db.PartChannel(ctx, chID, sessionID) //nolint:errcheck,gosec
+	s.DB.PartChannel(ctx, chID, sessionID) //nolint:errcheck,gosec
-	s.db.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
+	s.DB.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
 
 	return nil
 }
@@ -343,7 +298,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 +307,7 @@ func (s *Service) SetTopic(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, sessionID,
 	)
 	if !isMember {
@@ -363,9 +318,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 +332,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 +359,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 +368,7 @@ func (s *Service) KickUser(
 		}
 	}
 
-	isOp, _ := s.db.IsChannelOperator(
+	isOp, _ := s.DB.IsChannelOperator(
 		ctx, chID, sessionID,
 	)
 	if !isOp {
@@ -424,7 +379,7 @@ func (s *Service) KickUser(
 		}
 	}
 
-	targetSID, err := s.db.GetSessionByNick(
+	targetSID, err := s.DB.GetSessionByNick(
 		ctx, targetNick,
 	)
 	if err != nil {
@@ -435,7 +390,7 @@ func (s *Service) KickUser(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, targetSID,
 	)
 	if !isMember {
@@ -446,7 +401,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 +412,8 @@ func (s *Service) KickUser(
 		params, body, nil, memberIDs,
 	)
 
-	s.db.PartChannel(ctx, chID, targetSID) //nolint:errcheck,gosec
+	s.DB.PartChannel(ctx, chID, targetSID) //nolint:errcheck,gosec
-	s.db.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
+	s.DB.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
 
 	return nil
 }
@@ -470,7 +425,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) {
@@ -494,15 +449,13 @@ func (s *Service) ChangeNick(
 }
 
 // BroadcastQuit broadcasts a QUIT to all channel peers,
-// parts all channels, and deletes the session. Uses the
+// parts all channels, and deletes the session.
-// FanOut pattern: one message row fanned out to all unique
-// peer sessions.
 func (s *Service) BroadcastQuit(
 	ctx context.Context,
 	sessionID int64,
 	nick, reason string,
 ) {
-	channels, err := s.db.GetSessionChannels(
+	channels, err := s.DB.GetSessionChannels(
 		ctx, sessionID,
 	)
 	if err != nil {
@@ -512,7 +465,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 {
@@ -528,26 +481,27 @@ 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
 
-		_, _, _ = s.FanOut(
+	for sid := range notified {
+		dbID, _, insErr := s.DB.InsertMessage(
 			ctx, irc.CmdQuit, nick, "",
-			nil, body, nil, recipients,
+			nil, body, nil,
 		)
+		if insErr != nil {
+			continue
+		}
+
+		_ = s.DB.EnqueueToSession(ctx, sid, dbID)
+		s.Broker.Notify(sid)
 	}
 
 	for _, ch := range channels {
-		s.db.PartChannel(ctx, ch.ID, sessionID) //nolint:errcheck,gosec
+		s.DB.PartChannel(ctx, ch.ID, sessionID) //nolint:errcheck,gosec
-		s.db.DeleteChannelIfEmpty(ctx, ch.ID)   //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 +511,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,19 +526,10 @@ func (s *Service) Oper(
 	sessionID int64,
 	name, password string,
 ) error {
-	cfgName := s.config.OperName
+	cfgName := s.Config.OperName
-	cfgPassword := s.config.OperPassword
+	cfgPassword := s.Config.OperPassword
 
-	// Use constant-time comparison and return the same
+	if cfgName == "" || cfgPassword == "" {
-	// 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 {
 		return &IRCError{
 			irc.ErrNoOperHost,
 			nil,
@@ -592,7 +537,15 @@ func (s *Service) Oper(
 		}
 	}
 
-	_ = s.db.SetSessionOper(ctx, sessionID, true)
+	if name != cfgName || password != cfgPassword {
+		return &IRCError{
+			irc.ErrPasswdMismatch,
+			nil,
+			"Password incorrect",
+		}
+	}
+
+	_ = s.DB.SetSessionOper(ctx, sessionID, true)
 
 	return nil
 }
@@ -604,7 +557,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 +566,7 @@ func (s *Service) ValidateChannelOp(
 		}
 	}
 
-	isOp, _ := s.db.IsChannelOperator(
+	isOp, _ := s.DB.IsChannelOperator(
 		ctx, chID, sessionID,
 	)
 	if !isOp {
@@ -636,7 +589,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 +600,7 @@ func (s *Service) ApplyMemberMode(
 		}
 	}
 
-	isMember, _ := s.db.IsChannelMember(
+	isMember, _ := s.DB.IsChannelMember(
 		ctx, chID, targetSID,
 	)
 	if !isMember {
@@ -660,11 +613,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 +625,7 @@ func (s *Service) ApplyMemberMode(
 	return nil
 }
 
-// SetChannelFlag applies a simple boolean channel mode
+// SetChannelFlag applies +m/-m or +t/-t on a channel.
-// (+m/-m, +t/-t, +i/-i, +s/-s, +n/-n).
 func (s *Service) SetChannelFlag(
 	ctx context.Context,
 	chID int64,
@@ -682,37 +634,17 @@ 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(
-			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)
-		}
-	case 'n':
-		if err := s.db.SetChannelNoExternal(
-			ctx, chID, setting,
-		); err != nil {
-			return fmt.Errorf(
-				"set no external: %w", err,
-			)
-		}
 	}
 
 	return nil
@@ -726,7 +658,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 +667,24 @@ func (s *Service) BroadcastMode(
 	)
 }
 
-// QueryChannelMode returns the complete channel mode
+// QueryChannelMode returns the channel mode string.
-// string including all flags and parameterized modes.
 func (s *Service) QueryChannelMode(
 	ctx context.Context,
 	chID int64,
 ) string {
 	modes := "+"
 
-	noExternal, _ := s.db.IsChannelNoExternal(ctx, chID)
+	moderated, _ := s.DB.IsChannelModerated(ctx, chID)
-	if noExternal {
-		modes += "n"
-	}
-
-	inviteOnly, _ := s.db.IsChannelInviteOnly(ctx, chID)
-	if inviteOnly {
-		modes += "i"
-	}
-
-	moderated, _ := s.db.IsChannelModerated(ctx, chID)
 	if moderated {
 		modes += "m"
 	}
 
-	secret, _ := s.db.IsChannelSecret(ctx, chID)
+	topicLocked, _ := s.DB.IsChannelTopicLocked(ctx, chID)
-	if secret {
-		modes += "s"
-	}
-
-	topicLocked, _ := s.db.IsChannelTopicLocked(ctx, chID)
 	if topicLocked {
 		modes += "t"
 	}
 
-	var modeParams string
+	return modes
-
-	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
 }
 
 // broadcastNickChange notifies channel peers of a nick
@@ -798,7 +694,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 +704,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 +713,12 @@ func (s *Service) broadcastNickChange(
 	}
 
 	// Notify the user themselves (for multi-client sync).
-	_ = s.db.EnqueueToSession(ctx, sessionID, dbID)
+	_ = s.DB.EnqueueToSession(ctx, sessionID, dbID)
-	s.broker.Notify(sessionID)
+	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,66 +732,8 @@ func (s *Service) broadcastNickChange(
 
 			notified[mid] = true
 
-			_ = s.db.EnqueueToSession(ctx, mid, dbID)
+			_ = s.DB.EnqueueToSession(ctx, mid, dbID)
-			s.broker.Notify(mid)
+			s.Broker.Notify(mid)
 		}
 	}
 }
-
-// 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
-}

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"
-
-	"go.uber.org/fx"
-	"go.uber.org/fx/fxtest"
-	"golang.org/x/crypto/bcrypt"
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/globals"
-	"sneak.berlin/go/neoirc/internal/logger"
-	"sneak.berlin/go/neoirc/internal/service"
-	"sneak.berlin/go/neoirc/pkg/irc"
-)
-
-func TestMain(m *testing.M) {
-	db.SetBcryptCost(bcrypt.MinCost)
-	os.Exit(m.Run())
-}
-
-// testEnv holds all dependencies for a service test.
-type testEnv struct {
-	svc    *service.Service
-	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)
-	}
-}

internal/stats/stats_test.go

@@ -3,7 +3,7 @@ package stats_test
 import (
 	"testing"
 
-	"sneak.berlin/go/neoirc/internal/stats"
+	"git.eeqj.de/sneak/neoirc/internal/stats"
 )
 
 func TestNew(t *testing.T) {

pkg/irc/numerics_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"sneak.berlin/go/neoirc/pkg/irc"
+	"git.eeqj.de/sneak/neoirc/pkg/irc"
 )
 
 func TestName(t *testing.T) {

schema/commands/JOIN.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/JOIN.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/JOIN.json",
   "title": "JOIN",
   "description": "Join a channel. C2S: request to join. S2C: notification that a user joined. RFC 1459 §4.2.1.",
   "$ref": "../message.json",

schema/commands/KICK.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/KICK.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/KICK.json",
   "title": "KICK",
   "description": "Kick a user from a channel. RFC 1459 §4.2.8.",
   "$ref": "../message.json",

schema/commands/MODE.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/MODE.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/MODE.json",
   "title": "MODE",
   "description": "Set or query channel/user modes. RFC 1459 §4.2.3.",
   "$ref": "../message.json",

schema/commands/NICK.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/NICK.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/NICK.json",
   "title": "NICK",
   "description": "Change nickname. C2S: request new nick. S2C: notification of nick change. RFC 1459 §4.1.2.",
   "$ref": "../message.json",

schema/commands/NOTICE.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/NOTICE.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/NOTICE.json",
   "title": "NOTICE",
   "description": "Send a notice. Like PRIVMSG but must not trigger automatic replies. RFC 1459 §4.4.2.",
   "$ref": "../message.json",

schema/commands/PART.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/PART.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PART.json",
   "title": "PART",
   "description": "Leave a channel. C2S: request to leave. S2C: notification that a user left. RFC 1459 §4.2.2.",
   "$ref": "../message.json",

schema/commands/PING.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/PING.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PING.json",
   "title": "PING",
   "description": "Keepalive. C2S or S2S. Server responds with PONG. RFC 1459 §4.6.2.",
   "$ref": "../message.json",

schema/commands/PONG.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/PONG.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PONG.json",
   "title": "PONG",
   "description": "Keepalive response. S2C or S2S. RFC 1459 §4.6.3.",
   "$ref": "../message.json",

schema/commands/PRIVMSG.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/PRIVMSG.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PRIVMSG.json",
   "title": "PRIVMSG",
   "description": "Send a message to a channel or user. C2S: client sends to server. S2C: server relays to recipients. RFC 1459 §4.4.1.",
   "$ref": "../message.json",

schema/commands/PUBKEY.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/PUBKEY.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PUBKEY.json",
   "title": "PUBKEY",
   "description": "Announce or relay a user's public signing key. C2S: client announces key to channel or server. S2C: server relays to channel members. Protocol extension (not in RFC 1459). Body is a structured object (not an array) containing the key material.",
   "$ref": "../message.json",

schema/commands/QUIT.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/QUIT.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/QUIT.json",
   "title": "QUIT",
   "description": "User disconnected. S2C only. RFC 1459 §4.1.6.",
   "$ref": "../message.json",

schema/commands/TOPIC.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/commands/TOPIC.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/TOPIC.json",
   "title": "TOPIC",
   "description": "Get or set channel topic. C2S: set topic (body present) or query (body absent). S2C: topic change notification. RFC 1459 §4.2.4.",
   "$ref": "../message.json",

schema/message.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/message.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/message.json",
   "title": "IRC Message Envelope",
   "description": "Base envelope for all messages. Mirrors IRC wire format (RFC 1459/2812) encoded as JSON over HTTP. The 'command' field carries either an IRC command name (PRIVMSG, JOIN, etc.) or a three-digit numeric reply code (001, 353, 433, etc.).",
   "type": "object",

schema/numerics/001.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/001.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/001.json",
   "title": "001 RPL_WELCOME",
   "description": "Welcome message sent after successful session creation. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",

schema/numerics/002.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/002.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/002.json",
   "title": "002 RPL_YOURHOST",
   "description": "Server host info sent after session creation. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",

schema/numerics/003.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/003.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/003.json",
   "title": "003 RPL_CREATED",
   "description": "Server creation date. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",

schema/numerics/004.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/004.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/004.json",
   "title": "004 RPL_MYINFO",
   "description": "Server info (name, version, available modes). RFC 2812 \u00a75.1.",
   "$ref": "../message.json",

schema/numerics/322.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/322.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/322.json",
   "title": "322 RPL_LIST",
   "description": "Channel list entry. One per channel in response to LIST. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",

schema/numerics/323.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/323.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/323.json",
   "title": "323 RPL_LISTEND",
   "description": "End of channel list. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",

schema/numerics/332.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/332.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/332.json",
   "title": "332 RPL_TOPIC",
   "description": "Channel topic (sent on JOIN or TOPIC query). RFC 1459 \u00a76.2.",
   "$ref": "../message.json",

schema/numerics/353.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/353.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/353.json",
   "title": "353 RPL_NAMREPLY",
   "description": "Channel member list. Sent on JOIN or NAMES query. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",

schema/numerics/366.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/366.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/366.json",
   "title": "366 RPL_ENDOFNAMES",
   "description": "End of NAMES list. RFC 1459 \u00a76.2.",
   "$ref": "../message.json",

schema/numerics/372.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/372.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/372.json",
   "title": "372 RPL_MOTD",
   "description": "MOTD line. One message per line of the MOTD. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",

schema/numerics/375.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/375.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/375.json",
   "title": "375 RPL_MOTDSTART",
   "description": "Start of MOTD. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",

schema/numerics/376.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/376.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/376.json",
   "title": "376 RPL_ENDOFMOTD",
   "description": "End of MOTD. RFC 2812 \u00a75.1.",
   "$ref": "../message.json",

schema/numerics/401.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/401.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/401.json",
   "title": "401 ERR_NOSUCHNICK",
   "description": "No such nick/channel. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",

schema/numerics/403.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/403.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/403.json",
   "title": "403 ERR_NOSUCHCHANNEL",
   "description": "No such channel. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",

schema/numerics/433.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/433.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/433.json",
   "title": "433 ERR_NICKNAMEINUSE",
   "description": "Nickname is already in use. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",

schema/numerics/442.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/442.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/442.json",
   "title": "442 ERR_NOTONCHANNEL",
   "description": "You're not on that channel. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",

schema/numerics/482.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://sneak.berlin/go/neoirc/schema/numerics/482.json",
+  "$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/482.json",
   "title": "482 ERR_CHANOPRIVSNEEDED",
   "description": "You're not channel operator. RFC 1459 \u00a76.1.",
   "$ref": "../message.json",