mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
* refactor(ws): split handleVoiceJoin into cohesive join-stage helpers handleVoiceJoin was 130 statements / cyclomatic 59 / nestif 11, breaking all three complexity budgets at once. Split along the stage boundaries the doc comment already described: precheck, leave-current, persist, restore moderator flags, grant token, complete. The publish-permission derivation becomes its own helper because it is the one branch-heavy block inside the token grant. Pure move: every statement is preserved verbatim. The only edits are bare `return`s becoming the typed returns of their new helper, `c.userID` becoming the `userID` parameter inside voiceJoinPublishPerms, and voiceJoinComplete re-reading `ch.VoiceMaxUsers` instead of receiving it — `ch` is never mutated, so the value is identical. Verified by normalising both revisions of the region to sorted, comment- and whitespace-stripped statements and diffing: the only deltas are the ones listed above. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: collapse the three duplicated sibling pairs dupl flagged three pairs of adjacent near-identical functions. Each pair is now one parameterised implementation plus two thin, still-greppable wrappers. - ws/voice_controls.go: handleVoiceMuteV2 / handleVoiceDeafenV2 share voiceSelfToggleV2; handleVoiceCameraV2 / handleVoiceScreenshareV2 share voiceStreamToggleV2. Camera and screenshare drawing from one voice_max_video budget (OC-0023) was a bug caused by exactly this duplication drifting, so one body is the point, not a side effect. - db/mention_queries.go: ListMentionTargetsByRoles / ListMentionTargetsByUserIDs share listMentionTargets. The matched column is a closed named type (mentionTargetColumn) rather than a bare string, so the value interpolated into the SELECT cannot become caller-supplied. Behaviour is unchanged: every rate-limit key, error code, error string, slog message and slog key is preserved verbatim, including the two "failed to update <kind> state" messages, which are now assembled the same way enableVideoSlot already assembled them. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(api): extract readEmojiUpload from handleCreateEmoji handleCreateEmoji was 101 lines against a 100-line budget. The upload-bytes stage — pull the file out of the parsed form, cap its size, sniff its MIME type and sniff its dimensions — is the one self-contained block in it, and it already wrote its own refusals, so it moves out whole as readEmojiUpload. The permission-before-parse ordering the doc comment calls out is unchanged; so is every error string. file.Close() now runs when the helper returns rather than when the handler does, which is strictly earlier and unobservable: the bytes are already copied into raw and nothing else touches the handle. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: extract one cohesive block from three single-budget offenders Each of these was over exactly one budget, so each gets exactly one extraction rather than a restructure: - api/totp_handler.go handleVerifyTOTP (102 lines / 100): the block that resolves the user behind the partial-auth challenge and decrypts their TOTP secret becomes totpChallengeSecret. The ban-inside-the-partial-window check moves with it. - service/message_reactions.go handleReaction (cyclop 21 / 20): the whole authorisation chain — channel lookup, archived gate, DM participant and block checks, non-DM permission check — becomes reactionAudience, which also returns the DM fan-out audience it already resolved. Check order is unchanged and load-bearing. - db/admin_queries.go BackupToSafe (cyclop 21 / 20): the character allowlist loop and the SQL-comment rejection become validateBackupPathChars. That loop alone was most of the branch count. No error string, no check and no ordering changed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(plugin): split InstallFromZip into staged install helpers 104 statements / cyclomatic 44 / nestif 12. Split along the stages the code already had: installZipExtract (the per-entry write loop, with installZipEntryDest holding the mode/symlink/zip-slip guard chain and installZipWriteEntry the size-capped copy), installZipStagedManifest, installZipPromote, and installZipReactivate for the :399 nested block. Every zip-slip, symlink, entry-mode and uncompressed-size check is preserved in the same order relative to the writes it guards. The 19 inline `cleanup(); return` sites collapse to 4 in the orchestrator, one per stage, because each helper now returns an error instead of unwinding itself — the staging directory is still removed on exactly the same set of failures. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(api): split newWAFMiddleware into engine build and per-phase helpers 184 lines / cyclomatic 38, and the request-body block at :382 was the worst nested site in the tree at nestif 17. Engine construction moves out of the closure (wafInlineEngine, wafCRSEngine — the Coraza directive string is lifted verbatim), and each request phase becomes its own helper: wafInlineRequestHeaders, wafCRSRequestHeaders (including the Host/Transfer-Encoding re-add for CRS 920280), wafFeedCRSBody and wafInspectRequestBody, which is the old :382 block. The three `handleWAFInterruption(w, it); return` sites inside the body block become one: the helper now returns the interruption and the orchestrator handles it. No statement runs between the two points on either side, so the verdict is honoured identically — in particular a CRS body interruption still returns without replacing r.Body. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(service): split SendMessage and lift EditMessage's access check SendMessage was 79 statements / cyclomatic 35 with an 11-deep nested attachment block at :101; EditMessage was one point over cyclop. SendMessage becomes sendMessagePrecheck (permission and DM-block gates, content sanitisation), sendMessageLinkAttachments (the :101 block: attachment ownership, claim and link) and sendMessageDMSideEffects. EditMessage gets editMessageCheckAccess and nothing else — one budget over earns one extraction. The sanitizeContent fixpoint and the attachment ownership check are unchanged, as is the order of every gate. The DM side effects run behind `isDM && !s.sendMessageDMSideEffects(...)`, so a non-DM never enters them; inside, only the GetDMParticipantIDs failure returns false, matching the one error the original early-returned on. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(admin): split handlePatchUser into per-field apply helpers 106 lines / cyclomatic 29, with the ban block at :154 nested 9 deep. Each optional field of the partial edit becomes its own helper — patchUserPrecheck, patchUserAuthorizeRole, patchUserApplyBan (the :154 block, including the session disconnect and the broadcast) and patchUserApplyRole. Each returns a bool meaning "keep going"; none of them writes a success response, so the single response site in the orchestrator is unchanged. Field application order, the permission-cache invalidation on a role change and the disconnect-and-broadcast on a ban are all preserved, as are the three fail-closed `mod == nil` guards, which now sit at the top of their own helper and still fire on exactly the same conditions. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(admin): split handleSetup into first-run setup stages 143 lines / cyclomatic 30, with the optional-wizard block at :219 sitting exactly on the nestif threshold. Split into the stages the endpoint already had: request gating (rate limit and origin check, which run before any auth exists on a fresh server), owner account creation, and the wizard application that was the :219 block. Every gate in front of the handler is a security control on an unauthenticated endpoint; none moved relative to the work it protects. setup_wizard.go is untouched. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: split run() into named bootstrap and shutdown steps 131 statements / cyclomatic 57, with the executable-path fallback at :126 nested 9 deep. The five anonymous `defer func(){...}()` blocks become named functions — telemetryStop, runClosePlugins, runStopEventPersistence, runStopAuditWriter, maintenanceStop — and the bootstrap stages move out likewise. Every defer is still registered in run() itself, at the same point in the sequence, so the LIFO teardown order is unchanged; that order is documented in the surrounding comments and is load-bearing (the audit-writer stop must follow database.Close's registration, the event-persistence stop must precede it). runStopEventPersistence is now registered unconditionally with a nil persister meaning "disabled", where the old code registered its defer inside the enabled branch — a no-op occupying that slot cannot change the relative order of the others. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(ws): split handleReconnect into resume stages 77 statements / cyclomatic 41, plus the replay block at :199 and, in handleFreshConnect, the voice-state restore at :622. handleReconnect becomes reconnectPrecheck, reconnectSelectReplay (with reconnectVetColdTail for the cold-tier gap check), reconnectRegister and reconnectWriteReplay. handleFreshConnect's stale-voice cleanup moves to its own helper, where the `if h.livekit != nil` wrapper becomes a guard clause — that block was the tail of its scope, so returning early and falling off the end are the same. The parts that carry the invariants are moved verbatim: reconnectRegister still takes h.seqMu, still calls registerNow inside that same critical section (BUG-123 / OC-0206), still unlocks on every exit, and still emits the "full" tier counter and telemetry on each of its three re-check failures. handleReconnect's two-boolean contract is unchanged — the collapsed `return false, false` sites are all fall-through-to-full-ready, and the single `return true, false` is still the handshake-write-failure path whose teardown already ran (OC-0051). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * docs(server): fold in the adversarial review of the complexity refactors Eleven skeptic passes over the refactor commits on this branch found no blocker and no major — behaviour is preserved throughout. They did find comment and accuracy defects worth correcting: - db/mention_queries.go: the mentionTargetColumn rationale claimed the named type made the interpolated column "only ever one of the two constants". A Go named type is not closed, so that is a convention the type makes visible, not one it enforces. Reworded, gosec justification included. - ws/voice_controls.go: the dupl collapse generalised away three specifics — that a server deafen is the moderator's to lift (now on the serverDeafen field), the concrete voice_states.camera / voice_states.screenshare column names, and the half of the OC-0023 rationale about neither stream kind hiding from the other's count. All three restored. - ws/voice_join.go: `maxUsers := ch.VoiceMaxUsers` had been hoisted to the top of voiceJoinComplete, moving a read across the tail supersession guard. The read is inert, but it was the one statement in that commit whose position relative to a security guard changed; it now sits at its use, as before. - ws/*_test.go: three test comments cited voice_join.go line numbers that the split invalidated. They now cite the helper by name instead. - service/message_reactions.go: reactionAudience's doc claimed to enforce "every gate on reacting"; it enforces the channel-scoped ones, and the doc now says which gates stay with the caller. - api/emoji_handler.go: the readEmojiUpload call reused the outer `ok` from the auth check by assignment; it gets its own readOK. - admin/setup_handler.go: a moved comment kept a "the response above" deictic that no longer had a response above it. No behaviour change. Build, vet, full tests and -race on five packages green. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(ws): clear the remaining complexity budgets across the hub Eight files, thirteen findings. Each function is split at the stages it already had; no branch is reordered, merged or inverted. - handlers.go handleMessage (cyclop 28, 88 stmts): session re-check, frame decode and result application become handleMessageSessionRecheck, handleMessageDecode and handleMessageApply. The V2 constructor lookup -> DispatchV2 -> Result resolution order is untouched. - serve_ready.go buildReady (cyclop 26, 61 stmts): the per-section fetches split out, readyChannelPayloads among them. Every visibility predicate is preserved verbatim — this is the payload that decides what a client may see. - serve_pumps.go writePump (cyclop 31): writePumpWrite, writePumpDeliver, writePumpDrainChannel and writePumpDrainAndClose. Every channel receive stays in the same select statement, so scheduling is unchanged. - hub_sweep.go sweepStaleVoiceStates (cyclop 22, 56 stmts): the staleness predicate, the hub-lock ordering and the position of the race hook are all as they were — handleVoiceJoin's BUG-088 ordering depends on them. - hub_broadcast.go channelReadAudienceImpl and RefreshChannelVisibility (cyclop 22 each, 57 stmts): channelReadAudienceDM and refreshChannelVisibilityCanSend. The audience predicate is the OC-0090 group-DM leak surface, so it is extracted, never simplified. - livekit_webhook.go (nestif 13 and 14): webhookJoinedEnforceVoiceState, webhookLeftCleanupClient and webhookLeftFinishLeave. DB delete still precedes broadcast on every path. - livekit_download.go EnsureLiveKitBinary (52 stmts): one extraction, ensureLiveKitStageBinary, keeping every archive path check intact. - voice_moderation.go (nestif 8): voiceModDeafenRollback. The persisted server_muted flag remains the authority. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor(api): clear the remaining complexity budgets across the HTTP layer - router.go NewRouter (cyclop 28, 84 stmts): split by wiring concern into routerTOTPKey, routerHealthDeps, routerMiddleware, routerUploadRoutes, routerPluginWiring, routerVoiceRoutes and routerMetricsRoutes. Middleware ORDER is a security property (auth before handler, WAF before body parse, rate limit before work) and is unchanged; the returned cleanup func still closes over and releases everything it did before. - auth_handler.go handleRegister (133 lines) and handleLogin (cyclop 21, 152 lines): registerPolicyGate, registerReadRequest, loginReadRequest and loginAuthenticate. The always-compare posture, every rate-limit key, every counter reset and the ban-check-versus-password-compare order are all preserved — including loginUserFailureThreshold staying unscaled by scaledAuthLimit, which is deliberate and commented. - upload_handler.go handleServeFile (cyclop 31, 128 lines): serveFileResolve and serveFileAuthorize. Every header this sets — Content-Disposition included, which is what stops a stored file being served as active content — is still set with the same value in the same circumstances. - profile_handler.go handleUploadAvatar (120 lines): avatarUploadReadImage, mirroring readEmojiUpload in shape but with the avatar caps and MIME set. The two deliberately do not share a helper. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * refactor: clear the last complexity budgets in db and admin - db/account.go DeleteAccount (cyclop 28, 55 stmts): grouped by subsystem into deleteAccountAdminGuard, deleteAccountDMChannels and deleteAccountCloseDMChannels, each taking the same transaction. The transaction boundary, the delete ORDER (which foreign keys depend on) and the rollback path are unchanged. - admin/logstream.go handleLogStream (cyclop 24): logStreamAuthorize. Flush cadence, heartbeat and disconnect detection untouched. - admin/setup_wizard.go validateWizard (cyclop 23): grouped by section into wizardValidateIdentity, wizardValidateNetwork and wizardValidateMedia. Every message and bound is unchanged — this is the first input-validation boundary on a fresh server, before any auth exists. With this the tree is at zero: golangci-lint run reports 0 issues against the budgets set in #1384 (funlen 100/50, cyclop 20, nestif 8, dupl 150), with no //nolint and no exclusion added anywhere. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
379 lines
16 KiB
Go
379 lines
16 KiB
Go
package ws
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
|
|
"github.com/owncord/server/db"
|
|
"github.com/owncord/server/permissions"
|
|
)
|
|
|
|
// buildAuthOK constructs the auth_ok server→client message.
|
|
// Per PROTOCOL.md, user object contains only id, username, avatar, role (no status).
|
|
//
|
|
// replaySource records which reconnection tier served this client:
|
|
// - "none" — fresh connection or full re-sync (no resume)
|
|
// - "buffer" — resume served from the in-memory ring buffer
|
|
// - "db" — resume served from the persistent EventStore (Phase B Step 7)
|
|
func (h *Hub) buildAuthOK(ctx context.Context, user *db.User, roleName string, replaySource string) []byte {
|
|
var avatarVal any
|
|
if user.Avatar != nil {
|
|
avatarVal = *user.Avatar
|
|
}
|
|
|
|
serverName, motd := h.getCachedSettings(ctx)
|
|
|
|
return buildJSON(map[string]any{
|
|
"type": MsgTypeAuthOK,
|
|
"payload": map[string]any{
|
|
"user": map[string]any{
|
|
"id": user.ID,
|
|
"username": user.Username,
|
|
"avatar": avatarVal,
|
|
"role": roleName,
|
|
// The signed-in user's own profile fields. Null when unset;
|
|
// display_name falls back to username client-side, and about
|
|
// is what the "edit my profile" form pre-fills from.
|
|
"display_name": user.DisplayName,
|
|
"about": user.About,
|
|
"custom_status": user.CustomStatus,
|
|
// The user's own true status — invisible included. Only their
|
|
// own auth_ok ever carries it, which is the whole point: the
|
|
// picker has to render what they chose, while every other
|
|
// client is told offline.
|
|
"status": user.Status,
|
|
},
|
|
"server_name": serverName,
|
|
"motd": motd,
|
|
"replay_source": replaySource,
|
|
},
|
|
})
|
|
}
|
|
|
|
// presentableMembers rewrites each member's status into what viewerID may see.
|
|
//
|
|
// Two rules, both applied here so no payload builder can implement only one:
|
|
//
|
|
// 1. A member with no live connection is offline, whatever the row says.
|
|
// users.status keeps a *chosen* idle/dnd/invisible across a disconnect so
|
|
// the next connect can honour it, which would otherwise leave a signed-out
|
|
// user showing as "Do Not Disturb" indefinitely.
|
|
// 2. An invisible member is offline to everyone but themselves
|
|
// (db.StatusForViewer). The owner keeps their true state so their own
|
|
// picker renders the status they actually chose.
|
|
func (h *Hub) presentableMembers(members []db.MemberSummary, viewerID int64) []db.MemberSummary {
|
|
connected := h.connectedUserIDs()
|
|
out := make([]db.MemberSummary, 0, len(members))
|
|
for _, m := range members {
|
|
if !connected[m.ID] {
|
|
m.Status = db.StatusOffline
|
|
m.CustomStatus = nil
|
|
}
|
|
out = append(out, m.ForViewer(viewerID))
|
|
}
|
|
return out
|
|
}
|
|
|
|
// presentableDMChannels applies presentableMembers' "no live connection means
|
|
// offline" rule to a DM channel list's recipient statuses. GetUserDMChannels
|
|
// already applies db.StatusForViewer (the invisible-to-others half); this
|
|
// adds the missing "no live connection" half so dm_channels cannot disagree
|
|
// with the members array about whether the same disconnected user is online.
|
|
// Both Recipient (the legacy single-recipient field) and every entry of
|
|
// Recipients (the group-aware field) are rewritten, since a 1:1 DM's
|
|
// Recipient is a copy of Recipients[0], not a shared reference.
|
|
func (h *Hub) presentableDMChannels(dmChannels []db.DMChannelInfo) []db.DMChannelInfo {
|
|
connected := h.connectedUserIDs()
|
|
for i := range dmChannels {
|
|
if dmChannels[i].Recipient.ID != 0 && !connected[dmChannels[i].Recipient.ID] {
|
|
dmChannels[i].Recipient.Status = db.StatusOffline
|
|
}
|
|
for j := range dmChannels[i].Recipients {
|
|
if !connected[dmChannels[i].Recipients[j].ID] {
|
|
dmChannels[i].Recipients[j].Status = db.StatusOffline
|
|
}
|
|
}
|
|
}
|
|
return dmChannels
|
|
}
|
|
|
|
// connectedUserIDs snapshots the ids with a live WebSocket connection.
|
|
func (h *Hub) connectedUserIDs() map[int64]bool {
|
|
h.mu.RLock()
|
|
defer h.mu.RUnlock()
|
|
set := make(map[int64]bool, len(h.clients))
|
|
for uid := range h.clients {
|
|
set[uid] = true
|
|
}
|
|
return set
|
|
}
|
|
|
|
// channelRefs maps db channels to the checker's db-agnostic ChannelRef so
|
|
// buildReady and computeAllowedChannels can share permissions.VisibleChannelIDs.
|
|
func channelRefs(channels []db.Channel) []permissions.ChannelRef {
|
|
refs := make([]permissions.ChannelRef, len(channels))
|
|
for i := range channels {
|
|
refs[i] = permissions.ChannelRef{ID: channels[i].ID, Type: channels[i].Type, Archived: channels[i].Archived}
|
|
}
|
|
return refs
|
|
}
|
|
|
|
// permOverrides maps a db override map to the checker's override map, carrying
|
|
// BOTH layers — the role override and the per-user override — so the checker
|
|
// resolves the full order (base -> role -> user) rather than half of it.
|
|
func permOverrides(overrides map[int64]db.ChannelOverride) map[int64]permissions.ChannelOverride {
|
|
out := make(map[int64]permissions.ChannelOverride, len(overrides))
|
|
for id, o := range overrides {
|
|
out[id] = permissions.ChannelOverride{
|
|
Allow: o.Allow,
|
|
Deny: o.Deny,
|
|
UserAllow: o.UserAllow,
|
|
UserDeny: o.UserDeny,
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// channelCanSend reports whether a user with the given role and per-channel
|
|
// override may post in a channel of chanType. It mirrors the non-DM branch of
|
|
// MessageService.checkSendPermission so the client can pre-disable the composer
|
|
// without a round-trip; the server still enforces the rule authoritatively.
|
|
func channelCanSend(role *db.Role, o db.ChannelOverride, chanType string) bool {
|
|
if role == nil {
|
|
return false
|
|
}
|
|
if permissions.HasAdmin(role.Permissions) {
|
|
return true
|
|
}
|
|
eff := permissions.EffectiveChannelPerms(role.Permissions, permissions.ChannelOverride{
|
|
Allow: o.Allow, Deny: o.Deny, UserAllow: o.UserAllow, UserDeny: o.UserDeny,
|
|
})
|
|
need := permissions.ReadMessages | permissions.SendMessages
|
|
if eff&need != need {
|
|
return false
|
|
}
|
|
if chanType == "announcement" {
|
|
return eff&permissions.ManageMessages == permissions.ManageMessages
|
|
}
|
|
return true
|
|
}
|
|
|
|
// readyVisibleChannels resolves the channels the user may see for the ready
|
|
// payload, returning the per-channel override map it fetched alongside them so
|
|
// buildReady can reuse it for the can_send affordance without a second query.
|
|
func (h *Hub) readyVisibleChannels(ctx context.Context, database *db.DB, userID int64, role *db.Role, channels []db.Channel) ([]db.Channel, map[int64]db.ChannelOverride, error) {
|
|
// Filter channels by READ_MESSAGES through the single permissions.Checker
|
|
// predicate shared with REST ListVisibleChannels and reconnect replay
|
|
// filtering (computeAllowedChannels). The overrides map is fetched once and
|
|
// reused below for the per-channel can_send affordance. DM channels are
|
|
// excluded by the checker — they are delivered via the dm_channels field.
|
|
overrides := map[int64]db.ChannelOverride{}
|
|
if role != nil && !permissions.HasAdmin(role.Permissions) {
|
|
var oErr error
|
|
overrides, oErr = database.GetChannelOverridesFor(ctx, role.ID, userID)
|
|
if oErr != nil {
|
|
return nil, nil, fmt.Errorf("buildReady GetChannelOverridesFor: %w", oErr)
|
|
}
|
|
}
|
|
var visibleChannels []db.Channel
|
|
if role != nil {
|
|
// Nil role = zero access (fail closed), handled by skipping the filter.
|
|
visibleIDs := h.permChecker.VisibleChannelIDs(role.Permissions, channelRefs(channels), permOverrides(overrides))
|
|
for i := range channels {
|
|
if visibleIDs[channels[i].ID] {
|
|
visibleChannels = append(visibleChannels, channels[i])
|
|
}
|
|
}
|
|
}
|
|
if visibleChannels == nil {
|
|
visibleChannels = []db.Channel{}
|
|
}
|
|
return visibleChannels, overrides, nil
|
|
}
|
|
|
|
// readyChannelPayloads builds the ready payload's channel objects — one entry
|
|
// per visible channel, with the per-user unread fields folded in.
|
|
func readyChannelPayloads(visibleChannels []db.Channel, overrides map[int64]db.ChannelOverride, unreadMap map[int64]db.ChannelUnread, role *db.Role) []map[string]any {
|
|
channelPayloads := make([]map[string]any, 0, len(visibleChannels))
|
|
for i := range visibleChannels {
|
|
entry := map[string]any{
|
|
"id": visibleChannels[i].ID,
|
|
"name": visibleChannels[i].Name,
|
|
"type": visibleChannels[i].Type,
|
|
"category": visibleChannels[i].Category,
|
|
"topic": visibleChannels[i].Topic,
|
|
"position": visibleChannels[i].Position,
|
|
// can_send drives the client's composer affordance. It mirrors
|
|
// MessageService.checkSendPermission for non-DM channels: base role
|
|
// ± channel overrides must grant READ|SEND, and announcement
|
|
// channels additionally require MANAGE_MESSAGES; admins bypass. The
|
|
// server remains the authority — this only pre-disables the UI.
|
|
"can_send": channelCanSend(role, overrides[visibleChannels[i].ID], visibleChannels[i].Type),
|
|
// Cooldown in seconds (0 = off). Lets the composer disable itself
|
|
// for the window instead of accepting a send the server refuses
|
|
// with SLOW_MODE. The server still enforces.
|
|
"slow_mode": visibleChannels[i].SlowMode,
|
|
// Age-gate flag. Shipped so a client can label or gate the
|
|
// channel; the server applies no content behaviour of its own to
|
|
// a flagged channel (migration 025).
|
|
"nsfw": visibleChannels[i].NSFW,
|
|
// Voice capacity limits (0 = unlimited) — the same values the
|
|
// voice-join path enforces with CHANNEL_FULL / VIDEO_LIMIT.
|
|
"voice_max_users": visibleChannels[i].VoiceMaxUsers,
|
|
"voice_max_video": visibleChannels[i].VoiceMaxVideo,
|
|
}
|
|
if visibleChannels[i].Type == "text" || visibleChannels[i].Type == "announcement" {
|
|
if u, ok := unreadMap[visibleChannels[i].ID]; ok {
|
|
entry["unread_count"] = u.UnreadCount
|
|
entry["last_message_id"] = u.LastMessageID
|
|
entry["mention_count"] = u.MentionCount
|
|
} else {
|
|
entry["unread_count"] = 0
|
|
entry["last_message_id"] = 0
|
|
entry["mention_count"] = 0
|
|
}
|
|
}
|
|
channelPayloads = append(channelPayloads, entry)
|
|
}
|
|
return channelPayloads
|
|
}
|
|
|
|
// readyDMChannels loads the user's open DM channels and reconciles them with
|
|
// the rest of the ready payload: mention counts from unreadMap, and the same
|
|
// presence rule presentableMembers applies to the members array.
|
|
func (h *Hub) readyDMChannels(ctx context.Context, database *db.DB, userID int64, unreadMap map[int64]db.ChannelUnread) ([]db.DMChannelInfo, error) {
|
|
dmChannels, err := database.GetUserDMChannels(ctx, userID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("buildReady GetUserDMChannels: %w", err)
|
|
}
|
|
// GetUserDMChannels computes unread from read_states but carries no mention
|
|
// count, so a DM mention badge used to vanish on every reconnect. The
|
|
// unread map now includes the user's DM rows — pull mention_count from it.
|
|
for i := range dmChannels {
|
|
if u, ok := unreadMap[dmChannels[i].ChannelID]; ok {
|
|
dmChannels[i].MentionCount = u.MentionCount
|
|
}
|
|
}
|
|
// GetUserDMChannels only applies db.StatusForViewer, which collapses
|
|
// invisible to offline but passes a disconnected recipient's saved
|
|
// idle/dnd through verbatim (MarkUserDisconnected deliberately keeps a
|
|
// chosen idle/dnd across a disconnect so the next connect can honour it,
|
|
// relying on every read path to hide it in the meantime). members already
|
|
// gets the "no live connection means offline" half of that rule from
|
|
// presentableMembers above; apply the same half here so dm_channels
|
|
// cannot disagree with members about the same user within one payload.
|
|
dmChannels = h.presentableDMChannels(dmChannels)
|
|
return dmChannels, nil
|
|
}
|
|
|
|
// readyVoiceStates gathers the voice states the ready payload may expose to
|
|
// this user. A collect failure is non-fatal, so this returns no error.
|
|
func (h *Hub) readyVoiceStates(ctx context.Context, database *db.DB, channels []db.Channel, visibleChannels []db.Channel, dmChannels []db.DMChannelInfo, userID int64) []db.VoiceState {
|
|
// Collect voice states, filtered to visible channels (BUG-095) plus the
|
|
// user's own open DM channels — mirroring computeAllowedChannels, which
|
|
// layers DM IDs onto the same checker result for reconnect replay
|
|
// filtering. Without this, a DM voice call's voice_state rows are
|
|
// structurally unreachable: VisibleChannelIDs skips ch.Type == "dm", and
|
|
// nothing else re-adds them for this filter.
|
|
allVoiceStates, err := collectAllVoiceStates(ctx, database, channels)
|
|
if err != nil {
|
|
// Non-fatal: send empty list rather than failing the whole ready payload.
|
|
slog.Warn("buildReady collectAllVoiceStates", "err", err)
|
|
allVoiceStates = []db.VoiceState{}
|
|
}
|
|
visibleSet := make(map[int64]struct{}, len(visibleChannels)+len(dmChannels)+1)
|
|
for i := range visibleChannels {
|
|
visibleSet[visibleChannels[i].ID] = struct{}{}
|
|
}
|
|
for i := range dmChannels {
|
|
visibleSet[dmChannels[i].ChannelID] = struct{}{}
|
|
}
|
|
// The caller's own live voice room can never leak by definition -- seed it
|
|
// even if it fell outside both sets above (e.g. CONNECT_VOICE granted
|
|
// without READ_MESSAGES, or a DM voice call after the DM was closed:
|
|
// CloseDM removes dm_open_state but performs no voice eviction). This
|
|
// mirrors liveVoiceEventsSince's rationale on the reconnect-replay tier
|
|
// (serve.go), which this full-ready tier had no equivalent for (OC-0028).
|
|
for i := range allVoiceStates {
|
|
if allVoiceStates[i].UserID == userID {
|
|
visibleSet[allVoiceStates[i].ChannelID] = struct{}{}
|
|
}
|
|
}
|
|
voiceStates := make([]db.VoiceState, 0, len(allVoiceStates))
|
|
for i := range allVoiceStates {
|
|
if _, ok := visibleSet[allVoiceStates[i].ChannelID]; ok {
|
|
voiceStates = append(voiceStates, allVoiceStates[i])
|
|
}
|
|
}
|
|
return voiceStates
|
|
}
|
|
|
|
// buildReady constructs the ready server→client message.
|
|
// Per docs/protocol.md, channels include unread_count and last_message_id per
|
|
// user, and only protocol-specified fields (no slow_mode, archived, voice_*
|
|
// extras).
|
|
func (h *Hub) buildReady(ctx context.Context, database *db.DB, userID int64, role *db.Role) ([]byte, error) {
|
|
channels, err := database.ListChannels(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("buildReady ListChannels: %w", err)
|
|
}
|
|
roles, err := database.ListRoles(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("buildReady ListRoles: %w", err)
|
|
}
|
|
|
|
members, err := database.ListMembers(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("buildReady ListMembers: %w", err)
|
|
}
|
|
members = h.presentableMembers(members, userID)
|
|
|
|
visibleChannels, overrides, err := h.readyVisibleChannels(ctx, database, userID, role, channels)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Per-user unread counts.
|
|
unreadMap, err := database.GetChannelUnreadCounts(ctx, userID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("buildReady GetChannelUnreadCounts: %w", err)
|
|
}
|
|
|
|
// Build protocol-compliant channel objects (strip extra fields).
|
|
channelPayloads := readyChannelPayloads(visibleChannels, overrides, unreadMap, role)
|
|
|
|
// Load open DM channels for this user. Hoisted above the voice-state
|
|
// filter below so DM channel IDs can seed visibleSet — permissions.Checker
|
|
// (and therefore visibleChannels) deliberately skips DM channels, since
|
|
// their visibility is membership-based rather than role-based, so without
|
|
// this a DM voice call's voice_state rows would never make it into ready.
|
|
dmChannels, err := h.readyDMChannels(ctx, database, userID, unreadMap)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
voiceStates := h.readyVoiceStates(ctx, database, channels, visibleChannels, dmChannels, userID)
|
|
|
|
serverName, motd := h.getCachedSettings(ctx)
|
|
|
|
return buildJSON(map[string]any{
|
|
"type": MsgTypeReady,
|
|
"payload": map[string]any{
|
|
"channels": channelPayloads,
|
|
"members": members,
|
|
"voice_states": voiceStates,
|
|
"roles": roles,
|
|
"dm_channels": dmChannels,
|
|
"server_name": serverName,
|
|
"motd": motd,
|
|
},
|
|
}), nil
|
|
}
|
|
|
|
// collectAllVoiceStates gathers voice states across all channels in a single
|
|
// query, replacing the previous N+1 per-channel pattern.
|
|
func collectAllVoiceStates(ctx context.Context, database *db.DB, _ []db.Channel) ([]db.VoiceState, error) {
|
|
return database.GetAllVoiceStates(ctx)
|
|
}
|