mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
`Server/go.mod` declared `github.com/owncord/server` while the public repository is `github.com/J3vb/OwnCord`. Nothing resolves that path — there is no `owncord` GitHub org and no vanity-import host serving go-import metadata for it — so every import line in the tree named a location that does not exist. It compiles because a main module's own path is never fetched, which is exactly why it went unnoticed. The obvious fix — an AST-aware import rewriter (`gomvpkg`, `go mod edit`) — is wrong here, and provably so. Six of the 722 occurrences are not imports at all: `api/main_test.go:20` (a goleak `IgnoreTopFunction` pattern), `telemetry/metrics.go:17-19` (three OTel instrumentation-scope names), `invariants/syncutil_locks.go:73` (a diagnostic message), and `invariants/syncutil_locks_test.go:56` (an import line inside a raw-string Go fixture). An import rewriter touches none of them, and the compiler cannot see any of them either. Done as one scripted substitution over `git ls-files`, anchored on the full `github.com/owncord/server` string. The anchor matters: `owncord-server` is a different identifier — the OTel `service.name` (`config/config.go`, `telemetry/telemetry_otel.go`) and the GHCR image name (`.github/workflows/release.yml`, `docker-compose.yml`) — and a looser pattern would have moved it. It is untouched: 10 occurrences across 9 files, before and after. 350 files, 728 insertions, 728 deletions. 722 occurrences in 344 Go files, plus `go.mod:1`, the `sed` at `Makefile:67`, `Server/CLAUDE.md:3`, `docs/architecture/server.md:5`, and the ledger pair (`findings-ledger.json:3758` plus a `render-ledger.mjs` re-render of `FINDINGS.md`). Zero in any workflow, zero in the Dockerfile, zero in `Server/.golangci.yml` (no `local-prefixes`, `gci`, `importas` or `depguard` rule keys on the module path, so import grouping is not configured anywhere). The plan's blast-radius estimate missed one thing, and it is the one that would have gone red: **gofmt**. `J` (0x4A) sorts before every lowercase letter, so in the 36 files where a module-local import shares a contiguous group with a third-party one, the module's imports must move above `github.com/go-chi/...`. `gofmt -l` was clean before the substitution and listed exactly 36 files after it; `gofmt -w` on those 36 restores it to clean. `gofmt` is an enforced gate — the `formatters` block in `Server/.golangci.yml`, which is S-05 — so a substitution-only commit fails Lint. Verified: both directions, and the line accounting is exact. Every added line in this diff contains the new module path (728) and every removed line contains the old one (728); the count of changed lines containing neither is **zero**, so the gofmt re-sort moved module-path lines only and touched no third-party import. The residual check (`git ls-files -z | xargs -0 grep -n 'github\.com/owncord/server'`) returns exactly two hits, both deliberately out of scope: the RL-13 row in `docs/audit-2026-08-23-repository-layout.md` and the measurement row in this phase's own plan. The compiler-invisible half was proven by reverting *only* `api/main_test.go:20` to the old path on the otherwise-renamed tree: `go build ./...` and `go vet ./api/` both still pass — they see nothing wrong — while `go test ./api/` FAILS, because the runtime function name now carries the new path and goleak stops ignoring `ws.(*Hub).Run.func1`. Restoring the line makes it pass. `go.sum` is byte-identical (no `go mod tidy` was run and none was needed). All four build-tag variants compile; `go vet ./...`, `go vet -tags otel,wazero ./...` and `go vet -tags deadlock ./...` pass; `go test -race ./...` is 16/16 packages green; `go test -tags deadlock ./...` passes; the tag-gated `./plugin/...` (wazero) and `./telemetry/...` (otel) runs pass. `golangci-lint` v2.11.3 — the pinned CI version, rebuilt locally against Go 1.26 because the packaged binary cannot load a 1.26 config — reports **0 issues**. `go run ./cmd/genprotocol` leaves `git diff --exit-code ws/message_types.go ../Client/src/lib/protocolTypes.ts` clean, so the rename does not reach the generated protocol constants. `npx prettier --check .` and `node .superpowers/render-ledger.mjs --check` pass. Not included: `docs/audit-2026-08-23-repository-layout.md` and `docs/plans/b1-repository-foundation-2026-08-25.md` keep the old path — they are the audit row and the measurement that motivated this change, and rewriting them would erase the record of what was measured. They are why the residual check needs a two-path allowance rather than being empty; that allowance is stated above rather than hidden in a pathspec. `telemetry/metrics.go:19` declares `scopeVoice` for a `Server/voice` package that does not exist; the substitution carried the dead path forward verbatim as `github.com/J3vb/OwnCord/Server/voice` rather than fixing it, because correcting a real observability bug inside a mechanical rename would hide it in a 350-file diff. It needs its own item. No `go.work`, no second module, and no vanity-import host was set up — the new path resolves against the real repository, but nothing imports this module as a library, so `go get` reachability was not exercised either way. Refs RL-13, L-12
487 lines
18 KiB
Go
487 lines
18 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log/slog"
|
|
"net/http"
|
|
|
|
"github.com/J3vb/OwnCord/Server/db"
|
|
"github.com/J3vb/OwnCord/Server/service"
|
|
"github.com/J3vb/OwnCord/Server/ws"
|
|
"github.com/go-chi/chi/v5"
|
|
)
|
|
|
|
// DMBroadcaster is the interface needed to send WebSocket events from REST
|
|
// handlers. Satisfied by *ws.Hub.
|
|
type DMBroadcaster interface {
|
|
SendToUser(userID int64, msg []byte) bool
|
|
}
|
|
|
|
// dmVisibilityMarker is an optional DMBroadcaster capability: bump the hub's
|
|
// visibility watermark after an unsequenced, targeted event so a client that
|
|
// warm-reconnects across the gap takes the full-ready path instead of a
|
|
// sequenced-only replay that can never redeliver it. Reached by type
|
|
// assertion rather than being added to DMBroadcaster directly so the
|
|
// SendToUser-only test doubles in this package keep working. Satisfied in
|
|
// production by ws.Hub.MarkVisibilityChanged, which forwards to the same
|
|
// bumpVisibilityWatermark the WS-side dm_channel_open emitter uses
|
|
// (ws/emit.go).
|
|
type dmVisibilityMarker interface {
|
|
MarkVisibilityChanged()
|
|
}
|
|
|
|
// The production broadcaster must keep satisfying it: a type assertion that
|
|
// silently stops matching would turn the watermark bump back into the no-op
|
|
// this fixed, with nothing failing to say so — mirrors the dmVoiceEvictor
|
|
// assertion below for its sibling capability.
|
|
var _ dmVisibilityMarker = (*ws.Hub)(nil)
|
|
|
|
// markDMVisibilityChanged bumps the visibility watermark if broadcaster
|
|
// supports it. dm_channel_open/close are unsequenced and targeted, so a
|
|
// client that misses one via a dropped connection and then warm-reconnects
|
|
// never gets it redelivered by the ordinary seq-replay path — mirroring why
|
|
// the WS emitter of the same event (ws/emit.go DMChannelOpenEvent) forces
|
|
// this bump unconditionally, regardless of whether the send itself
|
|
// succeeded.
|
|
func markDMVisibilityChanged(broadcaster DMBroadcaster) {
|
|
if vm, ok := broadcaster.(dmVisibilityMarker); ok {
|
|
vm.MarkVisibilityChanged()
|
|
}
|
|
}
|
|
|
|
// dmVoiceEvictor is the DMBroadcaster capability used to evict a user's
|
|
// voice-call connection for one specific channel, leaving an unrelated call
|
|
// they may currently be in untouched (which the unconditional
|
|
// DisconnectFromVoice would not). It is kept out of DMBroadcaster itself and
|
|
// reached by type assertion so the handler stays usable with the
|
|
// SendToUser-only test doubles the package already has.
|
|
type dmVoiceEvictor interface {
|
|
DisconnectFromVoiceInChannel(ctx context.Context, userID, channelID int64) bool
|
|
}
|
|
|
|
// The production broadcaster must keep satisfying it: a type assertion that
|
|
// silently stops matching would turn the eviction back into the no-op this
|
|
// fixed, with nothing failing to say so.
|
|
var _ dmVoiceEvictor = (*ws.Hub)(nil)
|
|
|
|
// MountDMRoutes registers DM-related routes onto r.
|
|
// All routes require authentication.
|
|
// hub is used to send real-time WebSocket events on DM close.
|
|
func MountDMRoutes(r chi.Router, database *db.DB, svc *service.Services, broadcaster DMBroadcaster) {
|
|
r.Route("/api/v1/dms", func(r chi.Router) {
|
|
r.Use(AuthMiddleware(database))
|
|
r.Post("/", handleCreateDM(svc, broadcaster))
|
|
r.Post("/group", handleCreateGroupDM(svc, broadcaster))
|
|
r.Get("/", handleListDMs(svc))
|
|
r.Patch("/{channelId}", handleRenameGroupDM(svc, broadcaster))
|
|
r.Delete("/{channelId}", handleCloseDM(svc, broadcaster))
|
|
})
|
|
|
|
// User blocking routes — prevent DM creation and messaging.
|
|
r.Route("/api/v1/blocks", func(r chi.Router) {
|
|
r.Use(AuthMiddleware(database))
|
|
r.Get("/", handleListBlocks(svc))
|
|
r.Put("/{userId}", handleBlockUser(svc, broadcaster))
|
|
r.Delete("/{userId}", handleUnblockUser(svc))
|
|
})
|
|
}
|
|
|
|
// createDMRequest is the JSON body for POST /api/v1/dms.
|
|
type createDMRequest struct {
|
|
RecipientID int64 `json:"recipient_id"`
|
|
}
|
|
|
|
// createDMResponse is the JSON response for POST /api/v1/dms.
|
|
type createDMResponse struct {
|
|
ChannelID int64 `json:"channel_id"`
|
|
Recipient db.DMUser `json:"recipient"`
|
|
Created bool `json:"created"`
|
|
}
|
|
|
|
// createGroupDMRequest is the JSON body for POST /api/v1/dms/group.
|
|
type createGroupDMRequest struct {
|
|
RecipientIDs []int64 `json:"recipient_ids"`
|
|
Name string `json:"name"`
|
|
}
|
|
|
|
// renameDMRequest is the JSON body for PATCH /api/v1/dms/{channelId}.
|
|
type renameDMRequest struct {
|
|
Name string `json:"name"`
|
|
}
|
|
|
|
// listDMsResponse is the JSON response for GET /api/v1/dms.
|
|
type listDMsResponse struct {
|
|
DMChannels []db.DMChannelInfo `json:"dm_channels"`
|
|
}
|
|
|
|
// handleCreateDM creates or retrieves a DM channel with a recipient.
|
|
func handleCreateDM(svc *service.Services, broadcaster DMBroadcaster) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "authentication required",
|
|
})
|
|
return
|
|
}
|
|
|
|
var req createDMRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "invalid request body",
|
|
})
|
|
return
|
|
}
|
|
|
|
result, err := svc.DMs.CreateDM(r.Context(), user.ID, req.RecipientID)
|
|
if err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
// A brand-new 1:1 DM has dm_open_state pre-seeded for BOTH users by
|
|
// GetOrCreateDMChannel (db/dm_queries.go), so the recipient's first
|
|
// OpenDM call — fired later from the sender's first message — finds
|
|
// the row already present and reports opened=false. Without this,
|
|
// nothing ever tells the recipient the DM exists: no live event, and
|
|
// no visibility-watermark bump for a warm reconnect either. Only the
|
|
// creation path needs this — CreateDM re-opening an existing DM for
|
|
// the caller only touches the caller's own dm_open_state row, which
|
|
// the caller obviously already knows about.
|
|
if result.Created {
|
|
broadcastDMOpen(r.Context(), svc, broadcaster, result.Channel.ID, []int64{result.Recipient.ID})
|
|
}
|
|
|
|
avatarStr := ""
|
|
if result.Recipient.Avatar != nil {
|
|
avatarStr = *result.Recipient.Avatar
|
|
}
|
|
displayName := ""
|
|
if result.Recipient.DisplayName != nil {
|
|
displayName = *result.Recipient.DisplayName
|
|
}
|
|
// PresentableStatus applies the "no live connection is offline,
|
|
// whatever the row says" half of the rule ws/serve_ready.go's
|
|
// presentableMembers documents — StatusForViewer alone only
|
|
// collapses invisible to offline and would otherwise ship a
|
|
// disconnected recipient's saved idle/dnd verbatim (OC-0304).
|
|
dmUser := db.DMUser{
|
|
ID: result.Recipient.ID,
|
|
Username: result.Recipient.Username,
|
|
Avatar: avatarStr,
|
|
Status: svc.DMs.PresentableStatus(result.Recipient.ID, db.StatusForViewer(result.Recipient.Status, result.Recipient.ID, user.ID)),
|
|
DisplayName: displayName,
|
|
}
|
|
|
|
status := http.StatusOK
|
|
if result.Created {
|
|
status = http.StatusCreated
|
|
}
|
|
writeJSON(w, status, createDMResponse{
|
|
ChannelID: result.Channel.ID,
|
|
Recipient: dmUser,
|
|
Created: result.Created,
|
|
})
|
|
}
|
|
}
|
|
|
|
// handleListDMs returns all open DM channels for the authenticated user.
|
|
func handleListDMs(svc *service.Services) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "authentication required",
|
|
})
|
|
return
|
|
}
|
|
|
|
channels, err := svc.DMs.ListDMs(r.Context(), user.ID)
|
|
if err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, listDMsResponse{DMChannels: channels})
|
|
}
|
|
}
|
|
|
|
// handleCloseDM removes a DM channel from the authenticated user's open list.
|
|
func handleCloseDM(svc *service.Services, broadcaster DMBroadcaster) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "authentication required",
|
|
})
|
|
return
|
|
}
|
|
|
|
channelID, ok := parseIDParam(w, r, "channelId")
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
result, err := svc.DMs.CloseDM(r.Context(), user.ID, channelID)
|
|
if err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
// Notify via WebSocket so sidebar updates immediately.
|
|
if broadcaster != nil {
|
|
closeMsg := fmt.Appendf(nil, `{"type":%q,"payload":{"channel_id":%d}}`, ws.MsgTypeDMChannelClose, channelID)
|
|
if ok := broadcaster.SendToUser(user.ID, closeMsg); !ok {
|
|
slog.Debug("handleCloseDM: user not connected", "user_id", user.ID, "channel_id", channelID)
|
|
}
|
|
// dm_channel_close is unsequenced and targeted like
|
|
// dm_channel_open — see markDMVisibilityChanged.
|
|
markDMVisibilityChanged(broadcaster)
|
|
// A group leave changes the membership everyone else renders, so
|
|
// the survivors get a refreshed dm_channel_open rather than being
|
|
// left showing a member who has gone.
|
|
if result.Left && !result.ChannelDeleted {
|
|
broadcastDMOpen(r.Context(), svc, broadcaster, channelID, result.RemainingParticipantIDs)
|
|
}
|
|
// Leaving a group DM removes the caller from its membership but,
|
|
// without this, leaves them connected to its live voice call —
|
|
// they keep hearing and speaking to a room they are no longer a
|
|
// member of. Scoped to this channel so a leaver currently on an
|
|
// unrelated voice call is untouched. This also covers the
|
|
// last-participant case (ChannelDeleted): the row is already gone
|
|
// by now, so CleanupVoiceForChannel would read an FK-cascaded
|
|
// empty voice_states and do nothing, while the leaver — the only
|
|
// participant left — is evicted here.
|
|
if result.Left {
|
|
if ve, ok := broadcaster.(dmVoiceEvictor); ok {
|
|
ve.DisconnectFromVoiceInChannel(context.WithoutCancel(r.Context()), user.ID, channelID)
|
|
}
|
|
}
|
|
}
|
|
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
}
|
|
|
|
// broadcastDMOpen sends a per-viewer dm_channel_open for channelID to each of
|
|
// targetIDs. The payload differs per addressee (`recipient`/`recipients` are
|
|
// relative to who is reading), so it is rebuilt inside the loop.
|
|
//
|
|
// Failures are logged and skipped, never surfaced: the mutation that prompted
|
|
// this has already committed, and a client that misses the event re-derives
|
|
// the same state from its next `ready`.
|
|
func broadcastDMOpen(ctx context.Context, svc *service.Services, broadcaster DMBroadcaster, channelID int64, targetIDs []int64) {
|
|
if broadcaster == nil || len(targetIDs) == 0 {
|
|
return
|
|
}
|
|
// The mutation that led here has already committed, so this fan-out must
|
|
// survive the caller's request context being cancelled after that point
|
|
// (client disconnect mid-handler) — otherwise every DMSummaryFor lookup
|
|
// below fails with context.Canceled and no participant, including ones
|
|
// otherwise unaffected by the cancellation, ever receives the open.
|
|
ctx = context.WithoutCancel(ctx)
|
|
// dm_channel_open is unsequenced and targeted — a recipient who is
|
|
// offline or drops the connection right now can never have it replayed
|
|
// to them by the ordinary seq-based resume path, so a warm reconnect must
|
|
// be forced onto the full-ready path instead. Bumped once per call,
|
|
// unconditionally (not per-recipient SendToUser result): the ws emitter
|
|
// of this same event does the same (ws/emit.go), and this covers every
|
|
// caller — group create, rename refresh, and the group-leave refresh.
|
|
markDMVisibilityChanged(broadcaster)
|
|
for _, pid := range targetIDs {
|
|
summary, pErr := svc.DMs.DMSummaryFor(ctx, pid, channelID)
|
|
if pErr != nil {
|
|
slog.Debug("broadcastDMOpen: summary unavailable", "user_id", pid, "channel_id", channelID, "err", pErr)
|
|
continue
|
|
}
|
|
msg, mErr := json.Marshal(map[string]any{
|
|
"type": "dm_channel_open",
|
|
"payload": summary,
|
|
})
|
|
if mErr != nil {
|
|
slog.Warn("broadcastDMOpen: marshal failed", "err", mErr, "channel_id", channelID)
|
|
continue
|
|
}
|
|
if ok := broadcaster.SendToUser(pid, msg); !ok {
|
|
slog.Debug("broadcastDMOpen: user not connected", "user_id", pid, "channel_id", channelID)
|
|
}
|
|
}
|
|
}
|
|
|
|
// handleCreateGroupDM creates a group DM between the caller and 2..8 others.
|
|
func handleCreateGroupDM(svc *service.Services, broadcaster DMBroadcaster) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "authentication required",
|
|
})
|
|
return
|
|
}
|
|
|
|
var req createGroupDMRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "invalid request body",
|
|
})
|
|
return
|
|
}
|
|
|
|
result, err := svc.DMs.CreateGroupDM(r.Context(), user.ID, req.RecipientIDs, req.Name)
|
|
if err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
// Everyone gets the DM in their sidebar immediately, the creator
|
|
// included — the REST response is only the creator's copy, and a
|
|
// second window of theirs needs the event just as much as the others.
|
|
broadcastDMOpen(r.Context(), svc, broadcaster, result.Channel.ID, result.ParticipantIDs)
|
|
|
|
writeJSON(w, http.StatusCreated,
|
|
db.NewDMChannelInfo(result.Channel.ID, result.Channel.Name, true, result.Participants, user.ID))
|
|
}
|
|
}
|
|
|
|
// handleRenameGroupDM sets or clears a group DM's name. Participants only —
|
|
// there is no owner, so every member holds the same authority over it.
|
|
func handleRenameGroupDM(svc *service.Services, broadcaster DMBroadcaster) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(UserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{
|
|
Error: "UNAUTHORIZED", Message: "authentication required",
|
|
})
|
|
return
|
|
}
|
|
|
|
channelID, ok := parseIDParam(w, r, "channelId")
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
var req renameDMRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, errorResponse{
|
|
Error: "BAD_REQUEST", Message: "invalid request body",
|
|
})
|
|
return
|
|
}
|
|
|
|
if _, err := svc.DMs.RenameGroupDM(r.Context(), user.ID, channelID, req.Name); err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
// The rename has already committed at this point, so this lookup must
|
|
// survive the caller's request context being cancelled right after
|
|
// that commit (client disconnect mid-handler) — same reasoning as
|
|
// broadcastDMOpen's own context.WithoutCancel, and the failure must be
|
|
// logged rather than silently dropping the fan-out (participants would
|
|
// keep rendering the stale name with no compensating resync, since
|
|
// dm_channel_open is unsequenced/targeted and can't be replayed).
|
|
bgCtx := context.WithoutCancel(r.Context())
|
|
participantIDs, pErr := svc.Channels.GetDMParticipantIDs(bgCtx, channelID)
|
|
if pErr != nil {
|
|
slog.Error("handleRenameGroupDM: participant lookup failed", "err", pErr, "channel_id", channelID)
|
|
} else {
|
|
broadcastDMOpen(bgCtx, svc, broadcaster, channelID, participantIDs)
|
|
}
|
|
|
|
summary, sErr := svc.DMs.DMSummaryFor(r.Context(), user.ID, channelID)
|
|
if sErr != nil {
|
|
writeServiceError(r.Context(), w, sErr)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, summary)
|
|
}
|
|
}
|
|
|
|
// handleBlockUser blocks a user.
|
|
func handleBlockUser(svc *service.Services, broadcaster DMBroadcaster) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, _ := r.Context().Value(UserKey).(*db.User)
|
|
if user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{Error: "UNAUTHORIZED", Message: "authentication required"})
|
|
return
|
|
}
|
|
|
|
targetID, ok := parseIDParam(w, r, "userId")
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
if err := svc.Blocks.BlockUser(r.Context(), user.ID, targetID); err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
|
|
// The block has already committed at this point, so the rest of this
|
|
// handler must survive the caller's request context being cancelled
|
|
// right after that commit (client disconnect mid-handler) — same
|
|
// reasoning as handleRenameGroupDM's own bgCtx. Without this, a
|
|
// canceled request context makes the shared-DM lookup below fail and
|
|
// get skipped, silently defeating the eviction it gates.
|
|
bgCtx := context.WithoutCancel(r.Context())
|
|
|
|
// Revocation must evict a live session, not merely block the next
|
|
// join (the same invariant the voice sweep states): without this, a
|
|
// blocked user already in the pair's 1:1 DM voice call stays in it
|
|
// indefinitely — the block gate otherwise runs only on voice_join and
|
|
// voluntary voice_token_refresh, both of which the blocked client
|
|
// controls. Group DM calls are deliberately untouched, matching
|
|
// requireDMNotBlocked's group exemption.
|
|
if ve, evictable := broadcaster.(dmVoiceEvictor); evictable {
|
|
if chID, exists, err := svc.DMs.SharedOneToOneDM(bgCtx, user.ID, targetID); err != nil {
|
|
slog.Warn("block: shared-DM lookup for voice eviction failed",
|
|
"blocker_id", user.ID, "target_id", targetID, "err", err)
|
|
} else if exists {
|
|
ve.DisconnectFromVoiceInChannel(bgCtx, targetID, chID)
|
|
}
|
|
}
|
|
|
|
writeJSON(w, http.StatusOK, map[string]string{"message": "user blocked"})
|
|
}
|
|
}
|
|
|
|
// handleUnblockUser unblocks a user.
|
|
func handleUnblockUser(svc *service.Services) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, _ := r.Context().Value(UserKey).(*db.User)
|
|
if user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{Error: "UNAUTHORIZED", Message: "authentication required"})
|
|
return
|
|
}
|
|
|
|
targetID, ok := parseIDParam(w, r, "userId")
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
if err := svc.Blocks.UnblockUser(r.Context(), user.ID, targetID); err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, map[string]string{"message": "user unblocked"})
|
|
}
|
|
}
|
|
|
|
// handleListBlocks returns all blocked user IDs.
|
|
func handleListBlocks(svc *service.Services) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
user, _ := r.Context().Value(UserKey).(*db.User)
|
|
if user == nil {
|
|
writeJSON(w, http.StatusUnauthorized, errorResponse{Error: "UNAUTHORIZED", Message: "authentication required"})
|
|
return
|
|
}
|
|
|
|
ids, err := svc.Blocks.ListBlocked(r.Context(), user.ID)
|
|
if err != nil {
|
|
writeServiceError(r.Context(), w, err)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, map[string]any{"blocked_user_ids": ids})
|
|
}
|
|
}
|