fix: correct all documentation inaccuracies about cookie-based auth

- Fix false claim 'clients never need to handle the token directly' —
  CLI clients (curl, custom HTTP clients) must explicitly manage cookies
- Replace 'token' with 'cookie' in multi-client diagram (token_a → cookie_a)
- Fix Set-Cookie placeholders in protocol diagrams (<token> → <random_hex>/<cookie_a>/<cookie_b>)
- Fix 'old token' → 'old auth cookie' in QUIT command description
- Fix 'get token' → 'get auth cookie' in Client Development Guide
- Fix 'Tokens are hashed' → 'Cookie values are hashed' in Security Model
- Fix 'client tokens are deleted' → 'client auth cookies are invalidated'
- Fix 'Cookie sent automatically' → 'Cookie must be sent' in diagram
- Fix 'eliminates token management from client code entirely' rationale
- Fix 'No token appears in the JSON body' → 'No auth credential appears'
- Fix 'encoded in the token' → 'encoded in the cookie value'
- Fix 'Clients never handle tokens directly' in JWT comparison section
- Update clients table token column description for clarity
- All remaining 'token' refs verified as legitimate (pow_token/hashcash/JWT comparison/DB schema column name)

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

@@ -27,7 +27,6 @@ web client as a convenience/reference implementation, but the API comes first.
 - [Federation](#federation-server-to-server)
 - [Storage](#storage)
 - [Configuration](#configuration)
-- [IRC Protocol Listener](#irc-protocol-listener)
 - [Deployment](#deployment)
 - [Client Development Guide](#client-development-guide)
 - [Rate Limiting & Abuse Prevention](#rate-limiting--abuse-prevention)
@@ -213,13 +212,13 @@ Each session has an IRC-style hostmask composed of three parts:
 
 - **nick** — the user's current nick (changes with `NICK` command)
 - **username** — an ident-like identifier set at session creation (optional
-  `username` field in the session request; defaults to the nick)
+  `username` field in the session/register request; defaults to the nick)
 - **hostname** — automatically resolved via reverse DNS of the connecting
   client's IP address at session creation time
 - **ip** — the real IP address of the session creator, extracted from
   `X-Forwarded-For`, `X-Real-IP`, or `RemoteAddr`
 
-Each **client connection** (created at session creation or login)
+Each **client connection** (created at session creation, registration, or login)
 also stores its own **ip** and **hostname**, allowing the server to track the
 network origin of each individual client independently from the session.
 Client-level IP and hostname are **not displayed to regular users**. They are
@@ -825,9 +824,8 @@ Set or change a channel's topic.
 - Updates the channel's topic in the database.
 - The TOPIC event is broadcast to all channel members.
 - If the channel doesn't exist, the server returns an error.
-- If the channel has mode `+t` (topic lock, default: ON for new channels),
+- If the channel has mode `+t` (topic lock), only operators can change the
-  only operators (`+o`) can change the topic. Non-operators receive
+  topic (not yet enforced).
-  `ERR_CHANOPRIVSNEEDED` (482).
 
 **Response:** `200 OK`
 ```json
@@ -1022,23 +1020,16 @@ WHOIS responses (e.g., target user's current client IP and hostname).
 
 **IRC reference:** RFC 1459 §4.1.5
 
-#### KICK — Kick User
+#### KICK — Kick User (Planned)
 
-Remove a user from a channel. Only channel operators (`+o`) can use this
+Remove a user from a channel.
-command. The kicked user and all channel members receive the KICK message.
 
 **C2S:**
 ```json
-{"command": "KICK", "to": "#general", "body": ["bob", "misbehaving"]}
+{"command": "KICK", "to": "#general", "params": ["bob"], "body": ["misbehaving"]}
 ```
 
-The first element of `body` is the target nick, the second (optional) is the
+**Status:** Not yet implemented.
-reason. If no reason is provided, the kicker's nick is used as the default.
-
-**Errors:**
-- `482` (ERR_CHANOPRIVSNEEDED) — kicker is not a channel operator
-- `441` (ERR_USERNOTINCHANNEL) — target is not in the channel
-- `403` (ERR_NOSUCHCHANNEL) — channel does not exist
 
 **IRC reference:** RFC 1459 §4.2.8
 
@@ -1080,8 +1071,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","","imnst"]}` |
-| `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","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"]}` |
@@ -1127,73 +1118,25 @@ carries IRC-style parameters (e.g., channel name, target nick).
 
 Inspired by IRC, simplified:
 
-| Mode | Name           | Meaning | Status |
+| Mode | Name           | Meaning |
-|------|----------------|---------|--------|
+|------|----------------|---------|
-| `+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 |
-| `+i` | Invite-only    | Only invited users can join; use `INVITE nick #channel` to invite | **Enforced** |
+| `+m` | Moderated      | Only voiced (`+v`) users and operators (`+o`) can send |
-| `+k` | Channel key    | Requires a password to join (parameter: key string) | **Enforced** |
+| `+s` | Secret         | Channel hidden from LIST response |
-| `+l` | User limit     | Maximum number of members allowed in the channel (parameter: integer) | **Enforced** |
+| `+t` | Topic lock     | Only operators can change the topic |
-| `+m` | Moderated      | Only voiced (`+v`) users and operators (`+o`) can send | **Enforced** |
+| `+n` | No external    | Only channel members can send messages to the channel |
-| `+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`) |
-| `+s` | Secret         | Channel hidden from LIST and WHOIS for non-members | **Enforced** |
-| `+t` | Topic lock     | Only operators can change the topic (default: ON) | **Enforced** |
-| `+H` | Hashcash       | Requires proof-of-work for PRIVMSG (parameter: bits, e.g. `+H 20`) | **Enforced** |
 
 **User channel modes (set per-user per-channel):**
 
-| Mode | Meaning | Display prefix | Status |
+| Mode | Meaning | Display prefix |
-|------|---------|----------------|--------|
+|------|---------|----------------|
-| `+o` | Operator | `@` in NAMES reply | **Enforced** |
+| `+o` | Operator | `@` in NAMES reply |
-| `+v` | Voice    | `+` in NAMES reply | **Enforced** |
+| `+v` | Voice    | `+` in NAMES reply |
 
-**Channel creator auto-op:** The first user to JOIN a channel (creating it)
+**Status:** Channel modes are defined but not yet enforced. The `modes` column
-automatically receives `+o` operator status.
+exists in the channels table but the server does not check modes on actions.
-
+Exception: `+H` (hashcash) is fully enforced — see below.
-**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.
-
-**NOTICE:** Follows RFC 2812 — NOTICE never triggers auto-replies (including
-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).
 
 ### Per-Channel Hashcash (Anti-Spam)
 
@@ -2265,9 +2208,6 @@ directory is also loaded automatically via
 | `NEOIRC_HASHCASH_BITS` | int | `20`                               | Required hashcash proof-of-work difficulty (leading zero bits in SHA-256) for session creation. Set to `0` to disable. |
 | `NEOIRC_OPER_NAME` | string | `""`                                 | Server operator (o-line) username. Both name and password must be set to enable OPER. |
 | `NEOIRC_OPER_PASSWORD` | string | `""`                              | Server operator (o-line) password. Both name and password must be set to enable OPER. |
-| `LOGIN_RATE_LIMIT` | float   | `1`                                  | Allowed login attempts per second per IP address. |
-| `LOGIN_RATE_BURST`  | int    | `5`                                  | Maximum burst of login attempts per IP before rate limiting kicks in. |
-| `IRC_LISTEN_ADDR`  | string  | `:6667`                              | TCP address for the traditional IRC protocol listener. Set to empty string to disable. |
 | `MAINTENANCE_MODE` | bool    | `false`                              | Maintenance mode flag (reserved) |
 
 ### Example `.env` file
@@ -2284,69 +2224,6 @@ NEOIRC_HASHCASH_BITS=20
 
 ---
 
-## IRC Protocol Listener
-
-neoirc includes an optional traditional IRC wire protocol listener (RFC
-1459/2812) that allows standard IRC clients to connect directly. This enables
-backward compatibility with existing IRC clients like irssi, weechat, hexchat,
-and others.
-
-### Configuration
-
-The IRC listener is **enabled by default** on `:6667`. To disable it, set
-`IRC_LISTEN_ADDR` to an empty string:
-
-```bash
-IRC_LISTEN_ADDR=
-```
-
-### Supported Commands
-
-| Category   | Commands                                             |
-|------------|------------------------------------------------------|
-| Connection | `NICK`, `USER`, `PASS`, `QUIT`, `PING`/`PONG`, `CAP` |
-| Channels   | `JOIN`, `PART`, `MODE`, `TOPIC`, `NAMES`, `LIST`, `KICK`, `INVITE` |
-| Messaging  | `PRIVMSG`, `NOTICE`                                  |
-| Info       | `WHO`, `WHOIS`, `LUSERS`, `MOTD`, `AWAY`, `USERHOST`, `VERSION`, `ADMIN`, `INFO`, `TIME` |
-| Operator   | `OPER`, `KILL`, `WALLOPS` (requires `NEOIRC_OPER_NAME` and `NEOIRC_OPER_PASSWORD`) |
-
-### Protocol Details
-
-- **Wire format**: CR-LF delimited lines, max 512 bytes per line
-- **Connection registration**: Clients must send `NICK` and `USER` to register.
-  An optional `PASS` before registration sets the session password (minimum 8
-  characters).
-- **CAP negotiation**: `CAP LS` and `CAP END` are silently handled for
-  compatibility with modern clients. No capabilities are advertised.
-- **Channel prefixes**: Channels must start with `#`. If omitted, it's
-  automatically prepended.
-- **First joiner**: The first user to join a channel is automatically granted
-  operator status (`@`).
-- **Channel modes**: `+m` (moderated), `+t` (topic lock), `+o` (operator),
-  `+v` (voice)
-
-### Bridge to HTTP API
-
-Messages sent by IRC clients appear in channels visible to HTTP/JSON API
-clients and vice versa. The IRC listener and HTTP API share the same database,
-broker, and session infrastructure. A user connected via IRC and a user
-connected via the HTTP API can communicate in the same channels seamlessly.
-
-### Docker Usage
-
-To expose the IRC port in Docker (the listener is enabled by default on
-`:6667`):
-
-```bash
-docker run -d \
-  -p 8080:8080 \
-  -p 6667:6667 \
-  -v neoirc-data:/var/lib/neoirc \
-  neoirc
-```
-
----
-
 ## Deployment
 
 ### Docker (Recommended)
@@ -2591,7 +2468,8 @@ Clients should handle these message commands from the queue:
 - **HTTP 401**: Auth cookie expired or invalid. Re-create session or
   re-login (if a password was set).
 - **HTTP 404**: Channel or user not found.
-- **HTTP 409**: Nick already taken (on session creation or NICK change).
+- **HTTP 409**: Nick already taken (on session creation, registration, or
+  NICK change).
 - **HTTP 400**: Malformed request. Check the `error` field in the response.
 - **Network errors**: Back off exponentially (1s, 2s, 4s, ..., max 30s).
 
@@ -2724,49 +2602,6 @@ creating one session pays once and keeps their session.
 - **Language-agnostic**: SHA-256 is available in every programming language.
   The proof computation is trivially implementable in any client.
 
-### Login Rate Limiting
-
-The login endpoint (`POST /api/v1/login`) has per-IP rate limiting to prevent
-brute-force password attacks. This uses a token-bucket algorithm
-(`golang.org/x/time/rate`) with configurable rate and burst.
-
-| Environment Variable | Default | Description |
-|---------------------|---------|-------------|
-| `LOGIN_RATE_LIMIT`  | `1`     | Allowed login attempts per second per IP |
-| `LOGIN_RATE_BURST`  | `5`     | Maximum burst of login attempts per IP |
-
-When the limit is exceeded, the server returns **429 Too Many Requests** with a
-`Retry-After: 1` header. Stale per-IP entries are automatically cleaned up
-every 10 minutes.
-
-> **⚠️ Security: Reverse Proxy Required for Production Use**
->
-> The rate limiter extracts the client IP by checking the `X-Forwarded-For`
-> header first, then `X-Real-IP`, and finally falling back to the TCP
-> `RemoteAddr`. Both `X-Forwarded-For` and `X-Real-IP` are **client-controlled
-> request headers** — any client can set them to arbitrary values.
->
-> Without a properly configured reverse proxy in front of this server:
->
-> - An attacker can **bypass rate limiting entirely** by rotating
->   `X-Forwarded-For` values on each request (each value is treated as a
->   distinct IP).
-> - An attacker can **deny service to a specific user** by spoofing that user's
->   IP in the `X-Forwarded-For` header, exhausting their rate limit bucket.
->
-> **Recommendation:** Always deploy behind a reverse proxy (e.g. nginx, Caddy,
-> Traefik) that strips or overwrites incoming `X-Forwarded-For` and `X-Real-IP`
-> headers with the actual client IP. If running without a reverse proxy, be
-> aware that the rate limiting provides no meaningful protection against a
-> targeted attack.
-
-**Why rate limits here but not on session creation?** Session creation is
-protected by hashcash proof-of-work (stateless, no IP tracking needed). Login
-involves bcrypt password verification against a registered account — a
-fundamentally different threat model where an attacker targets a specific
-account. Per-IP rate limiting is appropriate here because the cost of a wrong
-guess is borne by the server (bcrypt), not the client.
-
 ---
 
 ## Roadmap
@@ -2798,19 +2633,17 @@ guess is borne by the server (bcrypt), not the client.
 - [x] **Hashcash proof-of-work** for session creation (abuse prevention)
 - [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)
+- [ ] **Channel modes** — enforce `+i`, `+m`, `+s`, `+t`, `+n`
-- [x] **Channel modes (tier 2)** — enforce `+i` (invite-only), `+s` (secret), `+b` (ban), `+k` (key), `+l` (limit)
+- [ ] **User channel modes** — `+o` (operator), `+v` (voice)
-- [x] **User channel modes** — `+o` (operator), `+v` (voice) with NAMES prefixes
+- [x] **MODE command** — query channel and user modes (set not yet implemented)
-- [x] **KICK command** — operator-only channel kick with broadcast
+- [x] **NAMES command** — query channel member list
-- [x] **MODE command** — query and set channel/user modes
-- [x] **NAMES command** — query channel member list with @/+ prefixes
 - [x] **LIST command** — list all channels with member counts
 - [x] **WHOIS command** — query user information and channel membership
 - [x] **WHO command** — query channel user list
 - [x] **LUSERS command** — query server statistics
 - [x] **Connection registration numerics** — 001-005 sent on session creation
 - [x] **LUSERS numerics** — 251/252/254/255 sent on connect and via /LUSERS
-- [x] **KICK command** — remove users from channels (operator-only)
+- [ ] **KICK command** — remove users from channels
 - [x] **Numeric replies** — send IRC numeric codes via the message queue
   (001-005 welcome, 251-255 LUSERS, 311-319 WHOIS, 322-329 LIST/MODE,
   331-332 TOPIC, 352-353 WHO/NAMES, 366, 372-376 MOTD, 401-461 errors)
@@ -2820,10 +2653,6 @@ guess is borne by the server (bcrypt), not the client.
   login from additional devices via `POST /api/v1/login`
 - [x] **Cookie-based auth** — HttpOnly cookies replace Bearer tokens for
   all API authentication
-- [x] **Tier 3 utility commands** — USERHOST (302), VERSION (351), ADMIN
-  (256–259), INFO (371/374), TIME (391), KILL (oper-only forced
-  disconnect), WALLOPS (oper-only broadcast to +w users)
-- [x] **User mode +w** — wallops usermode via `MODE nick +w/-w`
 
 ### Future (1.0+)
 

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,16 @@
 package main
 
 import (
+	"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/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"
-	"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 (
@@ -31,23 +28,16 @@ func main() {
 
 	fx.New(
 		fx.Provide(
-			broker.New,
 			config.New,
 			db.New,
 			globals.New,
 			handlers.New,
-			ircserver.New,
 			logger.New,
 			server.New,
 			middleware.New,
 			healthcheck.New,
-			service.New,
 			stats.New,
 		),
-		fx.Invoke(func(
+		fx.Invoke(func(*server.Server) {}),
-			_ *server.Server,
-			_ *ircserver.Server,
-		) {
-		}),
 	).Run()
 }

go.mod

@@ -1,4 +1,4 @@
-module sneak.berlin/go/neoirc
+module git.eeqj.de/sneak/neoirc
 
 go 1.24.0
 
@@ -16,7 +16,6 @@ require (
 	github.com/spf13/viper v1.21.0
 	go.uber.org/fx v1.24.0
 	golang.org/x/crypto v0.48.0
-	golang.org/x/time v0.6.0
 	modernc.org/sqlite v1.45.0
 )
 

go.sum

@@ -151,8 +151,6 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
 golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
-golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
-golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

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
 )
@@ -48,9 +48,6 @@ type Config struct {
 	HashcashBits       int
 	OperName           string
 	OperPassword       string
-	LoginRateLimit     float64
-	LoginRateBurst     int
-	IRCListenAddr      string
 	params             *Params
 	log                *slog.Logger
 }
@@ -85,9 +82,6 @@ func New(
 	viper.SetDefault("NEOIRC_HASHCASH_BITS", "20")
 	viper.SetDefault("NEOIRC_OPER_NAME", "")
 	viper.SetDefault("NEOIRC_OPER_PASSWORD", "")
-	viper.SetDefault("LOGIN_RATE_LIMIT", "1")
-	viper.SetDefault("LOGIN_RATE_BURST", "5")
-	viper.SetDefault("IRC_LISTEN_ADDR", ":6667")
 
 	err := viper.ReadInConfig()
 	if err != nil {
@@ -116,9 +110,6 @@ func New(
 		HashcashBits:       viper.GetInt("NEOIRC_HASHCASH_BITS"),
 		OperName:           viper.GetString("NEOIRC_OPER_NAME"),
 		OperPassword:       viper.GetString("NEOIRC_OPER_PASSWORD"),
-		LoginRateLimit:     viper.GetFloat64("LOGIN_RATE_LIMIT"),
-		LoginRateBurst:     viper.GetInt("LOGIN_RATE_BURST"),
-		IRCListenAddr:      viper.GetString("IRC_LISTEN_ADDR"),
 		log:                log,
 		params:             &params,
 	}

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_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

@@ -10,7 +10,6 @@ CREATE TABLE IF NOT EXISTS sessions (
     hostname TEXT NOT NULL DEFAULT '',
     ip TEXT NOT NULL DEFAULT '',
     is_oper INTEGER NOT NULL DEFAULT 0,
-    is_wallops INTEGER NOT NULL DEFAULT 0,
     password_hash TEXT NOT NULL DEFAULT '',
     signing_key TEXT NOT NULL DEFAULT '',
     away_message TEXT NOT NULL DEFAULT '',
@@ -41,46 +40,15 @@ CREATE TABLE IF NOT EXISTS channels (
     topic_set_by TEXT NOT NULL DEFAULT '',
     topic_set_at DATETIME,
     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,
     channel_id INTEGER NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
     session_id INTEGER NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
-    is_operator INTEGER NOT NULL DEFAULT 0,
-    is_voiced INTEGER NOT NULL DEFAULT 0,
     joined_at DATETIME DEFAULT CURRENT_TIMESTAMP,
     UNIQUE(channel_id, session_id)
 );

internal/db/testing.go

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

internal/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
@@ -28,21 +28,6 @@ func (hdlr *Handlers) handleLogin(
 	writer http.ResponseWriter,
 	request *http.Request,
 ) {
-	ip := clientIP(request)
-
-	if !hdlr.loginLimiter.Allow(ip) {
-		writer.Header().Set(
-			"Retry-After", "1",
-		)
-		hdlr.respondError(
-			writer, request,
-			"too many login attempts, try again later",
-			http.StatusTooManyRequests,
-		)
-
-		return
-	}
-
 	type loginRequest struct {
 		Nick     string `json:"nick"`
 		Password string `json:"password"`
@@ -73,16 +58,6 @@ func (hdlr *Handlers) handleLogin(
 		return
 	}
 
-	hdlr.executeLogin(
-		writer, request, payload.Nick, payload.Password,
-	)
-}
-
-func (hdlr *Handlers) executeLogin(
-	writer http.ResponseWriter,
-	request *http.Request,
-	nick, password string,
-) {
 	remoteIP := clientIP(request)
 
 	hostname := resolveHostname(
@@ -92,7 +67,8 @@ func (hdlr *Handlers) executeLogin(
 	sessionID, clientID, token, err :=
 		hdlr.params.Database.LoginUser(
 			request.Context(),
-			nick, password,
+			payload.Nick,
+			payload.Password,
 			remoteIP, hostname,
 		)
 	if err != nil {
@@ -108,20 +84,20 @@ func (hdlr *Handlers) executeLogin(
 	hdlr.stats.IncrConnections()
 
 	hdlr.deliverMOTD(
-		request, clientID, sessionID, nick,
+		request, clientID, sessionID, payload.Nick,
 	)
 
 	// Initialize channel state so the new client knows
 	// which channels the session already belongs to.
 	hdlr.initChannelState(
-		request, clientID, sessionID, nick,
+		request, clientID, sessionID, payload.Nick,
 	)
 
 	hdlr.setAuthCookie(writer, request, token)
 
 	hdlr.respondJSON(writer, request, map[string]any{
 		"id":   sessionID,
-		"nick": nick,
+		"nick": payload.Nick,
 	}, http.StatusOK)
 }
 

internal/handlers/handlers.go

@@ -9,17 +9,15 @@ 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/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")
@@ -34,8 +32,6 @@ type Params struct {
 	Database    *db.Database
 	Healthcheck *healthcheck.Healthcheck
 	Stats       *stats.Tracker
-	Broker      *broker.Broker
-	Service     *service.Service
 }
 
 const defaultIdleTimeout = 30 * 24 * time.Hour
@@ -51,10 +47,8 @@ type Handlers struct {
 	log             *slog.Logger
 	hc              *healthcheck.Healthcheck
 	broker          *broker.Broker
-	svc             *service.Service
 	hashcashVal     *hashcash.Validator
 	channelHashcash *hashcash.ChannelValidator
-	loginLimiter    *ratelimit.Limiter
 	stats           *stats.Tracker
 	cancelCleanup   context.CancelFunc
 }
@@ -69,25 +63,13 @@ func New(
 		resource = "neoirc"
 	}
 
-	loginRate := params.Config.LoginRateLimit
-	if loginRate <= 0 {
-		loginRate = ratelimit.DefaultRate
-	}
-
-	loginBurst := params.Config.LoginRateBurst
-	if loginBurst <= 0 {
-		loginBurst = ratelimit.DefaultBurst
-	}
-
 	hdlr := &Handlers{ //nolint:exhaustruct // cancelCleanup set in startCleanup
 		params:          &params,
 		log:             params.Logger.Get(),
 		hc:              params.Healthcheck,
-		broker:          params.Broker,
+		broker:          broker.New(),
-		svc:             params.Service,
 		hashcashVal:     hashcash.NewValidator(resource),
 		channelHashcash: hashcash.NewChannelValidator(),
-		loginLimiter:    ratelimit.New(loginRate, loginBurst),
 		stats:           params.Stats,
 	}
 
@@ -180,10 +162,6 @@ func (hdlr *Handlers) stopCleanup() {
 	if hdlr.cancelCleanup != nil {
 		hdlr.cancelCleanup()
 	}
-
-	if hdlr.loginLimiter != nil {
-		hdlr.loginLimiter.Stop()
-	}
 }
 
 func (hdlr *Handlers) cleanupLoop(ctx context.Context) {

internal/handlers/utility.go

@@ -1,659 +0,0 @@
-package handlers
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/pkg/irc"
-)
-
-// maxUserhostNicks is the maximum number of nicks allowed
-// in a single USERHOST query (RFC 2812).
-const maxUserhostNicks = 5
-
-// dispatchBodyOnlyCommand routes commands that take
-// (writer, request, sessionID, clientID, nick, bodyLines).
-func (hdlr *Handlers) dispatchBodyOnlyCommand(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, command string,
-	bodyLines func() []string,
-) {
-	switch command {
-	case irc.CmdAway:
-		hdlr.handleAway(
-			writer, request,
-			sessionID, clientID, nick, bodyLines,
-		)
-	case irc.CmdNick:
-		hdlr.handleNick(
-			writer, request,
-			sessionID, clientID, nick, bodyLines,
-		)
-	case irc.CmdPass:
-		hdlr.handlePass(
-			writer, request,
-			sessionID, clientID, nick, bodyLines,
-		)
-	case irc.CmdInvite:
-		hdlr.handleInvite(
-			writer, request,
-			sessionID, clientID, nick, bodyLines,
-		)
-	}
-}
-
-// dispatchOperCommand routes oper-related commands (OPER,
-// KILL, WALLOPS) to their handlers.
-func (hdlr *Handlers) dispatchOperCommand(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, command string,
-	bodyLines func() []string,
-) {
-	switch command {
-	case irc.CmdOper:
-		hdlr.handleOper(
-			writer, request,
-			sessionID, clientID, nick, bodyLines,
-		)
-	case irc.CmdKill:
-		hdlr.handleKill(
-			writer, request,
-			sessionID, clientID, nick, bodyLines,
-		)
-	case irc.CmdWallops:
-		hdlr.handleWallops(
-			writer, request,
-			sessionID, clientID, nick, bodyLines,
-		)
-	}
-}
-
-// handleUserhost handles the USERHOST command.
-// Returns user@host info for up to 5 nicks.
-func (hdlr *Handlers) handleUserhost(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick string,
-	bodyLines func() []string,
-) {
-	ctx := request.Context()
-
-	lines := bodyLines()
-	if len(lines) == 0 {
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrNeedMoreParams, nick,
-			[]string{irc.CmdUserhost},
-			"Not enough parameters",
-		)
-
-		return
-	}
-
-	// Limit to 5 nicks per RFC 2812.
-	nicks := lines
-	if len(nicks) > maxUserhostNicks {
-		nicks = nicks[:maxUserhostNicks]
-	}
-
-	infos, err := hdlr.params.Database.GetUserhostInfo(
-		ctx, nicks,
-	)
-	if err != nil {
-		hdlr.log.Error(
-			"userhost query failed", "error", err,
-		)
-		hdlr.respondError(
-			writer, request,
-			"internal error",
-			http.StatusInternalServerError,
-		)
-
-		return
-	}
-
-	replyStr := hdlr.buildUserhostReply(infos)
-
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplUserHost, nick, nil,
-		replyStr,
-	)
-
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// buildUserhostReply builds the RPL_USERHOST reply
-// string per RFC 2812.
-func (hdlr *Handlers) buildUserhostReply(
-	infos []db.UserhostInfo,
-) string {
-	replies := make([]string, 0, len(infos))
-
-	for idx := range infos {
-		info := &infos[idx]
-
-		username := info.Username
-		if username == "" {
-			username = info.Nick
-		}
-
-		hostname := info.Hostname
-		if hostname == "" {
-			hostname = hdlr.serverName()
-		}
-
-		operStar := ""
-		if info.IsOper {
-			operStar = "*"
-		}
-
-		awayPrefix := "+"
-		if info.AwayMessage != "" {
-			awayPrefix = "-"
-		}
-
-		replies = append(replies,
-			info.Nick+operStar+"="+
-				awayPrefix+username+"@"+hostname,
-		)
-	}
-
-	return strings.Join(replies, " ")
-}
-
-// handleVersion handles the VERSION command.
-// Returns the server version string.
-func (hdlr *Handlers) handleVersion(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick string,
-) {
-	ctx := request.Context()
-	srvName := hdlr.serverName()
-	version := hdlr.serverVersion()
-
-	// 351 RPL_VERSION
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplVersion, nick,
-		[]string{version + ".", srvName},
-		"",
-	)
-
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// handleAdmin handles the ADMIN command.
-// Returns server admin contact info.
-func (hdlr *Handlers) handleAdmin(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick string,
-) {
-	ctx := request.Context()
-	srvName := hdlr.serverName()
-
-	// 256 RPL_ADMINME
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplAdminMe, nick,
-		[]string{srvName},
-		"Administrative info",
-	)
-
-	// 257 RPL_ADMINLOC1
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplAdminLoc1, nick, nil,
-		"neoirc server",
-	)
-
-	// 258 RPL_ADMINLOC2
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplAdminLoc2, nick, nil,
-		"IRC over HTTP",
-	)
-
-	// 259 RPL_ADMINEMAIL
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplAdminEmail, nick, nil,
-		"admin@"+srvName,
-	)
-
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// handleInfo handles the INFO command.
-// Returns server software information.
-func (hdlr *Handlers) handleInfo(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick string,
-) {
-	ctx := request.Context()
-	version := hdlr.serverVersion()
-
-	infoLines := []string{
-		"neoirc — IRC semantics over HTTP",
-		"Version: " + version,
-		"Written in Go",
-		"Started: " +
-			hdlr.params.Globals.StartTime.
-				Format(time.RFC1123),
-	}
-
-	for _, line := range infoLines {
-		// 371 RPL_INFO
-		hdlr.enqueueNumeric(
-			ctx, clientID, irc.RplInfo, nick, nil,
-			line,
-		)
-	}
-
-	// 374 RPL_ENDOFINFO
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplEndOfInfo, nick, nil,
-		"End of /INFO list",
-	)
-
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// handleTime handles the TIME command.
-// Returns the server's local time in RFC format.
-func (hdlr *Handlers) handleTime(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick string,
-) {
-	ctx := request.Context()
-	srvName := hdlr.serverName()
-
-	// 391 RPL_TIME
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplTime, nick,
-		[]string{srvName},
-		time.Now().Format(time.RFC1123),
-	)
-
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// handleKill handles the KILL command.
-// Forcibly disconnects a user (oper only).
-func (hdlr *Handlers) handleKill(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick string,
-	bodyLines func() []string,
-) {
-	ctx := request.Context()
-
-	// Check oper status.
-	isOper, err := hdlr.params.Database.IsSessionOper(
-		ctx, sessionID,
-	)
-	if err != nil || !isOper {
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrNoPrivileges, nick, nil,
-			"Permission Denied- You're not an IRC operator",
-		)
-
-		return
-	}
-
-	lines := bodyLines()
-
-	var targetNick string
-	if len(lines) > 0 {
-		targetNick = strings.TrimSpace(lines[0])
-	}
-
-	if targetNick == "" {
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrNeedMoreParams, nick,
-			[]string{irc.CmdKill},
-			"Not enough parameters",
-		)
-
-		return
-	}
-
-	reason := "KILLed"
-	if len(lines) > 1 {
-		reason = lines[1]
-	}
-
-	targetSID, lookupErr := hdlr.params.Database.
-		GetSessionByNick(ctx, targetNick)
-	if lookupErr != nil {
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrNoSuchNick, nick,
-			[]string{targetNick},
-			"No such nick/channel",
-		)
-
-		return
-	}
-
-	// Do not allow killing yourself.
-	if targetSID == sessionID {
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrCantKillServer, nick, nil,
-			"You cannot KILL yourself",
-		)
-
-		return
-	}
-
-	quitReason := "Killed (" + nick + " (" + reason + "))"
-
-	hdlr.svc.BroadcastQuit(
-		request.Context(), targetSID,
-		targetNick, quitReason,
-	)
-
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// handleWallops handles the WALLOPS command.
-// Broadcasts a message to all users with +w usermode
-// (oper only).
-func (hdlr *Handlers) handleWallops(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick string,
-	bodyLines func() []string,
-) {
-	ctx := request.Context()
-
-	// Check oper status.
-	isOper, err := hdlr.params.Database.IsSessionOper(
-		ctx, sessionID,
-	)
-	if err != nil || !isOper {
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrNoPrivileges, nick, nil,
-			"Permission Denied- You're not an IRC operator",
-		)
-
-		return
-	}
-
-	lines := bodyLines()
-	if len(lines) == 0 {
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrNeedMoreParams, nick,
-			[]string{irc.CmdWallops},
-			"Not enough parameters",
-		)
-
-		return
-	}
-
-	message := strings.Join(lines, " ")
-
-	wallopsSIDs, err := hdlr.params.Database.
-		GetWallopsSessionIDs(ctx)
-	if err != nil {
-		hdlr.log.Error(
-			"get wallops sessions failed", "error", err,
-		)
-		hdlr.respondError(
-			writer, request,
-			"internal error",
-			http.StatusInternalServerError,
-		)
-
-		return
-	}
-
-	if len(wallopsSIDs) > 0 {
-		body, mErr := json.Marshal([]string{message})
-		if mErr != nil {
-			hdlr.log.Error(
-				"marshal wallops body", "error", mErr,
-			)
-			hdlr.respondError(
-				writer, request,
-				"internal error",
-				http.StatusInternalServerError,
-			)
-
-			return
-		}
-
-		_ = hdlr.fanOutSilent(
-			request, irc.CmdWallops, nick, "*",
-			json.RawMessage(body), wallopsSIDs,
-		)
-	}
-
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// handleUserMode handles user mode queries and changes
-// (e.g., MODE nick, MODE nick +w).
-func (hdlr *Handlers) handleUserMode(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, target string,
-	bodyLines func() []string,
-) {
-	ctx := request.Context()
-
-	lines := bodyLines()
-
-	// Mode change requested.
-	if len(lines) > 0 {
-		// Users can only change their own modes.
-		if target != nick && target != "" {
-			hdlr.respondIRCError(
-				writer, request, clientID, sessionID,
-				irc.ErrUsersDoNotMatch, nick, nil,
-				"Can't change mode for other users",
-			)
-
-			return
-		}
-
-		hdlr.applyUserModeChange(
-			writer, request,
-			sessionID, clientID, nick, lines[0],
-		)
-
-		return
-	}
-
-	// Mode query — build the current mode string.
-	modeStr := hdlr.buildUserModeString(ctx, sessionID)
-
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplUmodeIs, nick, nil,
-		modeStr,
-	)
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// buildUserModeString constructs the mode string for a
-// user (e.g., "+ow" for oper+wallops).
-func (hdlr *Handlers) buildUserModeString(
-	ctx context.Context,
-	sessionID int64,
-) string {
-	modes := "+"
-
-	isOper, err := hdlr.params.Database.IsSessionOper(
-		ctx, sessionID,
-	)
-	if err == nil && isOper {
-		modes += "o"
-	}
-
-	isWallops, err := hdlr.params.Database.IsSessionWallops(
-		ctx, sessionID,
-	)
-	if err == nil && isWallops {
-		modes += "w"
-	}
-
-	return modes
-}
-
-// applyUserModeChange applies a user mode change string
-// (e.g., "+w", "-w").
-func (hdlr *Handlers) applyUserModeChange(
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, modeStr string,
-) {
-	ctx := request.Context()
-
-	if len(modeStr) < 2 { //nolint:mnd // +/- and mode char
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrUmodeUnknownFlag, nick, nil,
-			"Unknown MODE flag",
-		)
-
-		return
-	}
-
-	adding := modeStr[0] == '+'
-	modeChar := modeStr[1:]
-
-	applied, err := hdlr.applyModeChar(
-		ctx, writer, request,
-		sessionID, clientID, nick,
-		modeChar, adding,
-	)
-	if err != nil || !applied {
-		return
-	}
-
-	newModes := hdlr.buildUserModeString(ctx, sessionID)
-
-	hdlr.enqueueNumeric(
-		ctx, clientID, irc.RplUmodeIs, nick, nil,
-		newModes,
-	)
-
-	hdlr.broker.Notify(sessionID)
-	hdlr.respondJSON(writer, request,
-		map[string]string{"status": "ok"},
-		http.StatusOK)
-}
-
-// applyModeChar applies a single user mode character.
-// Returns (applied, error).
-func (hdlr *Handlers) applyModeChar(
-	ctx context.Context,
-	writer http.ResponseWriter,
-	request *http.Request,
-	sessionID, clientID int64,
-	nick, modeChar string,
-	adding bool,
-) (bool, error) {
-	switch modeChar {
-	case "w":
-		err := hdlr.params.Database.SetSessionWallops(
-			ctx, sessionID, adding,
-		)
-		if err != nil {
-			hdlr.log.Error(
-				"set wallops mode failed", "error", err,
-			)
-			hdlr.respondError(
-				writer, request,
-				"internal error",
-				http.StatusInternalServerError,
-			)
-
-			return false, fmt.Errorf(
-				"set wallops: %w", err,
-			)
-		}
-	case "o":
-		// +o cannot be set via MODE, only via OPER.
-		if adding {
-			hdlr.respondIRCError(
-				writer, request, clientID, sessionID,
-				irc.ErrUmodeUnknownFlag, nick, nil,
-				"Unknown MODE flag",
-			)
-
-			return false, nil
-		}
-
-		err := hdlr.params.Database.SetSessionOper(
-			ctx, sessionID, false,
-		)
-		if err != nil {
-			hdlr.log.Error(
-				"clear oper mode failed", "error", err,
-			)
-			hdlr.respondError(
-				writer, request,
-				"internal error",
-				http.StatusInternalServerError,
-			)
-
-			return false, fmt.Errorf(
-				"clear oper: %w", err,
-			)
-		}
-	default:
-		hdlr.respondIRCError(
-			writer, request, clientID, sessionID,
-			irc.ErrUmodeUnknownFlag, nick, nil,
-			"Unknown MODE flag",
-		)
-
-		return false, nil
-	}
-
-	return true, nil
-}

internal/handlers/utility_test.go

@@ -1,982 +0,0 @@
-// Tests for Tier 3 utility IRC commands: USERHOST,
-// VERSION, ADMIN, INFO, TIME, KILL, WALLOPS.
-//
-//nolint:paralleltest
-package handlers_test
-
-import (
-	"strings"
-	"testing"
-)
-
-// --- USERHOST ---
-
-func TestUserhostSingleNick(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("alice")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "USERHOST",
-		bodyKey:    []string{"alice"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 302 RPL_USERHOST.
-	msg := findNumericWithParams(msgs, "302")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_USERHOST (302), got %v",
-			msgs,
-		)
-	}
-
-	// Body should contain "alice" with the
-	// nick=+user@host format.
-	body := getNumericBody(msg)
-	if !strings.Contains(body, "alice") {
-		t.Fatalf(
-			"expected body to contain 'alice', got %q",
-			body,
-		)
-	}
-
-	// '+' means not away.
-	if !strings.Contains(body, "=+") {
-		t.Fatalf(
-			"expected not-away prefix '=+', got %q",
-			body,
-		)
-	}
-}
-
-func TestUserhostMultipleNicks(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token1 := tserver.createSession("bob")
-	token2 := tserver.createSession("carol")
-
-	_ = token2
-
-	_, lastID := tserver.pollMessages(token1, 0)
-
-	tserver.sendCommand(token1, map[string]any{
-		commandKey: "USERHOST",
-		bodyKey:    []string{"bob", "carol"},
-	})
-
-	msgs, _ := tserver.pollMessages(token1, lastID)
-
-	msg := findNumericWithParams(msgs, "302")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_USERHOST (302), got %v",
-			msgs,
-		)
-	}
-
-	body := getNumericBody(msg)
-	if !strings.Contains(body, "bob") {
-		t.Fatalf(
-			"expected body to contain 'bob', got %q",
-			body,
-		)
-	}
-
-	if !strings.Contains(body, "carol") {
-		t.Fatalf(
-			"expected body to contain 'carol', got %q",
-			body,
-		)
-	}
-}
-
-func TestUserhostNonexistentNick(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("dave")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "USERHOST",
-		bodyKey:    []string{"nobody"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Should still get 302 but with empty body.
-	msg := findNumericWithParams(msgs, "302")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_USERHOST (302), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestUserhostNoParams(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("eve")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "USERHOST",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 461 ERR_NEEDMOREPARAMS.
-	if !findNumeric(msgs, "461") {
-		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestUserhostShowsOper(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	token := tserver.createSession("opernick")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	// Authenticate as oper.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	_, lastID = tserver.pollMessages(token, lastID)
-
-	// USERHOST should show '*' for oper.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "USERHOST",
-		bodyKey:    []string{"opernick"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	msg := findNumericWithParams(msgs, "302")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_USERHOST (302), got %v",
-			msgs,
-		)
-	}
-
-	body := getNumericBody(msg)
-	if !strings.Contains(body, "opernick*=") {
-		t.Fatalf(
-			"expected oper '*' in reply, got %q",
-			body,
-		)
-	}
-}
-
-func TestUserhostShowsAway(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("awaynick")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	// Set away.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "AWAY",
-		bodyKey:    []string{"gone fishing"},
-	})
-
-	_, lastID = tserver.pollMessages(token, lastID)
-
-	// USERHOST should show '-' for away.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "USERHOST",
-		bodyKey:    []string{"awaynick"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	msg := findNumericWithParams(msgs, "302")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_USERHOST (302), got %v",
-			msgs,
-		)
-	}
-
-	body := getNumericBody(msg)
-	if !strings.Contains(body, "=-") {
-		t.Fatalf(
-			"expected away prefix '=-' in reply, got %q",
-			body,
-		)
-	}
-}
-
-// --- VERSION ---
-
-func TestVersion(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("frank")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "VERSION",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 351 RPL_VERSION.
-	msg := findNumericWithParams(msgs, "351")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_VERSION (351), got %v",
-			msgs,
-		)
-	}
-
-	params := getNumericParams(msg)
-	if len(params) == 0 {
-		t.Fatal("expected VERSION params, got none")
-	}
-
-	// First param should contain version string.
-	if !strings.Contains(params[0], "test") {
-		t.Fatalf(
-			"expected version to contain 'test', got %q",
-			params[0],
-		)
-	}
-}
-
-// --- ADMIN ---
-
-func TestAdmin(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("grace")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "ADMIN",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 256 RPL_ADMINME.
-	if !findNumeric(msgs, "256") {
-		t.Fatalf(
-			"expected RPL_ADMINME (256), got %v",
-			msgs,
-		)
-	}
-
-	// Expect 257 RPL_ADMINLOC1.
-	if !findNumeric(msgs, "257") {
-		t.Fatalf(
-			"expected RPL_ADMINLOC1 (257), got %v",
-			msgs,
-		)
-	}
-
-	// Expect 258 RPL_ADMINLOC2.
-	if !findNumeric(msgs, "258") {
-		t.Fatalf(
-			"expected RPL_ADMINLOC2 (258), got %v",
-			msgs,
-		)
-	}
-
-	// Expect 259 RPL_ADMINEMAIL.
-	if !findNumeric(msgs, "259") {
-		t.Fatalf(
-			"expected RPL_ADMINEMAIL (259), got %v",
-			msgs,
-		)
-	}
-}
-
-// --- INFO ---
-
-func TestInfo(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("hank")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "INFO",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 371 RPL_INFO (at least one).
-	if !findNumeric(msgs, "371") {
-		t.Fatalf(
-			"expected RPL_INFO (371), got %v",
-			msgs,
-		)
-	}
-
-	// Expect 374 RPL_ENDOFINFO.
-	if !findNumeric(msgs, "374") {
-		t.Fatalf(
-			"expected RPL_ENDOFINFO (374), got %v",
-			msgs,
-		)
-	}
-}
-
-// --- TIME ---
-
-func TestTime(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("iris")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "TIME",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 391 RPL_TIME.
-	msg := findNumericWithParams(msgs, "391")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_TIME (391), got %v",
-			msgs,
-		)
-	}
-}
-
-// --- KILL ---
-
-func TestKillSuccess(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	// Create the victim first.
-	victimToken := tserver.createSession("victim")
-	_ = victimToken
-
-	// Create oper user.
-	operToken := tserver.createSession("killer")
-	_, lastID := tserver.pollMessages(operToken, 0)
-
-	// Authenticate as oper.
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	_, lastID = tserver.pollMessages(operToken, lastID)
-
-	// Kill the victim.
-	status, result := tserver.sendCommand(
-		operToken, map[string]any{
-			commandKey: "KILL",
-			bodyKey:    []string{"victim", "go away"},
-		},
-	)
-
-	if status != 200 {
-		t.Fatalf("expected 200, got %d: %v", status, result)
-	}
-
-	resultStatus, _ := result[statusKey].(string)
-	if resultStatus != "ok" {
-		t.Fatalf(
-			"expected status ok, got %v",
-			result,
-		)
-	}
-
-	// Verify the victim's session is gone by trying
-	// to WHOIS them.
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "WHOIS",
-		toKey:      "victim",
-	})
-
-	msgs, _ := tserver.pollMessages(operToken, lastID)
-
-	// Should get 401 ERR_NOSUCHNICK.
-	if !findNumeric(msgs, "401") {
-		t.Fatalf(
-			"expected victim to be gone (401), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestKillNotOper(t *testing.T) {
-	tserver := newTestServer(t)
-
-	_ = tserver.createSession("target")
-
-	token := tserver.createSession("notoper")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "KILL",
-		bodyKey:    []string{"target", "no reason"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 481 ERR_NOPRIVILEGES.
-	if !findNumeric(msgs, "481") {
-		t.Fatalf(
-			"expected ERR_NOPRIVILEGES (481), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestKillNoParams(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	token := tserver.createSession("opertest")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	_, lastID = tserver.pollMessages(token, lastID)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "KILL",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 461 ERR_NEEDMOREPARAMS.
-	if !findNumeric(msgs, "461") {
-		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
-			msgs,
-		)
-	}
-}
-
-// sendOperKillCommand is a helper that creates an oper
-// session, authenticates, then sends KILL with the given
-// target nick, and returns the resulting messages.
-func sendOperKillCommand(
-	t *testing.T,
-	tserver *testServer,
-	operNick, targetNick string,
-) []map[string]any {
-	t.Helper()
-
-	token := tserver.createSession(operNick)
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	_, lastID = tserver.pollMessages(token, lastID)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "KILL",
-		bodyKey:    []string{targetNick},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	return msgs
-}
-
-func TestKillNonexistentUser(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	msgs := sendOperKillCommand(
-		t, tserver, "opertest2", "ghost",
-	)
-
-	// Expect 401 ERR_NOSUCHNICK.
-	if !findNumeric(msgs, "401") {
-		t.Fatalf(
-			"expected ERR_NOSUCHNICK (401), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestKillSelf(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	msgs := sendOperKillCommand(
-		t, tserver, "selfkiller", "selfkiller",
-	)
-
-	// Expect 483 ERR_CANTKILLSERVER.
-	if !findNumeric(msgs, "483") {
-		t.Fatalf(
-			"expected ERR_CANTKILLSERVER (483), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestKillBroadcastsQuit(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	// Create victim and join a channel.
-	victimToken := tserver.createSession("vuser")
-
-	tserver.sendCommand(victimToken, map[string]any{
-		commandKey: joinCmd,
-		toKey:      "#killtest",
-	})
-
-	// Create observer and join same channel.
-	observerToken := tserver.createSession("observer")
-
-	tserver.sendCommand(observerToken, map[string]any{
-		commandKey: joinCmd,
-		toKey:      "#killtest",
-	})
-
-	_, lastObs := tserver.pollMessages(observerToken, 0)
-
-	// Create oper.
-	operToken := tserver.createSession("theoper2")
-
-	tserver.pollMessages(operToken, 0)
-
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	tserver.pollMessages(operToken, 0)
-
-	// Kill the victim.
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "KILL",
-		bodyKey:    []string{"vuser", "testing kill"},
-	})
-
-	// Observer should see a QUIT message.
-	msgs, _ := tserver.pollMessages(observerToken, lastObs)
-
-	foundQuit := false
-
-	for _, msg := range msgs {
-		cmd, _ := msg["command"].(string)
-		if cmd == "QUIT" {
-			from, _ := msg["from"].(string)
-			if from == "vuser" {
-				foundQuit = true
-
-				break
-			}
-		}
-	}
-
-	if !foundQuit {
-		t.Fatalf(
-			"expected QUIT from vuser, got %v",
-			msgs,
-		)
-	}
-}
-
-// --- WALLOPS ---
-
-func TestWallopsSuccess(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	// Create receiver with +w.
-	receiverToken := tserver.createSession("receiver")
-
-	tserver.sendCommand(receiverToken, map[string]any{
-		commandKey: "MODE",
-		toKey:      "receiver",
-		bodyKey:    []string{"+w"},
-	})
-
-	_, lastRecv := tserver.pollMessages(receiverToken, 0)
-
-	// Create oper.
-	operToken := tserver.createSession("walloper")
-
-	tserver.pollMessages(operToken, 0)
-
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	tserver.pollMessages(operToken, 0)
-
-	// Also set +w on oper so they receive it too.
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "MODE",
-		toKey:      "walloper",
-		bodyKey:    []string{"+w"},
-	})
-
-	tserver.pollMessages(operToken, 0)
-
-	// Send WALLOPS.
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "WALLOPS",
-		bodyKey:    []string{"server going down"},
-	})
-
-	// Receiver should get the WALLOPS message.
-	msgs, _ := tserver.pollMessages(receiverToken, lastRecv)
-
-	foundWallops := false
-
-	for _, msg := range msgs {
-		cmd, _ := msg["command"].(string)
-		if cmd == "WALLOPS" {
-			foundWallops = true
-
-			break
-		}
-	}
-
-	if !foundWallops {
-		t.Fatalf(
-			"expected WALLOPS message, got %v",
-			msgs,
-		)
-	}
-}
-
-func TestWallopsNotOper(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("notoper2")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "WALLOPS",
-		bodyKey:    []string{"hello"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 481 ERR_NOPRIVILEGES.
-	if !findNumeric(msgs, "481") {
-		t.Fatalf(
-			"expected ERR_NOPRIVILEGES (481), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestWallopsNoParams(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	token := tserver.createSession("operempty")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	_, lastID = tserver.pollMessages(token, lastID)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "WALLOPS",
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 461 ERR_NEEDMOREPARAMS.
-	if !findNumeric(msgs, "461") {
-		t.Fatalf(
-			"expected ERR_NEEDMOREPARAMS (461), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestWallopsNotReceivedWithoutW(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	// Create receiver WITHOUT +w.
-	receiverToken := tserver.createSession("nowallops")
-	_, lastRecv := tserver.pollMessages(receiverToken, 0)
-
-	// Create oper.
-	operToken := tserver.createSession("walloper2")
-
-	tserver.pollMessages(operToken, 0)
-
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	tserver.pollMessages(operToken, 0)
-
-	// Send WALLOPS.
-	tserver.sendCommand(operToken, map[string]any{
-		commandKey: "WALLOPS",
-		bodyKey:    []string{"secret message"},
-	})
-
-	// Receiver should NOT get the WALLOPS message.
-	msgs, _ := tserver.pollMessages(receiverToken, lastRecv)
-
-	for _, msg := range msgs {
-		cmd, _ := msg["command"].(string)
-		if cmd == "WALLOPS" {
-			t.Fatalf(
-				"did not expect WALLOPS for user "+
-					"without +w, got %v",
-				msgs,
-			)
-		}
-	}
-}
-
-// --- User Mode +w ---
-
-func TestUserModeSetW(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("wmoder")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	// Set +w.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "wmoder",
-		bodyKey:    []string{"+w"},
-	})
-
-	msgs, lastID := tserver.pollMessages(token, lastID)
-
-	// Expect 221 RPL_UMODEIS with "+w".
-	msg := findNumericWithParams(msgs, "221")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_UMODEIS (221), got %v",
-			msgs,
-		)
-	}
-
-	body := getNumericBody(msg)
-	if !strings.Contains(body, "w") {
-		t.Fatalf(
-			"expected mode string to contain 'w', got %q",
-			body,
-		)
-	}
-
-	// Now query mode.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "wmoder",
-	})
-
-	msgs, _ = tserver.pollMessages(token, lastID)
-
-	msg = findNumericWithParams(msgs, "221")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_UMODEIS (221) on query, got %v",
-			msgs,
-		)
-	}
-
-	body = getNumericBody(msg)
-	if !strings.Contains(body, "w") {
-		t.Fatalf(
-			"expected mode '+w' in query, got %q",
-			body,
-		)
-	}
-}
-
-func TestUserModeUnsetW(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("wunsetter")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	// Set +w first.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "wunsetter",
-		bodyKey:    []string{"+w"},
-	})
-
-	_, lastID = tserver.pollMessages(token, lastID)
-
-	// Unset -w.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "wunsetter",
-		bodyKey:    []string{"-w"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	msg := findNumericWithParams(msgs, "221")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_UMODEIS (221), got %v",
-			msgs,
-		)
-	}
-
-	body := getNumericBody(msg)
-	if strings.Contains(body, "w") {
-		t.Fatalf(
-			"expected 'w' to be removed, got %q",
-			body,
-		)
-	}
-}
-
-func TestUserModeUnknownFlag(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("badmode")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "badmode",
-		bodyKey:    []string{"+z"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 501 ERR_UMODEUNKNOWNFLAG.
-	if !findNumeric(msgs, "501") {
-		t.Fatalf(
-			"expected ERR_UMODEUNKNOWNFLAG (501), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestUserModeCannotSetO(t *testing.T) {
-	tserver := newTestServer(t)
-
-	token := tserver.createSession("tryoper")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	// Try to set +o via MODE (should fail).
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "tryoper",
-		bodyKey:    []string{"+o"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 501 ERR_UMODEUNKNOWNFLAG.
-	if !findNumeric(msgs, "501") {
-		t.Fatalf(
-			"expected ERR_UMODEUNKNOWNFLAG (501), got %v",
-			msgs,
-		)
-	}
-}
-
-func TestUserModeDeoper(t *testing.T) {
-	tserver := newTestServerWithOper(t)
-
-	token := tserver.createSession("deoper")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	// Authenticate as oper.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "OPER",
-		bodyKey:    []string{testOperName, testOperPassword},
-	})
-
-	_, lastID = tserver.pollMessages(token, lastID)
-
-	// Use MODE -o to de-oper.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "deoper",
-		bodyKey:    []string{"-o"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	msg := findNumericWithParams(msgs, "221")
-	if msg == nil {
-		t.Fatalf(
-			"expected RPL_UMODEIS (221), got %v",
-			msgs,
-		)
-	}
-
-	body := getNumericBody(msg)
-	if strings.Contains(body, "o") {
-		t.Fatalf(
-			"expected 'o' to be removed, got %q",
-			body,
-		)
-	}
-}
-
-func TestUserModeCannotChangeOtherUser(t *testing.T) {
-	tserver := newTestServer(t)
-
-	_ = tserver.createSession("other")
-
-	token := tserver.createSession("changer")
-	_, lastID := tserver.pollMessages(token, 0)
-
-	// Try to change another user's mode.
-	tserver.sendCommand(token, map[string]any{
-		commandKey: "MODE",
-		toKey:      "other",
-		bodyKey:    []string{"+w"},
-	})
-
-	msgs, _ := tserver.pollMessages(token, lastID)
-
-	// Expect 502 ERR_USERSDONTMATCH.
-	if !findNumeric(msgs, "502") {
-		t.Fatalf(
-			"expected ERR_USERSDONTMATCH (502), got %v",
-			msgs,
-		)
-	}
-}
-
-// getNumericBody extracts the body text from a numeric
-// message. The body is stored as a JSON array; this
-// returns the first element.
-func getNumericBody(msg map[string]any) string {
-	raw, exists := msg["body"]
-	if !exists || raw == nil {
-		return ""
-	}
-
-	arr, isArr := raw.([]any)
-	if !isArr || len(arr) == 0 {
-		return ""
-	}
-
-	str, isStr := arr[0].(string)
-	if !isStr {
-		return ""
-	}
-
-	return str
-}

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/conn.go

@@ -1,508 +0,0 @@
-package ircserver
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"log/slog"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/service"
-	"sneak.berlin/go/neoirc/pkg/irc"
-)
-
-const (
-	maxLineLen      = 512
-	readTimeout     = 5 * time.Minute
-	writeTimeout    = 30 * time.Second
-	dnsTimeout      = 3 * time.Second
-	pollInterval    = 100 * time.Millisecond
-	pingInterval    = 90 * time.Second
-	pongDeadline    = 30 * time.Second
-	maxNickLen      = 32
-	minPasswordLen  = 8
-	maxHashcashBits = 40
-)
-
-// cmdHandler is the signature for registered IRC command
-// handlers.
-type cmdHandler func(ctx context.Context, msg *Message)
-
-// Conn represents a single IRC client TCP connection.
-type Conn struct {
-	conn      net.Conn
-	log       *slog.Logger
-	database  *db.Database
-	brk       *broker.Broker
-	cfg       *config.Config
-	svc       *service.Service
-	serverSfx string
-	commands  map[string]cmdHandler
-
-	mu        sync.Mutex
-	nick      string
-	username  string
-	realname  string
-	hostname  string
-	remoteIP  string
-	sessionID int64
-	clientID  int64
-
-	registered bool
-	gotNick    bool
-	gotUser    bool
-	passWord   string
-
-	lastQueueID int64
-	closed      bool
-	cancel      context.CancelFunc
-}
-
-func newConn(
-	ctx context.Context,
-	tcpConn net.Conn,
-	log *slog.Logger,
-	database *db.Database,
-	brk *broker.Broker,
-	cfg *config.Config,
-	svc *service.Service,
-) *Conn {
-	host, _, _ := net.SplitHostPort(tcpConn.RemoteAddr().String())
-
-	srvName := cfg.ServerName
-	if srvName == "" {
-		srvName = "neoirc"
-	}
-
-	conn := &Conn{ //nolint:exhaustruct // zero-value defaults
-		conn:      tcpConn,
-		log:       log,
-		database:  database,
-		brk:       brk,
-		cfg:       cfg,
-		svc:       svc,
-		serverSfx: srvName,
-		remoteIP:  host,
-		hostname:  resolveHost(ctx, host),
-	}
-
-	conn.commands = conn.buildCommandMap()
-
-	return conn
-}
-
-// buildCommandMap returns a map from IRC command strings
-// to handler functions.
-func (c *Conn) buildCommandMap() map[string]cmdHandler {
-	return map[string]cmdHandler{
-		irc.CmdPing: func(_ context.Context, msg *Message) {
-			c.handlePing(msg)
-		},
-		"PONG":         func(context.Context, *Message) {},
-		irc.CmdNick:    c.handleNick,
-		irc.CmdPrivmsg: c.handlePrivmsg,
-		irc.CmdNotice:  c.handlePrivmsg,
-		irc.CmdJoin:    c.handleJoin,
-		irc.CmdPart:    c.handlePart,
-		irc.CmdQuit: func(_ context.Context, msg *Message) {
-			c.handleQuit(msg)
-		},
-		irc.CmdTopic:  c.handleTopic,
-		irc.CmdMode:   c.handleMode,
-		irc.CmdNames:  c.handleNames,
-		irc.CmdList:   func(ctx context.Context, _ *Message) { c.handleList(ctx) },
-		irc.CmdWhois:  c.handleWhois,
-		irc.CmdWho:    c.handleWho,
-		irc.CmdLusers: func(ctx context.Context, _ *Message) { c.handleLusers(ctx) },
-		irc.CmdMotd:   func(context.Context, *Message) { c.deliverMOTD() },
-		irc.CmdOper:   c.handleOper,
-		irc.CmdAway:   c.handleAway,
-		irc.CmdKick:   c.handleKick,
-		irc.CmdPass:   c.handlePassPostReg,
-		"INVITE":      c.handleInvite,
-		"CAP": func(_ context.Context, msg *Message) {
-			c.handleCAP(msg)
-		},
-		"USERHOST":     c.handleUserhost,
-		irc.CmdVersion: func(ctx context.Context, _ *Message) { c.handleVersion(ctx) },
-		irc.CmdAdmin:   func(ctx context.Context, _ *Message) { c.handleAdmin(ctx) },
-		irc.CmdInfo:    func(ctx context.Context, _ *Message) { c.handleInfo(ctx) },
-		irc.CmdTime:    func(ctx context.Context, _ *Message) { c.handleTime(ctx) },
-		irc.CmdKill:    c.handleKillCmd,
-		irc.CmdWallops: c.handleWallopsCmd,
-	}
-}
-
-// resolveHost does a reverse DNS lookup, returning the IP
-// on failure.
-func resolveHost(ctx context.Context, addr string) string {
-	ctx, cancel := context.WithTimeout(ctx, dnsTimeout)
-	defer cancel()
-
-	resolver := &net.Resolver{} //nolint:exhaustruct
-
-	names, err := resolver.LookupAddr(ctx, addr)
-	if err != nil || len(names) == 0 {
-		return addr
-	}
-
-	return strings.TrimSuffix(names[0], ".")
-}
-
-// serve is the main loop for a single IRC client connection.
-func (c *Conn) serve(ctx context.Context) {
-	ctx, c.cancel = context.WithCancel(ctx)
-	defer c.cleanup(ctx)
-
-	scanner := bufio.NewScanner(c.conn)
-	scanner.Buffer(make([]byte, maxLineLen), maxLineLen)
-
-	for {
-		_ = c.conn.SetReadDeadline(
-			time.Now().Add(readTimeout),
-		)
-
-		if !scanner.Scan() {
-			return
-		}
-
-		line := scanner.Text()
-		if line == "" {
-			continue
-		}
-
-		msg := ParseMessage(line)
-		if msg == nil {
-			continue
-		}
-
-		c.handleMessage(ctx, msg)
-
-		if c.closed {
-			return
-		}
-	}
-}
-
-func (c *Conn) cleanup(ctx context.Context) {
-	c.mu.Lock()
-	wasRegistered := c.registered
-	sessID := c.sessionID
-	nick := c.nick
-	c.closed = true
-	c.mu.Unlock()
-
-	if wasRegistered && sessID > 0 {
-		c.svc.BroadcastQuit(
-			ctx, sessID, nick, "Connection closed",
-		)
-	}
-
-	c.conn.Close() //nolint:errcheck,gosec
-}
-
-// send writes a formatted IRC line to the connection.
-func (c *Conn) send(line string) {
-	_ = c.conn.SetWriteDeadline(
-		time.Now().Add(writeTimeout),
-	)
-
-	_, _ = fmt.Fprintf(c.conn, "%s\r\n", line)
-}
-
-// sendNumeric sends a numeric reply from the server.
-func (c *Conn) sendNumeric(
-	code irc.IRCMessageType,
-	params ...string,
-) {
-	nick := c.nick
-	if nick == "" {
-		nick = "*"
-	}
-
-	allParams := make([]string, 0, 1+len(params))
-	allParams = append(allParams, nick)
-	allParams = append(allParams, params...)
-
-	c.send(FormatMessage(
-		c.serverSfx, code.Code(), allParams...,
-	))
-}
-
-// sendFromServer sends a message from the server.
-func (c *Conn) sendFromServer(
-	command string, params ...string,
-) {
-	c.send(FormatMessage(c.serverSfx, command, params...))
-}
-
-// hostmask returns the client's full hostmask
-// (nick!user@host).
-func (c *Conn) hostmask() string {
-	user := c.username
-	if user == "" {
-		user = c.nick
-	}
-
-	host := c.hostname
-	if host == "" {
-		host = c.remoteIP
-	}
-
-	return c.nick + "!" + user + "@" + host
-}
-
-// handleMessage dispatches a parsed IRC message using
-// the command handler map.
-func (c *Conn) handleMessage(
-	ctx context.Context,
-	msg *Message,
-) {
-	// Before registration, only NICK, USER, PASS, PING,
-	// QUIT, and CAP are accepted.
-	if !c.registered {
-		c.handlePreRegistration(ctx, msg)
-
-		return
-	}
-
-	handler, ok := c.commands[msg.Command]
-	if !ok {
-		c.sendNumeric(
-			irc.ErrUnknownCommand,
-			msg.Command, "Unknown command",
-		)
-
-		return
-	}
-
-	handler(ctx, msg)
-}
-
-// handlePreRegistration handles messages before the
-// connection is registered (NICK+USER received).
-func (c *Conn) handlePreRegistration(
-	ctx context.Context,
-	msg *Message,
-) {
-	switch msg.Command {
-	case irc.CmdPass:
-		if len(msg.Params) < 1 {
-			c.sendNumeric(
-				irc.ErrNeedMoreParams,
-				"PASS", "Not enough parameters",
-			)
-
-			return
-		}
-
-		c.passWord = msg.Params[0]
-	case irc.CmdNick:
-		if len(msg.Params) < 1 {
-			c.sendNumeric(
-				irc.ErrNoNicknameGiven,
-				"No nickname given",
-			)
-
-			return
-		}
-
-		c.nick = msg.Params[0]
-		if len(c.nick) > maxNickLen {
-			c.nick = c.nick[:maxNickLen]
-		}
-
-		c.gotNick = true
-	case irc.CmdUser:
-		if len(msg.Params) < 4 { //nolint:mnd
-			c.sendNumeric(
-				irc.ErrNeedMoreParams,
-				"USER", "Not enough parameters",
-			)
-
-			return
-		}
-
-		c.username = msg.Params[0]
-		c.realname = msg.Params[3]
-		c.gotUser = true
-	case irc.CmdPing:
-		c.handlePing(msg)
-
-		return
-	case irc.CmdQuit:
-		c.handleQuit(msg)
-
-		return
-	case "CAP":
-		c.handleCAP(msg)
-
-		return
-	default:
-		c.sendNumeric(
-			irc.ErrNotRegistered,
-			"You have not registered",
-		)
-
-		return
-	}
-
-	// Try to complete registration once we have both
-	// NICK and USER.
-	if c.gotNick && c.gotUser {
-		c.completeRegistration(ctx)
-	}
-}
-
-// completeRegistration creates a session and sends the
-// welcome burst.
-func (c *Conn) completeRegistration(ctx context.Context) {
-	// Check if nick is valid.
-	if c.nick == "" {
-		c.sendNumeric(
-			irc.ErrNoNicknameGiven, "No nickname given",
-		)
-
-		return
-	}
-
-	// Create session in DB.
-	sessionID, clientID, _, err := c.database.CreateSession(
-		ctx, c.nick, c.username, c.hostname, c.remoteIP,
-	)
-	if err != nil {
-		if strings.Contains(err.Error(), "UNIQUE constraint") ||
-			strings.Contains(err.Error(), "nick") {
-			c.sendNumeric(
-				irc.ErrNicknameInUse,
-				c.nick, "Nickname is already in use",
-			)
-
-			return
-		}
-
-		c.log.Error(
-			"failed to create session", "error", err,
-		)
-		c.send("ERROR :Internal server error")
-		c.closed = true
-
-		return
-	}
-
-	c.mu.Lock()
-	c.sessionID = sessionID
-	c.clientID = clientID
-	c.registered = true
-	c.mu.Unlock()
-
-	// If PASS was provided before registration, set the
-	// session password.
-	if c.passWord != "" && len(c.passWord) >= minPasswordLen {
-		c.setPassword(ctx, c.passWord)
-	}
-
-	// Send welcome burst.
-	c.deliverWelcome()
-	c.deliverLusers(ctx)
-	c.deliverMOTD()
-
-	// Start the message relay goroutine.
-	go c.relayMessages(ctx)
-}
-
-// deliverWelcome sends 001-005 welcome numerics.
-func (c *Conn) deliverWelcome() {
-	c.sendNumeric(irc.RplWelcome, fmt.Sprintf(
-		"Welcome to the %s Network, %s",
-		c.serverSfx, c.hostmask(),
-	))
-	c.sendNumeric(irc.RplYourHost, fmt.Sprintf(
-		"Your host is %s, running version neoirc",
-		c.serverSfx,
-	))
-	c.sendNumeric(
-		irc.RplCreated,
-		"This server was created recently",
-	)
-	c.sendNumeric(
-		irc.RplMyInfo,
-		c.serverSfx, "neoirc", "", "mnst",
-	)
-	c.sendNumeric(
-		irc.RplIsupport,
-		"CHANTYPES=#",
-		"NICKLEN=32",
-		"PREFIX=(ov)@+",
-		"CHANMODES=,,H,imnst",
-		"NETWORK="+c.serverSfx,
-		"are supported by this server",
-	)
-}
-
-// deliverLusers sends 251/252/254/255 server statistics.
-func (c *Conn) deliverLusers(ctx context.Context) {
-	users, _ := c.database.GetUserCount(ctx)
-	opers, _ := c.database.GetOperCount(ctx)
-	channels, _ := c.database.GetChannelCount(ctx)
-
-	c.sendNumeric(irc.RplLuserClient, fmt.Sprintf(
-		"There are %d users and 0 invisible on 1 servers",
-		users,
-	))
-	c.sendNumeric(
-		irc.RplLuserOp,
-		strconv.FormatInt(opers, 10),
-		"operator(s) online",
-	)
-	c.sendNumeric(
-		irc.RplLuserChannels,
-		strconv.FormatInt(channels, 10),
-		"channels formed",
-	)
-	c.sendNumeric(irc.RplLuserMe, fmt.Sprintf(
-		"I have %d clients and 1 servers", users,
-	))
-}
-
-// deliverMOTD sends 375/372/376 MOTD lines.
-func (c *Conn) deliverMOTD() {
-	motd := c.cfg.MOTD
-	if motd == "" {
-		c.sendNumeric(
-			irc.ErrNoMotd, "MOTD File is missing",
-		)
-
-		return
-	}
-
-	c.sendNumeric(irc.RplMotdStart, fmt.Sprintf(
-		"- %s Message of the Day -", c.serverSfx,
-	))
-
-	for _, line := range strings.Split(motd, "\n") {
-		c.sendNumeric(irc.RplMotd, "- "+line)
-	}
-
-	c.sendNumeric(
-		irc.RplEndOfMotd, "End of /MOTD command",
-	)
-}
-
-// setPassword sets a bcrypt password on the session.
-func (c *Conn) setPassword(ctx context.Context, pw string) {
-	// Use the database's auth module to hash and store.
-	err := c.database.SetPassword(ctx, c.sessionID, pw)
-	if err != nil {
-		c.log.Error(
-			"failed to set password", "error", err,
-		)
-	}
-}

internal/ircserver/export_test.go

@@ -1,49 +0,0 @@
-package ircserver
-
-import (
-	"context"
-	"log/slog"
-	"net"
-
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/service"
-)
-
-// NewTestServer creates a Server suitable for testing.
-// The caller must call Stop() when finished.
-func NewTestServer(
-	log *slog.Logger,
-	cfg *config.Config,
-	database *db.Database,
-	brk *broker.Broker,
-) *Server {
-	svc := service.NewTestService(
-		database, brk, cfg, log,
-	)
-
-	return &Server{ //nolint:exhaustruct
-		log:      log,
-		cfg:      cfg,
-		database: database,
-		brk:      brk,
-		svc:      svc,
-		conns:    make(map[*Conn]struct{}),
-	}
-}
-
-// Start exposes the unexported start method for tests.
-func (s *Server) Start(addr string) error {
-	return s.start(context.Background(), addr)
-}
-
-// Stop exposes the unexported stop method for tests.
-func (s *Server) Stop() {
-	s.stop()
-}
-
-// Listener returns the server's net.Listener for tests.
-func (s *Server) Listener() net.Listener {
-	return s.listener
-}

internal/ircserver/parser.go

@@ -1,123 +0,0 @@
-// Package ircserver implements a traditional IRC wire protocol
-// listener (RFC 1459/2812) that bridges to the neoirc HTTP/JSON
-// server internals.
-package ircserver
-
-import "strings"
-
-// Message represents a parsed IRC wire protocol message.
-type Message struct {
-	// Prefix is the optional :prefix at the start (may be
-	// empty for client-to-server messages).
-	Prefix string
-	// Command is the IRC command (e.g., "PRIVMSG", "NICK").
-	Command string
-	// Params holds the positional parameters, including the
-	// trailing parameter (which was preceded by ':' on the
-	// wire).
-	Params []string
-}
-
-// ParseMessage parses a single IRC wire protocol line
-// (without the trailing CR-LF) into a Message.
-// Returns nil if the line is empty.
-//
-// IRC message format (RFC 1459 §2.3.1):
-//
-//	[":" prefix SPACE] command { SPACE param } [SPACE ":" trailing]
-func ParseMessage(line string) *Message {
-	if line == "" {
-		return nil
-	}
-
-	msg := &Message{} //nolint:exhaustruct // fields set below
-
-	// Extract prefix if present.
-	if line[0] == ':' {
-		idx := strings.IndexByte(line, ' ')
-		if idx < 0 {
-			// Only a prefix, no command — invalid.
-			return nil
-		}
-
-		msg.Prefix = line[1:idx]
-		line = line[idx+1:]
-	}
-
-	// Skip leading spaces.
-	line = strings.TrimLeft(line, " ")
-	if line == "" {
-		return nil
-	}
-
-	// Extract command.
-	idx := strings.IndexByte(line, ' ')
-	if idx < 0 {
-		msg.Command = strings.ToUpper(line)
-
-		return msg
-	}
-
-	msg.Command = strings.ToUpper(line[:idx])
-	line = line[idx+1:]
-
-	// Extract parameters.
-	for line != "" {
-		line = strings.TrimLeft(line, " ")
-		if line == "" {
-			break
-		}
-
-		// Trailing parameter (everything after ':').
-		if line[0] == ':' {
-			msg.Params = append(msg.Params, line[1:])
-
-			break
-		}
-
-		idx = strings.IndexByte(line, ' ')
-		if idx < 0 {
-			msg.Params = append(msg.Params, line)
-
-			break
-		}
-
-		msg.Params = append(msg.Params, line[:idx])
-		line = line[idx+1:]
-	}
-
-	return msg
-}
-
-// FormatMessage formats an IRC message into wire protocol
-// format (without the trailing CR-LF).
-func FormatMessage(
-	prefix, command string,
-	params ...string,
-) string {
-	var buf strings.Builder
-
-	if prefix != "" {
-		buf.WriteByte(':')
-		buf.WriteString(prefix)
-		buf.WriteByte(' ')
-	}
-
-	buf.WriteString(command)
-
-	for i, param := range params {
-		buf.WriteByte(' ')
-
-		isLast := i == len(params)-1
-		needsColon := strings.Contains(param, " ") ||
-			param == "" || param[0] == ':'
-
-		if isLast && needsColon {
-			buf.WriteByte(':')
-		}
-
-		buf.WriteString(param)
-	}
-
-	return buf.String()
-}

internal/ircserver/parser_test.go

@@ -1,328 +0,0 @@
-package ircserver_test
-
-import (
-	"testing"
-
-	"sneak.berlin/go/neoirc/internal/ircserver"
-)
-
-//nolint:funlen // table-driven test
-func TestParseMessage(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name    string
-		input   string
-		want    *ircserver.Message
-		wantNil bool
-	}{
-		{
-			name:    "empty",
-			input:   "",
-			want:    nil,
-			wantNil: true,
-		},
-		{
-			name:  "simple command",
-			input: "PING",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "PING",
-				Params:  nil,
-			},
-			wantNil: false,
-		},
-		{
-			name:  "command with one param",
-			input: "NICK alice",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "NICK",
-				Params:  []string{"alice"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "command case insensitive",
-			input: "nick Alice",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "NICK",
-				Params:  []string{"Alice"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "privmsg with trailing",
-			input: "PRIVMSG #general :hello world",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "PRIVMSG",
-				Params:  []string{"#general", "hello world"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "with prefix",
-			input: ":server.example.com 001 alice :Welcome to IRC",
-			want: &ircserver.Message{
-				Prefix:  "server.example.com",
-				Command: "001",
-				Params:  []string{"alice", "Welcome to IRC"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "user command",
-			input: "USER alice 0 * :Alice Smith",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "USER",
-				Params: []string{
-					"alice", "0", "*", "Alice Smith",
-				},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "join channel",
-			input: "JOIN #general",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "JOIN",
-				Params:  []string{"#general"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "quit with trailing",
-			input: "QUIT :leaving now",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "QUIT",
-				Params:  []string{"leaving now"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "quit without reason",
-			input: "QUIT",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "QUIT",
-				Params:  nil,
-			},
-			wantNil: false,
-		},
-		{
-			name:  "mode query",
-			input: "MODE #general",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "MODE",
-				Params:  []string{"#general"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "kick with reason",
-			input: "KICK #general bob :misbehaving",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "KICK",
-				Params: []string{
-					"#general", "bob", "misbehaving",
-				},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "empty trailing",
-			input: "PRIVMSG #general :",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "PRIVMSG",
-				Params:  []string{"#general", ""},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "pass command",
-			input: "PASS mysecret",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "PASS",
-				Params:  []string{"mysecret"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "ping with server",
-			input: "PING :irc.example.com",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "PING",
-				Params:  []string{"irc.example.com"},
-			},
-			wantNil: false,
-		},
-		{
-			name:  "topic with trailing spaces",
-			input: "TOPIC #general :Welcome to the channel!",
-			want: &ircserver.Message{
-				Prefix:  "",
-				Command: "TOPIC",
-				Params: []string{
-					"#general",
-					"Welcome to the channel!",
-				},
-			},
-			wantNil: false,
-		},
-	}
-
-	for _, testCase := range tests {
-		t.Run(testCase.name, func(t *testing.T) {
-			t.Parallel()
-
-			got := ircserver.ParseMessage(testCase.input)
-			if testCase.wantNil {
-				if got != nil {
-					t.Fatalf("expected nil, got %+v", got)
-				}
-
-				return
-			}
-
-			if got == nil {
-				t.Fatal("expected non-nil message")
-			}
-
-			if got.Prefix != testCase.want.Prefix {
-				t.Errorf(
-					"prefix: got %q, want %q",
-					got.Prefix, testCase.want.Prefix,
-				)
-			}
-
-			if got.Command != testCase.want.Command {
-				t.Errorf(
-					"command: got %q, want %q",
-					got.Command, testCase.want.Command,
-				)
-			}
-
-			if len(got.Params) != len(testCase.want.Params) {
-				t.Fatalf(
-					"params length: got %d, want %d (%v vs %v)",
-					len(got.Params),
-					len(testCase.want.Params),
-					got.Params,
-					testCase.want.Params,
-				)
-			}
-
-			for i, p := range got.Params {
-				if p != testCase.want.Params[i] {
-					t.Errorf(
-						"param[%d]: got %q, want %q",
-						i, p, testCase.want.Params[i],
-					)
-				}
-			}
-		})
-	}
-}
-
-func TestFormatMessage(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name    string
-		prefix  string
-		command string
-		params  []string
-		want    string
-	}{
-		{
-			name:    "simple command",
-			prefix:  "",
-			command: "PING",
-			params:  nil,
-			want:    "PING",
-		},
-		{
-			name:    "with prefix",
-			prefix:  "server",
-			command: "PONG",
-			params:  []string{"server"},
-			want:    ":server PONG server",
-		},
-		{
-			name:    "privmsg with trailing",
-			prefix:  "alice!alice@host",
-			command: "PRIVMSG",
-			params:  []string{"#general", "hello world"},
-			want:    ":alice!alice@host PRIVMSG #general :hello world",
-		},
-		{
-			name:    "numeric reply",
-			prefix:  "server",
-			command: "001",
-			params:  []string{"alice", "Welcome to IRC"},
-			want:    ":server 001 alice :Welcome to IRC",
-		},
-		{
-			name:    "empty trailing",
-			prefix:  "server",
-			command: "PRIVMSG",
-			params:  []string{"#chan", ""},
-			want:    ":server PRIVMSG #chan :",
-		},
-	}
-
-	for _, testCase := range tests {
-		t.Run(testCase.name, func(t *testing.T) {
-			t.Parallel()
-
-			got := ircserver.FormatMessage(
-				testCase.prefix, testCase.command, testCase.params...,
-			)
-			if got != testCase.want {
-				t.Errorf("got %q, want %q", got, testCase.want)
-			}
-		})
-	}
-}
-
-func TestParseFormatRoundTrip(t *testing.T) {
-	t.Parallel()
-
-	// Round-trip only works for lines where the last
-	// parameter either contains a space (gets ':' prefix
-	// on format) or is a non-trailing single token.
-	lines := []string{
-		"PING",
-		"NICK alice",
-		"PRIVMSG #general :hello world",
-		"JOIN #general",
-		"MODE #general",
-	}
-
-	for _, line := range lines {
-		msg := ircserver.ParseMessage(line)
-		if msg == nil {
-			t.Fatalf("failed to parse: %q", line)
-		}
-
-		formatted := ircserver.FormatMessage(
-			msg.Prefix, msg.Command, msg.Params...,
-		)
-		if formatted != line {
-			t.Errorf(
-				"round-trip failed: input %q, got %q",
-				line, formatted,
-			)
-		}
-	}
-}

internal/ircserver/relay.go

@@ -1,333 +0,0 @@
-package ircserver
-
-import (
-	"context"
-	"encoding/json"
-	"strings"
-	"time"
-
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/pkg/irc"
-)
-
-// relayMessages polls the client output queue and delivers
-// IRC-formatted messages to the TCP connection.  It runs
-// in a goroutine for the lifetime of the connection.
-func (c *Conn) relayMessages(ctx context.Context) {
-	// Use a ticker as a fallback; primary wakeup is via
-	// broker notification.
-	ticker := time.NewTicker(pollInterval)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		default:
-		}
-
-		// Drain any available messages.
-		delivered := c.drainQueue(ctx)
-
-		if delivered {
-			// Tight loop while there are messages.
-			continue
-		}
-
-		// Wait for notification or timeout.
-		waitCh := c.brk.Wait(c.sessionID)
-
-		select {
-		case <-waitCh:
-			// New message notification — loop back.
-		case <-ticker.C:
-			// Periodic check.
-		case <-ctx.Done():
-			c.brk.Remove(c.sessionID, waitCh)
-
-			return
-		}
-	}
-}
-
-const relayPollLimit = 100
-
-// drainQueue polls the output queue and delivers all
-// pending messages.  Returns true if at least one message
-// was delivered.
-func (c *Conn) drainQueue(ctx context.Context) bool {
-	msgs, lastID, err := c.database.PollMessages(
-		ctx, c.clientID, c.lastQueueID, relayPollLimit,
-	)
-	if err != nil {
-		return false
-	}
-
-	if len(msgs) == 0 {
-		return false
-	}
-
-	for i := range msgs {
-		c.deliverIRCMessage(ctx, &msgs[i])
-	}
-
-	if lastID > c.lastQueueID {
-		c.lastQueueID = lastID
-	}
-
-	return true
-}
-
-// deliverIRCMessage converts a db.IRCMessage to wire
-// protocol and sends it.
-//
-//nolint:cyclop // dispatch table
-func (c *Conn) deliverIRCMessage(
-	_ context.Context,
-	msg *db.IRCMessage,
-) {
-	command := msg.Command
-
-	// Decode body as []string for the trailing text.
-	var bodyLines []string
-
-	if msg.Body != nil {
-		_ = json.Unmarshal(msg.Body, &bodyLines)
-	}
-
-	text := ""
-	if len(bodyLines) > 0 {
-		text = bodyLines[0]
-	}
-
-	// Route by command type.
-	switch {
-	case isNumeric(command):
-		c.deliverNumeric(msg, text)
-	case command == irc.CmdPrivmsg || command == irc.CmdNotice:
-		c.deliverTextMessage(msg, command, text)
-	case command == irc.CmdJoin:
-		c.deliverJoin(msg)
-	case command == irc.CmdPart:
-		c.deliverPart(msg, text)
-	case command == irc.CmdNick:
-		c.deliverNickChange(msg, text)
-	case command == irc.CmdQuit:
-		c.deliverQuitMsg(msg, text)
-	case command == irc.CmdTopic:
-		c.deliverTopicChange(msg, text)
-	case command == irc.CmdKick:
-		c.deliverKickMsg(msg, text)
-	case command == "INVITE":
-		c.deliverInviteMsg(msg, text)
-	case command == irc.CmdWallops:
-		c.deliverWallops(msg, text)
-	case command == irc.CmdMode:
-		c.deliverMode(msg, text)
-	case command == irc.CmdPing:
-		// Server-originated PING — reply with PONG.
-		c.sendFromServer("PING", c.serverSfx)
-	default:
-		// Unknown command — deliver as server notice.
-		if text != "" {
-			c.sendFromServer("NOTICE", c.nick, text)
-		}
-	}
-}
-
-// isNumeric returns true if the command is a 3-digit
-// numeric code.
-func isNumeric(cmd string) bool {
-	return len(cmd) == 3 &&
-		cmd[0] >= '0' && cmd[0] <= '9' &&
-		cmd[1] >= '0' && cmd[1] <= '9' &&
-		cmd[2] >= '0' && cmd[2] <= '9'
-}
-
-// deliverNumeric sends a numeric reply.
-func (c *Conn) deliverNumeric(
-	msg *db.IRCMessage,
-	text string,
-) {
-	from := msg.From
-	if from == "" {
-		from = c.serverSfx
-	}
-
-	var params []string
-
-	if msg.Params != nil {
-		_ = json.Unmarshal(msg.Params, &params)
-	}
-
-	allParams := make([]string, 0, 1+len(params)+1)
-	allParams = append(allParams, c.nick)
-	allParams = append(allParams, params...)
-
-	if text != "" {
-		allParams = append(allParams, text)
-	}
-
-	c.send(FormatMessage(from, msg.Command, allParams...))
-}
-
-// deliverTextMessage sends PRIVMSG or NOTICE.
-func (c *Conn) deliverTextMessage(
-	msg *db.IRCMessage,
-	command, text string,
-) {
-	from := msg.From
-	target := msg.To
-
-	// Don't echo our own messages back.
-	if strings.EqualFold(from, c.nick) {
-		return
-	}
-
-	prefix := from
-	if !strings.Contains(prefix, "!") {
-		prefix = from + "!" + from + "@*"
-	}
-
-	c.send(FormatMessage(prefix, command, target, text))
-}
-
-// deliverJoin sends a JOIN notification.
-func (c *Conn) deliverJoin(msg *db.IRCMessage) {
-	// Don't echo our own JOINs (we already sent them
-	// during joinChannel).
-	if strings.EqualFold(msg.From, c.nick) {
-		return
-	}
-
-	prefix := msg.From + "!" + msg.From + "@*"
-	channel := msg.To
-
-	c.send(FormatMessage(prefix, "JOIN", channel))
-}
-
-// deliverPart sends a PART notification.
-func (c *Conn) deliverPart(msg *db.IRCMessage, text string) {
-	if strings.EqualFold(msg.From, c.nick) {
-		return
-	}
-
-	prefix := msg.From + "!" + msg.From + "@*"
-	channel := msg.To
-
-	if text != "" {
-		c.send(FormatMessage(
-			prefix, "PART", channel, text,
-		))
-	} else {
-		c.send(FormatMessage(prefix, "PART", channel))
-	}
-}
-
-// deliverNickChange sends a NICK change notification.
-func (c *Conn) deliverNickChange(
-	msg *db.IRCMessage,
-	newNick string,
-) {
-	if strings.EqualFold(msg.From, c.nick) {
-		return
-	}
-
-	prefix := msg.From + "!" + msg.From + "@*"
-
-	c.send(FormatMessage(prefix, "NICK", newNick))
-}
-
-// deliverQuitMsg sends a QUIT notification.
-func (c *Conn) deliverQuitMsg(
-	msg *db.IRCMessage,
-	text string,
-) {
-	if strings.EqualFold(msg.From, c.nick) {
-		return
-	}
-
-	prefix := msg.From + "!" + msg.From + "@*"
-
-	if text != "" {
-		c.send(FormatMessage(
-			prefix, "QUIT", "Quit: "+text,
-		))
-	} else {
-		c.send(FormatMessage(prefix, "QUIT", "Quit"))
-	}
-}
-
-// deliverTopicChange sends a TOPIC change notification.
-func (c *Conn) deliverTopicChange(
-	msg *db.IRCMessage,
-	text string,
-) {
-	prefix := msg.From + "!" + msg.From + "@*"
-	channel := msg.To
-
-	c.send(FormatMessage(prefix, "TOPIC", channel, text))
-}
-
-// deliverKickMsg sends a KICK notification.
-func (c *Conn) deliverKickMsg(
-	msg *db.IRCMessage,
-	text string,
-) {
-	prefix := msg.From + "!" + msg.From + "@*"
-	channel := msg.To
-
-	var params []string
-
-	if msg.Params != nil {
-		_ = json.Unmarshal(msg.Params, &params)
-	}
-
-	kickTarget := ""
-	if len(params) > 0 {
-		kickTarget = params[0]
-	}
-
-	if kickTarget != "" {
-		c.send(FormatMessage(
-			prefix, "KICK", channel, kickTarget, text,
-		))
-	} else {
-		c.send(FormatMessage(
-			prefix, "KICK", channel, "?", text,
-		))
-	}
-}
-
-// deliverInviteMsg sends an INVITE notification.
-func (c *Conn) deliverInviteMsg(
-	_ *db.IRCMessage,
-	text string,
-) {
-	c.sendFromServer("NOTICE", c.nick, text)
-}
-
-// deliverWallops sends a WALLOPS notification.
-func (c *Conn) deliverWallops(
-	msg *db.IRCMessage,
-	text string,
-) {
-	prefix := msg.From + "!" + msg.From + "@*"
-
-	c.send(FormatMessage(
-		prefix, irc.CmdWallops, text,
-	))
-}
-
-// deliverMode sends a MODE change notification.
-func (c *Conn) deliverMode(
-	msg *db.IRCMessage,
-	text string,
-) {
-	prefix := msg.From + "!" + msg.From + "@*"
-	target := msg.To
-
-	if text != "" {
-		c.send(FormatMessage(prefix, "MODE", target, text))
-	}
-}

internal/ircserver/server.go

@@ -1,157 +0,0 @@
-package ircserver
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"net"
-	"sync"
-
-	"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
-// Server.
-type Params struct {
-	fx.In
-
-	Logger   *logger.Logger
-	Config   *config.Config
-	Database *db.Database
-	Broker   *broker.Broker
-	Service  *service.Service
-}
-
-// Server is the TCP IRC protocol server.
-type Server struct {
-	log      *slog.Logger
-	cfg      *config.Config
-	database *db.Database
-	brk      *broker.Broker
-	svc      *service.Service
-	listener net.Listener
-	mu       sync.Mutex
-	conns    map[*Conn]struct{}
-	cancel   context.CancelFunc
-}
-
-// New creates a new IRC Server and registers its lifecycle
-// hooks.  The listener is only started if IRC_LISTEN_ADDR
-// is configured; otherwise the server is inert.
-func New(
-	lifecycle fx.Lifecycle,
-	params Params,
-) *Server {
-	srv := &Server{
-		log:      params.Logger.Get(),
-		cfg:      params.Config,
-		database: params.Database,
-		brk:      params.Broker,
-		svc:      params.Service,
-		conns:    make(map[*Conn]struct{}),
-		listener: nil,
-		cancel:   nil,
-		mu:       sync.Mutex{},
-	}
-
-	listenAddr := params.Config.IRCListenAddr
-	if listenAddr == "" {
-		return srv
-	}
-
-	lifecycle.Append(fx.Hook{
-		OnStart: func(ctx context.Context) error {
-			return srv.start(ctx, listenAddr)
-		},
-		OnStop: func(_ context.Context) error {
-			srv.stop()
-
-			return nil
-		},
-	})
-
-	return srv
-}
-
-// start begins listening for TCP connections.
-//
-//nolint:contextcheck // long-lived server ctx, not the short Fx one
-func (s *Server) start(_ context.Context, addr string) error {
-	ln, err := net.Listen("tcp", addr)
-	if err != nil {
-		return fmt.Errorf("irc listen: %w", err)
-	}
-
-	s.listener = ln
-
-	ctx, cancel := context.WithCancel(context.Background())
-	s.cancel = cancel
-
-	s.log.Info(
-		"irc server listening", "addr", addr,
-	)
-
-	go s.acceptLoop(ctx)
-
-	return nil
-}
-
-// stop shuts down the listener and all connections.
-func (s *Server) stop() {
-	if s.cancel != nil {
-		s.cancel()
-	}
-
-	if s.listener != nil {
-		s.listener.Close() //nolint:errcheck,gosec
-	}
-
-	s.mu.Lock()
-	for c := range s.conns {
-		c.conn.Close() //nolint:errcheck,gosec
-	}
-	s.mu.Unlock()
-}
-
-// acceptLoop accepts new connections.
-func (s *Server) acceptLoop(ctx context.Context) {
-	for {
-		tcpConn, err := s.listener.Accept()
-		if err != nil {
-			select {
-			case <-ctx.Done():
-				return
-			default:
-				s.log.Error(
-					"irc accept error", "error", err,
-				)
-
-				continue
-			}
-		}
-
-		client := newConn(
-			ctx, tcpConn, s.log,
-			s.database, s.brk, s.cfg, s.svc,
-		)
-
-		s.mu.Lock()
-		s.conns[client] = struct{}{}
-		s.mu.Unlock()
-
-		go func() {
-			defer func() {
-				s.mu.Lock()
-				delete(s.conns, client)
-				s.mu.Unlock()
-			}()
-
-			client.serve(ctx)
-		}()
-	}
-}

internal/ircserver/server_test.go

@@ -1,706 +0,0 @@
-package ircserver_test
-
-import (
-	"bufio"
-	"database/sql"
-	"fmt"
-	"log/slog"
-	"net"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"sneak.berlin/go/neoirc/internal/broker"
-	"sneak.berlin/go/neoirc/internal/config"
-	"sneak.berlin/go/neoirc/internal/db"
-	"sneak.berlin/go/neoirc/internal/ircserver"
-
-	_ "modernc.org/sqlite"
-)
-
-const testTimeout = 5 * time.Second
-
-func TestMain(m *testing.M) {
-	db.SetBcryptCost(4)
-
-	os.Exit(m.Run())
-}
-
-// testEnv holds the shared test infrastructure.
-type testEnv struct {
-	database *db.Database
-	brk      *broker.Broker
-	cfg      *config.Config
-	srv      *ircserver.Server
-}
-
-func newTestEnv(t *testing.T) *testEnv {
-	t.Helper()
-
-	dsn := fmt.Sprintf(
-		"file:%s?mode=memory&cache=shared&_journal_mode=WAL",
-		t.Name(),
-	)
-
-	conn, err := sql.Open("sqlite", dsn)
-	if err != nil {
-		t.Fatalf("open db: %v", err)
-	}
-
-	conn.SetMaxOpenConns(1)
-
-	_, err = conn.ExecContext(
-		t.Context(), "PRAGMA foreign_keys = ON",
-	)
-	if err != nil {
-		t.Fatalf("pragma: %v", err)
-	}
-
-	database := db.NewTestDatabaseFromConn(conn)
-
-	err = database.RunMigrations(t.Context())
-	if err != nil {
-		t.Fatalf("migrate: %v", err)
-	}
-
-	brk := broker.New()
-
-	cfg := &config.Config{ //nolint:exhaustruct
-		ServerName: "test.irc",
-		MOTD:       "Welcome to test IRC",
-	}
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-
-	addr := listener.Addr().String()
-
-	err = listener.Close()
-	if err != nil {
-		t.Fatalf("close listener: %v", err)
-	}
-
-	log := slog.New(slog.NewTextHandler(
-		os.Stderr,
-		&slog.HandlerOptions{Level: slog.LevelError}, //nolint:exhaustruct
-	))
-
-	srv := ircserver.NewTestServer(log, cfg, database, brk)
-
-	err = srv.Start(addr)
-	if err != nil {
-		t.Fatalf("start irc server: %v", err)
-	}
-
-	t.Cleanup(func() {
-		srv.Stop()
-
-		err := conn.Close()
-		if err != nil {
-			t.Logf("close db: %v", err)
-		}
-	})
-
-	return &testEnv{
-		database: database,
-		brk:      brk,
-		cfg:      cfg,
-		srv:      srv,
-	}
-}
-
-// newTestEnvWithOper creates a test environment with oper
-// credentials configured.
-func newTestEnvWithOper(t *testing.T) *testEnv {
-	t.Helper()
-
-	dsn := fmt.Sprintf(
-		"file:%s?mode=memory&cache=shared&_journal_mode=WAL",
-		t.Name(),
-	)
-
-	conn, err := sql.Open("sqlite", dsn)
-	if err != nil {
-		t.Fatalf("open db: %v", err)
-	}
-
-	conn.SetMaxOpenConns(1)
-
-	_, err = conn.ExecContext(
-		t.Context(), "PRAGMA foreign_keys = ON",
-	)
-	if err != nil {
-		t.Fatalf("pragma: %v", err)
-	}
-
-	database := db.NewTestDatabaseFromConn(conn)
-
-	err = database.RunMigrations(t.Context())
-	if err != nil {
-		t.Fatalf("migrate: %v", err)
-	}
-
-	brk := broker.New()
-
-	cfg := &config.Config{ //nolint:exhaustruct
-		ServerName:   "test.irc",
-		MOTD:         "Welcome to test IRC",
-		OperName:     "testoper",
-		OperPassword: "testpass",
-	}
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-
-	addr := listener.Addr().String()
-
-	err = listener.Close()
-	if err != nil {
-		t.Fatalf("close listener: %v", err)
-	}
-
-	log := slog.New(slog.NewTextHandler(
-		os.Stderr,
-		&slog.HandlerOptions{Level: slog.LevelError}, //nolint:exhaustruct
-	))
-
-	srv := ircserver.NewTestServer(log, cfg, database, brk)
-
-	err = srv.Start(addr)
-	if err != nil {
-		t.Fatalf("start irc server: %v", err)
-	}
-
-	t.Cleanup(func() {
-		srv.Stop()
-
-		err := conn.Close()
-		if err != nil {
-			t.Logf("close db: %v", err)
-		}
-	})
-
-	return &testEnv{
-		database: database,
-		brk:      brk,
-		cfg:      cfg,
-		srv:      srv,
-	}
-}
-
-// dial connects to the test server.
-func (env *testEnv) dial(t *testing.T) *testClient {
-	t.Helper()
-
-	conn, err := net.DialTimeout(
-		"tcp",
-		env.srv.Listener().Addr().String(),
-		testTimeout,
-	)
-	if err != nil {
-		t.Fatalf("dial: %v", err)
-	}
-
-	t.Cleanup(func() {
-		err := conn.Close()
-		if err != nil {
-			t.Logf("close conn: %v", err)
-		}
-	})
-
-	return &testClient{
-		t:       t,
-		conn:    conn,
-		scanner: bufio.NewScanner(conn),
-	}
-}
-
-// testClient wraps a raw TCP connection with helpers.
-type testClient struct {
-	t       *testing.T
-	conn    net.Conn
-	scanner *bufio.Scanner
-}
-
-func (tc *testClient) send(line string) {
-	tc.t.Helper()
-
-	_ = tc.conn.SetWriteDeadline(
-		time.Now().Add(testTimeout),
-	)
-
-	_, err := fmt.Fprintf(tc.conn, "%s\r\n", line)
-	if err != nil {
-		tc.t.Fatalf("send: %v", err)
-	}
-}
-
-func (tc *testClient) readLine() string {
-	tc.t.Helper()
-
-	_ = tc.conn.SetReadDeadline(
-		time.Now().Add(testTimeout),
-	)
-
-	if !tc.scanner.Scan() {
-		err := tc.scanner.Err()
-		if err != nil {
-			tc.t.Fatalf("read: %v", err)
-		}
-
-		tc.t.Fatal("connection closed unexpectedly")
-	}
-
-	return tc.scanner.Text()
-}
-
-// readUntil reads lines until one matches the predicate.
-func (tc *testClient) readUntil(
-	pred func(string) bool,
-) []string {
-	tc.t.Helper()
-
-	var lines []string
-
-	for {
-		line := tc.readLine()
-		lines = append(lines, line)
-
-		if pred(line) {
-			return lines
-		}
-	}
-}
-
-// register sends NICK + USER and reads through the welcome
-// burst.
-func (tc *testClient) register(nick string) []string {
-	tc.t.Helper()
-
-	tc.send("NICK " + nick)
-	tc.send("USER " + nick + " 0 * :Test User")
-
-	return tc.readUntil(func(line string) bool {
-		return strings.Contains(line, " 376 ") ||
-			strings.Contains(line, " 422 ")
-	})
-}
-
-// assertContains checks that at least one line matches the
-// given substring.
-func assertContains(
-	t *testing.T,
-	lines []string,
-	substr, description string,
-) {
-	t.Helper()
-
-	for _, line := range lines {
-		if strings.Contains(line, substr) {
-			return
-		}
-	}
-
-	t.Errorf("did not find %q in output: %s", substr, description)
-}
-
-// joinAndDrain joins a channel and reads until
-// RPL_ENDOFNAMES.
-func (tc *testClient) joinAndDrain(channel string) {
-	tc.t.Helper()
-
-	tc.send("JOIN " + channel)
-
-	tc.readUntil(func(line string) bool {
-		return strings.Contains(line, " 366 ")
-	})
-}
-
-// sendAndExpect sends a command and reads until a line
-// containing the expected substring is found.
-func (tc *testClient) sendAndExpect(
-	cmd, expect string,
-) []string {
-	tc.t.Helper()
-
-	tc.send(cmd)
-
-	return tc.readUntil(func(line string) bool {
-		return strings.Contains(line, expect)
-	})
-}
-
-func TestRegistration(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	lines := client.register("alice")
-	assertContains(t, lines, " 001 ", "RPL_WELCOME")
-}
-
-func TestWelcomeContainsNick(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	lines := client.register("bob")
-
-	for _, line := range lines {
-		if strings.Contains(line, " 001 ") &&
-			!strings.Contains(line, "bob") {
-			t.Errorf("001 should contain nick: %s", line)
-		}
-	}
-}
-
-func TestPingPong(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("pingtest")
-	lines := client.sendAndExpect("PING :hello", "PONG")
-	assertContains(t, lines, "PONG", "PONG response")
-}
-
-func TestJoinChannel(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("joiner")
-	client.send("JOIN #test")
-
-	lines := client.readUntil(func(line string) bool {
-		return strings.Contains(line, " 366 ")
-	})
-
-	assertContains(t, lines, "JOIN", "JOIN echo")
-	assertContains(t, lines, " 366 ", "RPL_ENDOFNAMES")
-}
-
-func TestPrivmsgBetweenClients(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	alice := env.dial(t)
-	alice.register("alice_pm")
-
-	bob := env.dial(t)
-	bob.register("bob_pm")
-
-	alice.joinAndDrain("#chat")
-	bob.joinAndDrain("#chat")
-
-	alice.send("PRIVMSG #chat :hello bob!")
-	lines := bob.sendAndExpect("PING :sync", "hello bob!")
-	assertContains(t, lines, "hello bob!", "channel PRIVMSG")
-}
-
-func TestNickChange(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("oldnick")
-	lines := client.sendAndExpect("NICK newnick", "newnick")
-	assertContains(t, lines, "NICK", "NICK change echo")
-}
-
-func TestDuplicateNick(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	first := env.dial(t)
-	first.register("taken")
-
-	second := env.dial(t)
-	second.send("NICK taken")
-	second.send("USER taken 0 * :Test")
-
-	lines := second.readUntil(func(line string) bool {
-		return strings.Contains(line, " 433 ")
-	})
-
-	assertContains(t, lines, " 433 ", "ERR_NICKNAMEINUSE")
-}
-
-func TestListChannels(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("lister")
-	client.joinAndDrain("#listtest")
-	lines := client.sendAndExpect("LIST", " 323 ")
-	assertContains(t, lines, " 323 ", "RPL_LISTEND") //nolint:misspell // IRC term
-}
-
-func TestWhois(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("whoistest")
-	lines := client.sendAndExpect(
-		"WHOIS whoistest", " 318 ",
-	)
-
-	assertContains(t, lines, " 311 ", "RPL_WHOISUSER")
-	assertContains(t, lines, " 318 ", "RPL_ENDOFWHOIS")
-}
-
-func TestQuit(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("quitter")
-	lines := client.sendAndExpect(
-		"QUIT :goodbye", "ERROR",
-	)
-
-	assertContains(t, lines, "goodbye", "QUIT reason")
-}
-
-func TestTopicSetAndGet(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("topicuser")
-	client.joinAndDrain("#topictest")
-	lines := client.sendAndExpect(
-		"TOPIC #topictest :New topic here",
-		"New topic here",
-	)
-
-	assertContains(
-		t, lines, "New topic here", "TOPIC echo",
-	)
-}
-
-func TestUnknownCommand(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("unknowncmd")
-	lines := client.sendAndExpect("FOOBAR", " 421 ")
-	assertContains(t, lines, " 421 ", "ERR_UNKNOWNCOMMAND")
-}
-
-func TestDirectMessage(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	sender := env.dial(t)
-	sender.register("dmsender")
-
-	receiver := env.dial(t)
-	receiver.register("dmreceiver")
-
-	// Give relay goroutines time to start.
-	time.Sleep(100 * time.Millisecond)
-
-	sender.send("PRIVMSG dmreceiver :hello privately")
-
-	lines := receiver.readUntil(func(line string) bool {
-		return strings.Contains(line, "hello privately")
-	})
-
-	assertContains(
-		t, lines, "hello privately", "direct PRIVMSG",
-	)
-}
-
-func TestCAPNegotiation(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.send("CAP LS 302")
-
-	line := client.readLine()
-	if !strings.Contains(line, "CAP") {
-		t.Errorf("expected CAP response, got: %s", line)
-	}
-
-	client.send("CAP END")
-	lines := client.register("capuser")
-	assertContains(t, lines, " 001 ", "registration after CAP")
-}
-
-func TestPartChannel(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("parter")
-	client.joinAndDrain("#parttest")
-	lines := client.sendAndExpect(
-		"PART #parttest :leaving", "PART",
-	)
-
-	assertContains(t, lines, "#parttest", "PART echo")
-}
-
-func TestModeQuery(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("modeuser")
-	client.joinAndDrain("#modetest")
-	lines := client.sendAndExpect(
-		"MODE #modetest", " 324 ",
-	)
-
-	assertContains(
-		t, lines, " 324 ", "RPL_CHANNELMODEIS",
-	)
-}
-
-func TestWhoChannel(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("whouser")
-	client.joinAndDrain("#whotest")
-	lines := client.sendAndExpect("WHO #whotest", " 315 ")
-	assertContains(t, lines, " 352 ", "RPL_WHOREPLY")
-}
-
-func TestLusers(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("luseruser")
-	lines := client.sendAndExpect("LUSERS", " 255 ")
-	assertContains(t, lines, " 251 ", "RPL_LUSERCLIENT")
-}
-
-func TestMotd(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("motduser")
-	lines := client.sendAndExpect("MOTD", " 376 ")
-	assertContains(t, lines, " 376 ", "RPL_ENDOFMOTD")
-}
-
-func TestAwaySetAndClear(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("awayuser")
-
-	setLines := client.sendAndExpect(
-		"AWAY :brb lunch", " 306 ",
-	)
-	assertContains(t, setLines, " 306 ", "RPL_NOWAWAY")
-
-	clearLines := client.sendAndExpect("AWAY", " 305 ")
-	assertContains(t, clearLines, " 305 ", "RPL_UNAWAY")
-}
-
-func TestHandlePassPostRegistration(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("passuser")
-	lines := client.sendAndExpect(
-		"PASS :mypassword123", "Password set",
-	)
-
-	assertContains(
-		t, lines, "Password set", "password confirmation",
-	)
-}
-
-func TestPreRegistrationNotRegistered(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.send("PRIVMSG #test :hello")
-
-	line := client.readLine()
-	if !strings.Contains(line, " 451 ") {
-		t.Errorf(
-			"expected ERR_NOTREGISTERED (451), got: %s",
-			line,
-		)
-	}
-}
-
-func TestNamesNonExistentChannel(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-	client := env.dial(t)
-
-	client.register("namesuser")
-	lines := client.sendAndExpect(
-		"NAMES #doesnotexist", " 366 ",
-	)
-
-	assertContains(
-		t, lines, " 366 ",
-		"RPL_ENDOFNAMES for non-existent channel",
-	)
-}
-
-func BenchmarkParseMessage(b *testing.B) {
-	line := ":nick!user@host PRIVMSG #channel :Hello, world!"
-
-	b.ResetTimer()
-
-	for range b.N {
-		_ = ircserver.ParseMessage(line)
-	}
-}
-
-func BenchmarkFormatMessage(b *testing.B) {
-	b.ResetTimer()
-
-	for range b.N {
-		_ = ircserver.FormatMessage(
-			"nick!user@host", "PRIVMSG",
-			"#channel", "Hello, world!",
-		)
-	}
-}

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.go

@@ -1,122 +0,0 @@
-// Package ratelimit provides per-IP rate limiting for HTTP endpoints.
-package ratelimit
-
-import (
-	"sync"
-	"time"
-
-	"golang.org/x/time/rate"
-)
-
-const (
-	// DefaultRate is the default number of allowed requests per second.
-	DefaultRate = 1.0
-
-	// DefaultBurst is the default maximum burst size.
-	DefaultBurst = 5
-
-	// DefaultSweepInterval controls how often stale entries are pruned.
-	DefaultSweepInterval = 10 * time.Minute
-
-	// DefaultEntryTTL is how long an unused entry lives before eviction.
-	DefaultEntryTTL = 15 * time.Minute
-)
-
-// entry tracks a per-IP rate limiter and when it was last used.
-type entry struct {
-	limiter  *rate.Limiter
-	lastSeen time.Time
-}
-
-// Limiter manages per-key rate limiters with automatic cleanup
-// of stale entries.
-type Limiter struct {
-	mu       sync.Mutex
-	entries  map[string]*entry
-	rate     rate.Limit
-	burst    int
-	entryTTL time.Duration
-	stopCh   chan struct{}
-}
-
-// New creates a new per-key rate Limiter.
-// The ratePerSec parameter sets how many requests per second are
-// allowed per key.  The burst parameter sets the maximum number of
-// requests that can be made in a single burst.
-func New(ratePerSec float64, burst int) *Limiter {
-	limiter := &Limiter{
-		mu:       sync.Mutex{},
-		entries:  make(map[string]*entry),
-		rate:     rate.Limit(ratePerSec),
-		burst:    burst,
-		entryTTL: DefaultEntryTTL,
-		stopCh:   make(chan struct{}),
-	}
-
-	go limiter.sweepLoop()
-
-	return limiter
-}
-
-// Allow reports whether a request from the given key should be
-// allowed.  It consumes one token from the key's rate limiter.
-func (l *Limiter) Allow(key string) bool {
-	l.mu.Lock()
-	ent, exists := l.entries[key]
-
-	if !exists {
-		ent = &entry{
-			limiter:  rate.NewLimiter(l.rate, l.burst),
-			lastSeen: time.Now(),
-		}
-		l.entries[key] = ent
-	} else {
-		ent.lastSeen = time.Now()
-	}
-	l.mu.Unlock()
-
-	return ent.limiter.Allow()
-}
-
-// Stop terminates the background sweep goroutine.
-func (l *Limiter) Stop() {
-	close(l.stopCh)
-}
-
-// Len returns the number of tracked keys (for testing).
-func (l *Limiter) Len() int {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	return len(l.entries)
-}
-
-// sweepLoop periodically removes entries that haven't been seen
-// within the TTL.
-func (l *Limiter) sweepLoop() {
-	ticker := time.NewTicker(DefaultSweepInterval)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			l.sweep()
-		case <-l.stopCh:
-			return
-		}
-	}
-}
-
-// sweep removes stale entries.
-func (l *Limiter) sweep() {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	cutoff := time.Now().Add(-l.entryTTL)
-
-	for key, ent := range l.entries {
-		if ent.lastSeen.Before(cutoff) {
-			delete(l.entries, key)
-		}
-	}
-}

internal/ratelimit/ratelimit_test.go

@@ -1,106 +0,0 @@
-package ratelimit_test
-
-import (
-	"testing"
-
-	"sneak.berlin/go/neoirc/internal/ratelimit"
-)
-
-func TestNewCreatesLimiter(t *testing.T) {
-	t.Parallel()
-
-	limiter := ratelimit.New(1.0, 5)
-	defer limiter.Stop()
-
-	if limiter == nil {
-		t.Fatal("expected non-nil limiter")
-	}
-}
-
-func TestAllowWithinBurst(t *testing.T) {
-	t.Parallel()
-
-	limiter := ratelimit.New(1.0, 3)
-	defer limiter.Stop()
-
-	for i := range 3 {
-		if !limiter.Allow("192.168.1.1") {
-			t.Fatalf(
-				"request %d should be allowed within burst",
-				i+1,
-			)
-		}
-	}
-}
-
-func TestAllowExceedsBurst(t *testing.T) {
-	t.Parallel()
-
-	// Rate of 0 means no token replenishment, only burst.
-	limiter := ratelimit.New(0, 3)
-	defer limiter.Stop()
-
-	for range 3 {
-		limiter.Allow("10.0.0.1")
-	}
-
-	if limiter.Allow("10.0.0.1") {
-		t.Fatal("fourth request should be denied after burst exhausted")
-	}
-}
-
-func TestAllowSeparateKeys(t *testing.T) {
-	t.Parallel()
-
-	// Rate of 0, burst of 1 — only one request per key.
-	limiter := ratelimit.New(0, 1)
-	defer limiter.Stop()
-
-	if !limiter.Allow("10.0.0.1") {
-		t.Fatal("first request for key A should be allowed")
-	}
-
-	if !limiter.Allow("10.0.0.2") {
-		t.Fatal("first request for key B should be allowed")
-	}
-
-	if limiter.Allow("10.0.0.1") {
-		t.Fatal("second request for key A should be denied")
-	}
-
-	if limiter.Allow("10.0.0.2") {
-		t.Fatal("second request for key B should be denied")
-	}
-}
-
-func TestLenTracksKeys(t *testing.T) {
-	t.Parallel()
-
-	limiter := ratelimit.New(1.0, 5)
-	defer limiter.Stop()
-
-	if limiter.Len() != 0 {
-		t.Fatalf("expected 0 entries, got %d", limiter.Len())
-	}
-
-	limiter.Allow("10.0.0.1")
-	limiter.Allow("10.0.0.2")
-
-	if limiter.Len() != 2 {
-		t.Fatalf("expected 2 entries, got %d", limiter.Len())
-	}
-
-	// Same key again should not increase count.
-	limiter.Allow("10.0.0.1")
-
-	if limiter.Len() != 2 {
-		t.Fatalf("expected 2 entries, got %d", limiter.Len())
-	}
-}
-
-func TestStopDoesNotPanic(t *testing.T) {
-	t.Parallel()
-
-	limiter := ratelimit.New(1.0, 5)
-	limiter.Stop()
-}

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

@@ -1,901 +0,0 @@
-// Package service provides shared business logic for both
-// the IRC wire protocol and HTTP/JSON transports.
-package service
-
-import (
-	"context"
-	"crypto/subtle"
-	"encoding/json"
-	"fmt"
-	"log/slog"
-	"strconv"
-	"strings"
-
-	"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.
-type Params struct {
-	fx.In
-
-	Logger   *logger.Logger
-	Config   *config.Config
-	Database *db.Database
-	Broker   *broker.Broker
-}
-
-// Service provides shared business logic for IRC commands.
-type Service struct {
-	db     *db.Database
-	broker *broker.Broker
-	config *config.Config
-	log    *slog.Logger
-}
-
-// New creates a new Service.
-func New(params Params) *Service {
-	return &Service{
-		db:     params.Database,
-		broker: params.Broker,
-		config: params.Config,
-		log:    params.Logger.Get(),
-	}
-}
-
-// NewTestService creates a Service for use in tests
-// outside the service package.
-func NewTestService(
-	database *db.Database,
-	brk *broker.Broker,
-	cfg *config.Config,
-	log *slog.Logger,
-) *Service {
-	return &Service{
-		db:     database,
-		broker: brk,
-		config: cfg,
-		log:    log,
-	}
-}
-
-// IRCError represents an IRC protocol-level error with a
-// numeric code that both transports can map to responses.
-type IRCError struct {
-	Code    irc.IRCMessageType
-	Params  []string
-	Message string
-}
-
-func (e *IRCError) Error() string { return e.Message }
-
-// JoinResult contains the outcome of a channel join.
-type JoinResult struct {
-	ChannelID int64
-	IsCreator bool
-}
-
-// DirectMsgResult contains the outcome of a direct message.
-type DirectMsgResult struct {
-	UUID    string
-	AwayMsg string
-}
-
-// FanOut inserts a message and enqueues it to all given
-// session IDs, notifying each via the broker.
-func (s *Service) FanOut(
-	ctx context.Context,
-	command, from, to string,
-	params, body, meta json.RawMessage,
-	sessionIDs []int64,
-) (int64, string, error) {
-	dbID, msgUUID, err := s.db.InsertMessage(
-		ctx, command, from, to, params, body, meta,
-	)
-	if err != nil {
-		return 0, "", fmt.Errorf("insert message: %w", err)
-	}
-
-	for _, sid := range sessionIDs {
-		_ = s.db.EnqueueToSession(ctx, sid, dbID)
-		s.broker.Notify(sid)
-	}
-
-	return dbID, msgUUID, nil
-}
-
-// excludeSession returns a copy of ids without the given
-// session.
-func excludeSession(
-	ids []int64,
-	exclude int64,
-) []int64 {
-	out := make([]int64, 0, len(ids))
-
-	for _, id := range ids {
-		if id != exclude {
-			out = append(out, id)
-		}
-	}
-
-	return out
-}
-
-// SendChannelMessage validates membership and moderation,
-// then fans out a message to all channel members except
-// the sender. Returns the database row ID, message UUID,
-// and any error. The dbID lets callers enqueue the same
-// message to the sender when echo is needed (HTTP
-// transport).
-func (s *Service) SendChannelMessage(
-	ctx context.Context,
-	sessionID int64,
-	nick, command, channel string,
-	body, meta json.RawMessage,
-) (int64, string, error) {
-	chID, err := s.db.GetChannelByName(ctx, channel)
-	if err != nil {
-		return 0, "", &IRCError{
-			irc.ErrNoSuchChannel,
-			[]string{channel},
-			"No such channel",
-		}
-	}
-
-	isMember, _ := s.db.IsChannelMember(
-		ctx, chID, sessionID,
-	)
-	if !isMember {
-		return 0, "", &IRCError{
-			irc.ErrCannotSendToChan,
-			[]string{channel},
-			"Cannot send to channel",
-		}
-	}
-
-	// Ban check — banned users cannot send messages.
-	isBanned, banErr := s.db.IsSessionBanned(
-		ctx, chID, sessionID,
-	)
-	if banErr == nil && isBanned {
-		return 0, "", &IRCError{
-			irc.ErrCannotSendToChan,
-			[]string{channel},
-			"Cannot send to channel (+b)",
-		}
-	}
-
-	moderated, _ := s.db.IsChannelModerated(ctx, chID)
-	if moderated {
-		isOp, _ := s.db.IsChannelOperator(
-			ctx, chID, sessionID,
-		)
-		isVoiced, _ := s.db.IsChannelVoiced(
-			ctx, chID, sessionID,
-		)
-
-		if !isOp && !isVoiced {
-			return 0, "", &IRCError{
-				irc.ErrCannotSendToChan,
-				[]string{channel},
-				"Cannot send to channel (+m)",
-			}
-		}
-	}
-
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
-	recipients := excludeSession(memberIDs, sessionID)
-
-	dbID, uuid, fanErr := s.FanOut(
-		ctx, command, nick, channel,
-		nil, body, meta, recipients,
-	)
-	if fanErr != nil {
-		return 0, "", fanErr
-	}
-
-	return dbID, uuid, nil
-}
-
-// SendDirectMessage validates the target and sends a
-// direct message, returning the message UUID and any away
-// message set on the target.
-func (s *Service) SendDirectMessage(
-	ctx context.Context,
-	sessionID int64,
-	nick, command, target string,
-	body, meta json.RawMessage,
-) (*DirectMsgResult, error) {
-	targetSID, err := s.db.GetSessionByNick(ctx, target)
-	if err != nil {
-		return nil, &IRCError{
-			irc.ErrNoSuchNick,
-			[]string{target},
-			"No such nick",
-		}
-	}
-
-	away, _ := s.db.GetAway(ctx, targetSID)
-
-	recipients := []int64{targetSID}
-	if targetSID != sessionID {
-		recipients = append(recipients, sessionID)
-	}
-
-	_, uuid, fanErr := s.FanOut(
-		ctx, command, nick, target,
-		nil, body, meta, recipients,
-	)
-	if fanErr != nil {
-		return nil, fanErr
-	}
-
-	return &DirectMsgResult{UUID: uuid, AwayMsg: away}, nil
-}
-
-// JoinChannel creates or joins a channel, making the
-// first joiner the operator. Fans out the JOIN to all
-// channel members.
-func (s *Service) JoinChannel(
-	ctx context.Context,
-	sessionID int64,
-	nick, channel, suppliedKey string,
-) (*JoinResult, error) {
-	chID, err := s.db.GetOrCreateChannel(ctx, channel)
-	if err != nil {
-		return nil, fmt.Errorf("get/create channel: %w", err)
-	}
-
-	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(
-			ctx, chID, sessionID,
-		)
-	} else {
-		err = s.db.JoinChannel(ctx, chID, sessionID)
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("join channel: %w", err)
-	}
-
-	// Clear invite after successful join.
-	_ = s.db.ClearChannelInvite(ctx, chID, sessionID)
-
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
-	body, _ := json.Marshal([]string{channel}) //nolint:errchkjson
-
-	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
-		ctx, irc.CmdJoin, nick, channel,
-		nil, body, nil, memberIDs,
-	)
-
-	return &JoinResult{
-		ChannelID: chID,
-		IsCreator: isCreator,
-	}, nil
-}
-
-// PartChannel validates membership, broadcasts PART to
-// remaining members, removes the user, and cleans up empty
-// channels.
-func (s *Service) PartChannel(
-	ctx context.Context,
-	sessionID int64,
-	nick, channel, reason string,
-) error {
-	chID, err := s.db.GetChannelByName(ctx, channel)
-	if err != nil {
-		return &IRCError{
-			irc.ErrNoSuchChannel,
-			[]string{channel},
-			"No such channel",
-		}
-	}
-
-	isMember, _ := s.db.IsChannelMember(
-		ctx, chID, sessionID,
-	)
-	if !isMember {
-		return &IRCError{
-			irc.ErrNotOnChannel,
-			[]string{channel},
-			"You're not on that channel",
-		}
-	}
-
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
-	recipients := excludeSession(memberIDs, sessionID)
-	body, _ := json.Marshal([]string{reason}) //nolint:errchkjson
-
-	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
-		ctx, irc.CmdPart, nick, channel,
-		nil, body, nil, recipients,
-	)
-
-	s.db.PartChannel(ctx, chID, sessionID) //nolint:errcheck,gosec
-	s.db.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
-
-	return nil
-}
-
-// SetTopic validates membership and topic-lock, sets the
-// topic, and broadcasts the change.
-func (s *Service) SetTopic(
-	ctx context.Context,
-	sessionID int64,
-	nick, channel, topic string,
-) error {
-	chID, err := s.db.GetChannelByName(ctx, channel)
-	if err != nil {
-		return &IRCError{
-			irc.ErrNoSuchChannel,
-			[]string{channel},
-			"No such channel",
-		}
-	}
-
-	isMember, _ := s.db.IsChannelMember(
-		ctx, chID, sessionID,
-	)
-	if !isMember {
-		return &IRCError{
-			irc.ErrNotOnChannel,
-			[]string{channel},
-			"You're not on that channel",
-		}
-	}
-
-	topicLocked, _ := s.db.IsChannelTopicLocked(ctx, chID)
-	if topicLocked {
-		isOp, _ := s.db.IsChannelOperator(
-			ctx, chID, sessionID,
-		)
-		if !isOp {
-			return &IRCError{
-				irc.ErrChanOpPrivsNeeded,
-				[]string{channel},
-				"You're not channel operator",
-			}
-		}
-	}
-
-	if setErr := s.db.SetTopic(
-		ctx, channel, topic,
-	); setErr != nil {
-		return fmt.Errorf("set topic: %w", setErr)
-	}
-
-	_ = s.db.SetTopicMeta(ctx, channel, topic, nick)
-
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
-	body, _ := json.Marshal([]string{topic}) //nolint:errchkjson
-
-	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
-		ctx, irc.CmdTopic, nick, channel,
-		nil, body, nil, memberIDs,
-	)
-
-	return nil
-}
-
-// KickUser validates operator status and target
-// membership, broadcasts the KICK, removes the target,
-// and cleans up empty channels.
-func (s *Service) KickUser(
-	ctx context.Context,
-	sessionID int64,
-	nick, channel, targetNick, reason string,
-) error {
-	chID, err := s.db.GetChannelByName(ctx, channel)
-	if err != nil {
-		return &IRCError{
-			irc.ErrNoSuchChannel,
-			[]string{channel},
-			"No such channel",
-		}
-	}
-
-	isOp, _ := s.db.IsChannelOperator(
-		ctx, chID, sessionID,
-	)
-	if !isOp {
-		return &IRCError{
-			irc.ErrChanOpPrivsNeeded,
-			[]string{channel},
-			"You're not channel operator",
-		}
-	}
-
-	targetSID, err := s.db.GetSessionByNick(
-		ctx, targetNick,
-	)
-	if err != nil {
-		return &IRCError{
-			irc.ErrNoSuchNick,
-			[]string{targetNick},
-			"No such nick/channel",
-		}
-	}
-
-	isMember, _ := s.db.IsChannelMember(
-		ctx, chID, targetSID,
-	)
-	if !isMember {
-		return &IRCError{
-			irc.ErrUserNotInChannel,
-			[]string{targetNick, channel},
-			"They aren't on that channel",
-		}
-	}
-
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
-	body, _ := json.Marshal([]string{reason}) //nolint:errchkjson
-	params, _ := json.Marshal(                //nolint:errchkjson
-		[]string{targetNick},
-	)
-
-	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
-		ctx, irc.CmdKick, nick, channel,
-		params, body, nil, memberIDs,
-	)
-
-	s.db.PartChannel(ctx, chID, targetSID) //nolint:errcheck,gosec
-	s.db.DeleteChannelIfEmpty(ctx, chID)   //nolint:errcheck,gosec
-
-	return nil
-}
-
-// ChangeNick changes a user's nickname and broadcasts the
-// change to all users sharing channels.
-func (s *Service) ChangeNick(
-	ctx context.Context,
-	sessionID int64,
-	oldNick, newNick string,
-) error {
-	err := s.db.ChangeNick(ctx, sessionID, newNick)
-	if err != nil {
-		if strings.Contains(err.Error(), "UNIQUE") ||
-			db.IsUniqueConstraintError(err) {
-			return &IRCError{
-				irc.ErrNicknameInUse,
-				[]string{newNick},
-				"Nickname is already in use",
-			}
-		}
-
-		return &IRCError{
-			irc.ErrErroneusNickname,
-			[]string{newNick},
-			"Erroneous nickname",
-		}
-	}
-
-	s.broadcastNickChange(ctx, sessionID, oldNick, newNick)
-
-	return nil
-}
-
-// BroadcastQuit broadcasts a QUIT to all channel peers,
-// parts all channels, and deletes the session. Uses the
-// FanOut pattern: one message row fanned out to all unique
-// peer sessions.
-func (s *Service) BroadcastQuit(
-	ctx context.Context,
-	sessionID int64,
-	nick, reason string,
-) {
-	channels, err := s.db.GetSessionChannels(
-		ctx, sessionID,
-	)
-	if err != nil {
-		return
-	}
-
-	notified := make(map[int64]bool)
-
-	for _, ch := range channels {
-		memberIDs, memErr := s.db.GetChannelMemberIDs(
-			ctx, ch.ID,
-		)
-		if memErr != nil {
-			continue
-		}
-
-		for _, mid := range memberIDs {
-			if mid == sessionID || notified[mid] {
-				continue
-			}
-
-			notified[mid] = true
-		}
-	}
-
-	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(
-			ctx, irc.CmdQuit, nick, "",
-			nil, body, nil, recipients,
-		)
-	}
-
-	for _, ch := range channels {
-		s.db.PartChannel(ctx, ch.ID, sessionID) //nolint:errcheck,gosec
-		s.db.DeleteChannelIfEmpty(ctx, ch.ID)   //nolint:errcheck,gosec
-	}
-
-	s.db.DeleteSession(ctx, sessionID) //nolint:errcheck,gosec
-}
-
-// SetAway sets or clears the away message. Returns true
-// if the message was cleared (empty string).
-func (s *Service) SetAway(
-	ctx context.Context,
-	sessionID int64,
-	message string,
-) (bool, error) {
-	err := s.db.SetAway(ctx, sessionID, message)
-	if err != nil {
-		return false, fmt.Errorf("set away: %w", err)
-	}
-
-	return message == "", nil
-}
-
-// Oper validates operator credentials and grants oper
-// status to the session.
-func (s *Service) Oper(
-	ctx context.Context,
-	sessionID int64,
-	name, password string,
-) error {
-	cfgName := s.config.OperName
-	cfgPassword := s.config.OperPassword
-
-	// Use constant-time comparison and return the same
-	// error for all failures to prevent information
-	// leakage about valid operator names.
-	if cfgName == "" || cfgPassword == "" ||
-		subtle.ConstantTimeCompare(
-			[]byte(name), []byte(cfgName),
-		) != 1 ||
-		subtle.ConstantTimeCompare(
-			[]byte(password), []byte(cfgPassword),
-		) != 1 {
-		return &IRCError{
-			irc.ErrNoOperHost,
-			nil,
-			"No O-lines for your host",
-		}
-	}
-
-	_ = s.db.SetSessionOper(ctx, sessionID, true)
-
-	return nil
-}
-
-// ValidateChannelOp checks that the session is a channel
-// operator. Returns the channel ID.
-func (s *Service) ValidateChannelOp(
-	ctx context.Context,
-	sessionID int64,
-	channel string,
-) (int64, error) {
-	chID, err := s.db.GetChannelByName(ctx, channel)
-	if err != nil {
-		return 0, &IRCError{
-			irc.ErrNoSuchChannel,
-			[]string{channel},
-			"No such channel",
-		}
-	}
-
-	isOp, _ := s.db.IsChannelOperator(
-		ctx, chID, sessionID,
-	)
-	if !isOp {
-		return 0, &IRCError{
-			irc.ErrChanOpPrivsNeeded,
-			[]string{channel},
-			"You're not channel operator",
-		}
-	}
-
-	return chID, nil
-}
-
-// ApplyMemberMode applies +o/-o or +v/-v on a channel
-// member after validating the target.
-func (s *Service) ApplyMemberMode(
-	ctx context.Context,
-	chID int64,
-	channel, targetNick string,
-	mode rune,
-	adding bool,
-) error {
-	targetSID, err := s.db.GetSessionByNick(
-		ctx, targetNick,
-	)
-	if err != nil {
-		return &IRCError{
-			irc.ErrNoSuchNick,
-			[]string{targetNick},
-			"No such nick/channel",
-		}
-	}
-
-	isMember, _ := s.db.IsChannelMember(
-		ctx, chID, targetSID,
-	)
-	if !isMember {
-		return &IRCError{
-			irc.ErrUserNotInChannel,
-			[]string{targetNick, channel},
-			"They aren't on that channel",
-		}
-	}
-
-	switch mode {
-	case 'o':
-		_ = s.db.SetChannelMemberOperator(
-			ctx, chID, targetSID, adding,
-		)
-	case 'v':
-		_ = s.db.SetChannelMemberVoiced(
-			ctx, chID, targetSID, adding,
-		)
-	}
-
-	return nil
-}
-
-// SetChannelFlag applies a simple boolean channel mode
-// (+m/-m, +t/-t, +i/-i, +s/-s, +n/-n).
-func (s *Service) SetChannelFlag(
-	ctx context.Context,
-	chID int64,
-	flag rune,
-	setting bool,
-) error {
-	switch flag {
-	case 'm':
-		if err := s.db.SetChannelModerated(
-			ctx, chID, setting,
-		); err != nil {
-			return fmt.Errorf("set moderated: %w", err)
-		}
-	case 't':
-		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
-}
-
-// BroadcastMode fans out a MODE change to all channel
-// members.
-func (s *Service) BroadcastMode(
-	ctx context.Context,
-	nick, channel string,
-	chID int64,
-	modeText string,
-) {
-	memberIDs, _ := s.db.GetChannelMemberIDs(ctx, chID)
-	body, _ := json.Marshal([]string{modeText}) //nolint:errchkjson
-
-	_, _, _ = s.FanOut( //nolint:dogsled // fire-and-forget broadcast
-		ctx, irc.CmdMode, nick, channel,
-		nil, body, nil, memberIDs,
-	)
-}
-
-// QueryChannelMode returns the complete channel mode
-// string including all flags and parameterized modes.
-func (s *Service) QueryChannelMode(
-	ctx context.Context,
-	chID int64,
-) string {
-	modes := "+"
-
-	noExternal, _ := s.db.IsChannelNoExternal(ctx, chID)
-	if noExternal {
-		modes += "n"
-	}
-
-	inviteOnly, _ := s.db.IsChannelInviteOnly(ctx, chID)
-	if inviteOnly {
-		modes += "i"
-	}
-
-	moderated, _ := s.db.IsChannelModerated(ctx, chID)
-	if moderated {
-		modes += "m"
-	}
-
-	secret, _ := s.db.IsChannelSecret(ctx, chID)
-	if secret {
-		modes += "s"
-	}
-
-	topicLocked, _ := s.db.IsChannelTopicLocked(ctx, chID)
-	if topicLocked {
-		modes += "t"
-	}
-
-	var modeParams string
-
-	key, _ := s.db.GetChannelKey(ctx, chID)
-	if key != "" {
-		modes += "k"
-		modeParams += " " + key
-	}
-
-	limit, _ := s.db.GetChannelUserLimit(ctx, chID)
-	if limit > 0 {
-		modes += "l"
-		modeParams += " " + strconv.Itoa(limit)
-	}
-
-	bits, _ := s.db.GetChannelHashcashBits(ctx, chID)
-	if bits > 0 {
-		modes += "H"
-		modeParams += " " + strconv.Itoa(bits)
-	}
-
-	return modes + modeParams
-}
-
-// broadcastNickChange notifies channel peers of a nick
-// change.
-func (s *Service) broadcastNickChange(
-	ctx context.Context,
-	sessionID int64,
-	oldNick, newNick string,
-) {
-	channels, err := s.db.GetSessionChannels(
-		ctx, sessionID,
-	)
-	if err != nil {
-		return
-	}
-
-	body, _ := json.Marshal([]string{newNick}) //nolint:errchkjson
-	notified := make(map[int64]bool)
-
-	dbID, _, insErr := s.db.InsertMessage(
-		ctx, irc.CmdNick, oldNick, "",
-		nil, body, nil,
-	)
-	if insErr != nil {
-		return
-	}
-
-	// Notify the user themselves (for multi-client sync).
-	_ = s.db.EnqueueToSession(ctx, sessionID, dbID)
-	s.broker.Notify(sessionID)
-	notified[sessionID] = true
-
-	for _, ch := range channels {
-		memberIDs, memErr := s.db.GetChannelMemberIDs(
-			ctx, ch.ID,
-		)
-		if memErr != nil {
-			continue
-		}
-
-		for _, mid := range memberIDs {
-			if notified[mid] {
-				continue
-			}
-
-			notified[mid] = true
-
-			_ = s.db.EnqueueToSession(ctx, mid, dbID)
-			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/commands.go

@@ -2,13 +2,8 @@ package irc
 
 // IRC command names (RFC 1459 / RFC 2812).
 const (
-	CmdAdmin    = "ADMIN"
 	CmdAway    = "AWAY"
-	CmdInfo     = "INFO"
-	CmdInvite   = "INVITE"
 	CmdJoin    = "JOIN"
-	CmdKick     = "KICK"
-	CmdKill     = "KILL"
 	CmdList    = "LIST"
 	CmdLusers  = "LUSERS"
 	CmdMode    = "MODE"
@@ -23,12 +18,7 @@ const (
 	CmdPong    = "PONG"
 	CmdPrivmsg = "PRIVMSG"
 	CmdQuit    = "QUIT"
-	CmdTime     = "TIME"
 	CmdTopic   = "TOPIC"
-	CmdUser     = "USER"
-	CmdUserhost = "USERHOST"
-	CmdVersion  = "VERSION"
-	CmdWallops  = "WALLOPS"
 	CmdWho     = "WHO"
 	CmdWhois   = "WHOIS"
 )

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",