Files
OwnCord/Server/ws/deps.go
T
Claude 03cc77dfe5 clean up WS deps: remove unused DB/Permissions from migrated handlers
ChatDeps, PresenceDeps, ReactionDeps no longer carry *db.DB or
*permissions.Checker — those were only needed before the service
migration. VoiceDeps retains them for voice handlers not yet migrated.

https://claude.ai/code/session_01CBFF3r84ywkJRWwuqw8zD8
2026-04-05 21:36:29 +00:00

114 lines
4.3 KiB
Go

package ws
import (
"context"
"github.com/owncord/server/auth"
"github.com/owncord/server/db"
"github.com/owncord/server/permissions"
"github.com/owncord/server/service"
)
// ClientInfo holds a read-only snapshot of client state for V2 handlers.
// Handlers receive this instead of a mutable *Client pointer, making them
// easier to test and reason about.
type ClientInfo struct {
UserID int64
Username string
Avatar *string
RoleName string
ReqID string
VoiceChannelID int64 // 0 if not in a voice channel
VoiceJoinToken string // opaque join-instance token for the current voice session
}
// ── Per-domain dependency structs ───────────────────────────────────────────
// PingDeps holds dependencies for the ping handler.
type PingDeps struct {
Limiter *auth.RateLimiter
}
// ChatDeps holds dependencies for chat handlers.
type ChatDeps struct {
Limiter *auth.RateLimiter
MessageSvc *service.MessageService
}
// PresenceDeps holds dependencies for presence, typing, and channel focus handlers.
type PresenceDeps struct {
Limiter *auth.RateLimiter
ChannelSvc *service.ChannelService
}
// ReactionDeps holds dependencies for reaction handlers.
type ReactionDeps struct {
MessageSvc *service.MessageService
}
// VoiceTokenGenerator generates LiveKit access tokens. Abstracted so V2
// handlers can be tested without a real LiveKit server.
type VoiceTokenGenerator interface {
GenerateToken(userID int64, username string, channelID int64, voiceJoinToken string, canPublish, canSubscribe, canVideo, canScreenShare bool) (string, error)
URL() string
}
// KeyHolderChecker reports whether a user is the E2EE key holder for a voice channel.
type KeyHolderChecker interface {
IsVoiceKeyHolder(channelID, userID int64) bool
}
// VoiceDeps holds dependencies for voice handlers.
type VoiceDeps struct {
DB *db.DB
Limiter *auth.RateLimiter
Permissions *permissions.Checker
LiveKit *LiveKitClient
TokenGen VoiceTokenGenerator // used by voice_token_refresh V2
KeyHolder KeyHolderChecker // used by voice_token_refresh V2
}
// ── V2 permission helpers ───────────────────────────────────────────────────
// requirePerm checks a channel permission via DB lookups. Returns nil if
// allowed, or a Result with a FORBIDDEN error. Used by V2 handlers that
// cannot access the Hub's requireChannelPerm method.
func requirePerm(database *db.DB, perms *permissions.Checker, userID, channelID, perm int64, label string) *Result {
if database == nil || perms == nil {
r := Result{Error: ClientError{Code: ErrCodeForbidden, Message: "missing " + label + " permission"}}
return &r
}
role, err := database.GetRoleForUser(userID)
if err != nil || role == nil {
r := Result{Error: ClientError{Code: ErrCodeForbidden, Message: "missing " + label + " permission"}}
return &r
}
if !perms.HasChannelPerm(role.Permissions, role.ID, channelID, perm) {
r := Result{Error: ClientError{Code: ErrCodeForbidden, Message: "missing " + label + " permission"}}
return &r
}
return nil
}
// hasPerm checks a channel permission via DB lookups. Returns true if allowed.
func hasPerm(database *db.DB, perms *permissions.Checker, userID, channelID, perm int64) bool {
if database == nil || perms == nil {
return false
}
role, err := database.GetRoleForUser(userID)
if err != nil || role == nil {
return false
}
return perms.HasChannelPerm(role.Permissions, role.ID, channelID, perm)
}
// ── V2 handler type ─────────────────────────────────────────────────────────
// HandlerV2 is the function signature for new-style (pure-ish) handlers.
// They receive a typed Command, a read-only ClientInfo snapshot, and a
// domain-specific deps struct (passed as any; handler asserts the concrete type).
// They return a Result describing what events to emit and any error.
// TODO: consider replacing `deps any` with generics (HandlerV2[D any]) to get
// compile-time type safety on deps wiring. Requires reworking the registry map.
type HandlerV2 func(ctx context.Context, cmd Command, info ClientInfo, deps any) Result