feat(orbit): per-guest suggestion mute + global pending-cap setting

Two anti-spam knobs the host can dial during a live session:

1. Per-guest suggestion mute — Mic / MicOff toggle next to the
   kick/ban buttons in the participants popover. Symmetric (re-enable
   later). State lives in OrbitState.suggestionBlocked: string[]; the
   guest reads it and disables its own Suggest controls so the user
   sees a clear "muted" state instead of silent failures. Host-side
   sweep also drops their outbox entries as a safety net.

2. Max pending approvals cap — number input in the session-settings
   popover, default 0 (= unlimited so existing sessions are unaffected).
   When set, the host sweep stops folding new outbox entries into the
   approval list once the cap is reached. The OrbitQueueHead surfaces
   "X / Y pending" so guests can see when they're getting close.

State changes are additive on the wire — both fields are optional, with
parseOrbitState defaulting them, so older clients keep working.

evaluateOrbitSuggestGate() centralises the guest-side allow/block check
shared between useOrbitSongRowBehavior and the ContextMenu Add-to-Session
items, plus suggestOrbitTrack as a defensive last line.

i18n: en + de + fr + nl + zh + nb + ru + es.

Also fixes an earlier dedupe-key collision: the (user, trackId) cache
keys were missing their separator (NULL byte slipped in during the
previous patch), so two tracks could share a key and one of them
silently overwrite the other. Restored the space separator.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Psychotoxical
2026-04-25 01:21:51 +02:00
parent 6ca678547b
commit cfb7e7f6c1
17 changed files with 428 additions and 57 deletions
+18
View File
@@ -100,6 +100,12 @@ export interface OrbitState {
ended?: boolean; ended?: boolean;
/** Host-settable session rules; absent on older clients — treat missing as all-defaults. */ /** Host-settable session rules; absent on older clients — treat missing as all-defaults. */
settings?: OrbitSettings; settings?: OrbitSettings;
/**
* Usernames muted by the host: their outbox is still polled (so heartbeats
* keep them visible as participants) but new track suggestions are dropped
* before they reach the approval list. Symmetric — host can re-enable.
*/
suggestionBlocked?: string[];
} }
/** /**
@@ -121,6 +127,13 @@ export interface OrbitSettings {
* field fall back to 15 via `effectiveShuffleIntervalMs`. * field fall back to 15 via `effectiveShuffleIntervalMs`.
*/ */
shuffleIntervalMin?: OrbitShuffleIntervalMin; shuffleIntervalMin?: OrbitShuffleIntervalMin;
/**
* Cap on simultaneously-pending guest suggestions. 0 = unlimited.
* When the cap is reached, the host's outbox sweep drops new suggestions
* until existing ones are approved or declined; the guest UI surfaces
* the count so users know to wait.
*/
maxPending?: number;
} }
export const ORBIT_DEFAULT_SETTINGS: OrbitSettings = { export const ORBIT_DEFAULT_SETTINGS: OrbitSettings = {
@@ -128,6 +141,8 @@ export const ORBIT_DEFAULT_SETTINGS: OrbitSettings = {
autoApprove: false, autoApprove: false,
autoShuffle: true, autoShuffle: true,
shuffleIntervalMin: 15, shuffleIntervalMin: 15,
// 0 = unlimited; host opts in via the session-settings popover.
maxPending: 0,
}; };
/** What the guest's outbox-playlist comment holds (heartbeat only, for now). */ /** What the guest's outbox-playlist comment holds (heartbeat only, for now). */
@@ -176,6 +191,7 @@ export function makeInitialOrbitState(args: {
participants: [], participants: [],
kicked: [], kicked: [],
removed: [], removed: [],
suggestionBlocked: [],
playQueue: [], playQueue: [],
playQueueTotal: 0, playQueueTotal: 0,
settings: { ...ORBIT_DEFAULT_SETTINGS }, settings: { ...ORBIT_DEFAULT_SETTINGS },
@@ -201,6 +217,8 @@ export function parseOrbitState(raw: unknown): OrbitState | null {
// the attribution UI, not correctness. // the attribution UI, not correctness.
// `removed` is optional (older hosts won't write it); coerce to [] if absent or malformed. // `removed` is optional (older hosts won't write it); coerce to [] if absent or malformed.
if (!Array.isArray(s.removed)) s.removed = []; if (!Array.isArray(s.removed)) s.removed = [];
// `suggestionBlocked` is optional too — older hosts predate the mute feature.
if (!Array.isArray(s.suggestionBlocked)) s.suggestionBlocked = [];
// `playQueue` / `playQueueTotal` are optional (older hosts won't write them). // `playQueue` / `playQueueTotal` are optional (older hosts won't write them).
if (!Array.isArray(s.playQueue)) s.playQueue = []; if (!Array.isArray(s.playQueue)) s.playQueue = [];
if (typeof s.playQueueTotal !== 'number') s.playQueueTotal = (s.playQueue?.length ?? 0); if (typeof s.playQueueTotal !== 'number') s.playQueueTotal = (s.playQueue?.length ?? 0);
+62 -11
View File
@@ -1,7 +1,12 @@
import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
import { Play, ListPlus, Radio, Heart, Download, ChevronRight, User, Disc3, ListMusic, Plus, Info, Sparkles, Star, Trash2, HeartCrack, Share2, Orbit as OrbitIcon } from 'lucide-react'; import { Play, ListPlus, Radio, Heart, Download, ChevronRight, User, Disc3, ListMusic, Plus, Info, Sparkles, Star, Trash2, HeartCrack, Share2, Orbit as OrbitIcon } from 'lucide-react';
import { useOrbitStore } from '../store/orbitStore'; import { useOrbitStore } from '../store/orbitStore';
import { suggestOrbitTrack, hostEnqueueToOrbit } from '../utils/orbit'; import {
suggestOrbitTrack,
hostEnqueueToOrbit,
evaluateOrbitSuggestGate,
OrbitSuggestBlockedError,
} from '../utils/orbit';
import LastfmIcon from './LastfmIcon'; import LastfmIcon from './LastfmIcon';
import StarRating from './StarRating'; import StarRating from './StarRating';
import { lastfmLoveTrack, lastfmUnloveTrack } from '../api/lastfm'; import { lastfmLoveTrack, lastfmUnloveTrack } from '../api/lastfm';
@@ -1446,15 +1451,38 @@ export default function ContextMenu() {
<div className="context-menu-item" onClick={() => handleAction(() => enqueue([song]))}> <div className="context-menu-item" onClick={() => handleAction(() => enqueue([song]))}>
<ListPlus size={14} /> {t('contextMenu.addToQueue')} <ListPlus size={14} /> {t('contextMenu.addToQueue')}
</div> </div>
{orbitRole === 'guest' && ( {orbitRole === 'guest' && (() => {
<div className="context-menu-item" onClick={() => handleAction(() => { const gate = evaluateOrbitSuggestGate();
const muted = gate.reason === 'muted';
const capReached = gate.reason === 'cap-reached';
const disabled = muted || capReached;
const tooltip = muted
? t('orbit.suggestBlockedMuted')
: capReached ? t('orbit.suggestBlockedCap') : '';
return (
<div
className={`context-menu-item${disabled ? ' is-disabled' : ''}`}
{...(disabled ? { 'data-tooltip': tooltip } : {})}
onClick={() => handleAction(() => {
if (muted) { showToast(t('orbit.suggestBlockedMuted'), 3500, 'error'); return; }
if (capReached) { showToast(t('orbit.suggestBlockedCap'), 3500, 'info'); return; }
suggestOrbitTrack(song.id) suggestOrbitTrack(song.id)
.then(() => showToast(t('orbit.ctxSuggestedToast'), 2200, 'info')) .then(() => showToast(t('orbit.ctxSuggestedToast'), 2200, 'info'))
.catch(() => showToast(t('orbit.ctxSuggestFailed'), 3000, 'error')); .catch(err => {
})}> if (err instanceof OrbitSuggestBlockedError && err.reason === 'muted') {
showToast(t('orbit.suggestBlockedMuted'), 3500, 'error');
} else if (err instanceof OrbitSuggestBlockedError && err.reason === 'cap-reached') {
showToast(t('orbit.suggestBlockedCap'), 3500, 'info');
} else {
showToast(t('orbit.ctxSuggestFailed'), 3000, 'error');
}
});
})}
>
<OrbitIcon size={14} /> {t('orbit.ctxAddToSession')} <OrbitIcon size={14} /> {t('orbit.ctxAddToSession')}
</div> </div>
)} );
})()}
{orbitRole === 'host' && ( {orbitRole === 'host' && (
<div className="context-menu-item" onClick={() => handleAction(() => { <div className="context-menu-item" onClick={() => handleAction(() => {
hostEnqueueToOrbit(song.id) hostEnqueueToOrbit(song.id)
@@ -1596,15 +1624,38 @@ export default function ContextMenu() {
<div className="context-menu-item" onClick={() => handleAction(() => enqueue([song]))}> <div className="context-menu-item" onClick={() => handleAction(() => enqueue([song]))}>
<ListPlus size={14} /> {t('contextMenu.addToQueue')} <ListPlus size={14} /> {t('contextMenu.addToQueue')}
</div> </div>
{orbitRole === 'guest' && ( {orbitRole === 'guest' && (() => {
<div className="context-menu-item" onClick={() => handleAction(() => { const gate = evaluateOrbitSuggestGate();
const muted = gate.reason === 'muted';
const capReached = gate.reason === 'cap-reached';
const disabled = muted || capReached;
const tooltip = muted
? t('orbit.suggestBlockedMuted')
: capReached ? t('orbit.suggestBlockedCap') : '';
return (
<div
className={`context-menu-item${disabled ? ' is-disabled' : ''}`}
{...(disabled ? { 'data-tooltip': tooltip } : {})}
onClick={() => handleAction(() => {
if (muted) { showToast(t('orbit.suggestBlockedMuted'), 3500, 'error'); return; }
if (capReached) { showToast(t('orbit.suggestBlockedCap'), 3500, 'info'); return; }
suggestOrbitTrack(song.id) suggestOrbitTrack(song.id)
.then(() => showToast(t('orbit.ctxSuggestedToast'), 2200, 'info')) .then(() => showToast(t('orbit.ctxSuggestedToast'), 2200, 'info'))
.catch(() => showToast(t('orbit.ctxSuggestFailed'), 3000, 'error')); .catch(err => {
})}> if (err instanceof OrbitSuggestBlockedError && err.reason === 'muted') {
showToast(t('orbit.suggestBlockedMuted'), 3500, 'error');
} else if (err instanceof OrbitSuggestBlockedError && err.reason === 'cap-reached') {
showToast(t('orbit.suggestBlockedCap'), 3500, 'info');
} else {
showToast(t('orbit.ctxSuggestFailed'), 3000, 'error');
}
});
})}
>
<OrbitIcon size={14} /> {t('orbit.ctxAddToSession')} <OrbitIcon size={14} /> {t('orbit.ctxAddToSession')}
</div> </div>
)} );
})()}
{orbitRole === 'host' && ( {orbitRole === 'host' && (
<div className="context-menu-item" onClick={() => handleAction(() => { <div className="context-menu-item" onClick={() => handleAction(() => {
hostEnqueueToOrbit(song.id) hostEnqueueToOrbit(song.id)
+19 -4
View File
@@ -1,9 +1,9 @@
import { useEffect, useRef, useState } from 'react'; import { useEffect, useRef, useState } from 'react';
import { createPortal } from 'react-dom'; import { createPortal } from 'react-dom';
import { Crown, User, UserMinus, ShieldOff } from 'lucide-react'; import { Crown, User, UserMinus, ShieldOff, Mic, MicOff } from 'lucide-react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useOrbitStore } from '../store/orbitStore'; import { useOrbitStore } from '../store/orbitStore';
import { kickOrbitParticipant, removeOrbitParticipant } from '../utils/orbit'; import { kickOrbitParticipant, removeOrbitParticipant, setOrbitSuggestionBlocked } from '../utils/orbit';
import ConfirmModal from './ConfirmModal'; import ConfirmModal from './ConfirmModal';
interface Props { interface Props {
@@ -90,13 +90,27 @@ export default function OrbitParticipantsPopover({ anchorRef, onClose }: Props)
<div className="orbit-participants-pop__empty">{t('orbit.participantsEmpty')}</div> <div className="orbit-participants-pop__empty">{t('orbit.participantsEmpty')}</div>
)} )}
{state.participants.map(p => ( {state.participants.map(p => {
const isMuted = state.suggestionBlocked?.includes(p.user) ?? false;
return (
<div key={p.user} className="orbit-participants-pop__row"> <div key={p.user} className="orbit-participants-pop__row">
<User size={13} /> <User size={13} />
<span className="orbit-participants-pop__name">{p.user}</span> <span className="orbit-participants-pop__name">{p.user}</span>
<span className="orbit-participants-pop__meta">{joinedFor(p.joinedAt, nowMs)}</span> <span className="orbit-participants-pop__meta">{joinedFor(p.joinedAt, nowMs)}</span>
{role === 'host' && ( {role === 'host' && (
<div className="orbit-participants-pop__actions"> <div className="orbit-participants-pop__actions">
<button
type="button"
className={`orbit-participants-pop__kick${isMuted ? ' is-active' : ''}`}
onClick={() => { void setOrbitSuggestionBlocked(p.user, !isMuted); }}
data-tooltip={isMuted ? t('orbit.participantsUnmuteTooltip') : t('orbit.participantsMuteTooltip')}
aria-label={isMuted
? t('orbit.participantsUnmuteAria', { user: p.user })
: t('orbit.participantsMuteAria', { user: p.user })}
aria-pressed={isMuted}
>
{isMuted ? <MicOff size={12} /> : <Mic size={12} />}
</button>
<button <button
type="button" type="button"
className="orbit-participants-pop__kick" className="orbit-participants-pop__kick"
@@ -118,7 +132,8 @@ export default function OrbitParticipantsPopover({ anchorRef, onClose }: Props)
</div> </div>
)} )}
</div> </div>
))} );
})}
</div> </div>
<ConfirmModal <ConfirmModal
open={!!confirm} open={!!confirm}
+19 -1
View File
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Users, Wifi, WifiOff } from 'lucide-react'; import { Users, Wifi, WifiOff, Inbox } from 'lucide-react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useOrbitStore } from '../store/orbitStore'; import { useOrbitStore } from '../store/orbitStore';
import type { OrbitState } from '../api/orbit'; import type { OrbitState } from '../api/orbit';
@@ -36,6 +36,15 @@ export default function OrbitQueueHead({ state }: Props) {
const names = [state.host, ...state.participants.map(p => p.user)]; const names = [state.host, ...state.participants.map(p => p.user)];
const showPresence = role === 'guest' && state.positionAt > 0; const showPresence = role === 'guest' && state.positionAt > 0;
const hostAway = showPresence && (nowMs - state.positionAt) > HOST_AWAY_THRESHOLD_MS; const hostAway = showPresence && (nowMs - state.positionAt) > HOST_AWAY_THRESHOLD_MS;
const cap = state.settings?.maxPending ?? 0;
// Approximate visible-pending count — same heuristic as evaluateOrbitSuggestGate.
// Conservative for guests (over-counts declined entries) but the host's
// own queue view sees the exact number because it has the merged/declined
// sets locally; we don't bother surfacing the exact count here either way
// since guests just need to know if they're near the cap.
const pendingCount = cap > 0
? state.queue.filter(q => q.addedBy !== state.host).length
: 0;
return ( return (
<div className="orbit-queue-head"> <div className="orbit-queue-head">
@@ -54,6 +63,15 @@ export default function OrbitQueueHead({ state }: Props) {
<div className="orbit-queue-head__meta"> <div className="orbit-queue-head__meta">
<Users size={11} /> <Users size={11} />
<span className="orbit-queue-head__names">{names.join(', ')}</span> <span className="orbit-queue-head__names">{names.join(', ')}</span>
{cap > 0 && (
<span
className={`orbit-queue-head__pending${pendingCount >= cap ? ' is-full' : ''}`}
data-tooltip={t('orbit.pendingCounterTooltip')}
>
<Inbox size={11} />
<span>{t('orbit.pendingCounter', { count: pendingCount, max: cap })}</span>
</span>
)}
</div> </div>
</div> </div>
); );
+21
View File
@@ -82,6 +82,27 @@ export default function OrbitSettingsPopover({ anchorRef, onClose }: Props) {
</span> </span>
</label> </label>
<label className="orbit-settings-pop__row">
<div className="orbit-settings-pop__text">
<div className="orbit-settings-pop__label">{t('orbit.settingMaxPending')}</div>
<div className="orbit-settings-pop__hint">{t('orbit.settingMaxPendingHint')}</div>
</div>
<input
type="number"
min={0}
max={999}
step={1}
value={settings.maxPending ?? 0}
onChange={e => {
const raw = parseInt(e.target.value, 10);
const next = Number.isFinite(raw) && raw >= 0 ? Math.min(raw, 999) : 0;
void updateOrbitSettings({ maxPending: next });
}}
className="orbit-settings-pop__number"
aria-label={t('orbit.settingMaxPending')}
/>
</label>
<div className="orbit-settings-pop__row orbit-settings-pop__row--stacked"> <div className="orbit-settings-pop__row orbit-settings-pop__row--stacked">
<div className="orbit-settings-pop__text"> <div className="orbit-settings-pop__text">
<div className="orbit-settings-pop__label">{t('orbit.settingShuffleInterval')}</div> <div className="orbit-settings-pop__label">{t('orbit.settingShuffleInterval')}</div>
+6 -1
View File
@@ -87,7 +87,12 @@ export function useOrbitHost(): void {
let afterSweep = base; let afterSweep = base;
try { try {
const snaps = await sweepGuestOutboxes(base.sid, base.host); const snaps = await sweepGuestOutboxes(base.sid, base.host);
afterSweep = applyOutboxSnapshotsToState(base, snaps); // Hand the cap-check the host's local merged/declined sets so it can
// tell which `state.queue` items are still actually awaiting approval.
afterSweep = applyOutboxSnapshotsToState(base, snaps, Date.now(), {
mergedKeys: new Set(store.mergedSuggestionKeys),
declinedKeys: new Set(store.declinedSuggestionKeys),
});
} catch { /* best-effort; keep old participants and queue */ } } catch { /* best-effort; keep old participants and queue */ }
// 2) Merge newly-suggested items into the host's local play queue so // 2) Merge newly-suggested items into the host's local play queue so
+24 -2
View File
@@ -1,7 +1,12 @@
import { useCallback, useRef } from 'react'; import { useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useOrbitStore } from '../store/orbitStore'; import { useOrbitStore } from '../store/orbitStore';
import { suggestOrbitTrack, hostEnqueueToOrbit } from '../utils/orbit'; import {
suggestOrbitTrack,
hostEnqueueToOrbit,
evaluateOrbitSuggestGate,
OrbitSuggestBlockedError,
} from '../utils/orbit';
import { showToast } from '../utils/toast'; import { showToast } from '../utils/toast';
/** /**
@@ -43,9 +48,26 @@ export function useOrbitSongRowBehavior() {
clickTimerRef.current = null; clickTimerRef.current = null;
} }
if (orbitRole === 'guest') { if (orbitRole === 'guest') {
const gate = evaluateOrbitSuggestGate();
if (!gate.allowed && gate.reason === 'muted') {
showToast(t('orbit.suggestBlockedMuted'), 3500, 'error');
return;
}
if (!gate.allowed && gate.reason === 'cap-reached') {
showToast(t('orbit.suggestBlockedCap'), 3500, 'info');
return;
}
suggestOrbitTrack(songId) suggestOrbitTrack(songId)
.then(() => showToast(t('orbit.ctxSuggestedToast'), 2200, 'info')) .then(() => showToast(t('orbit.ctxSuggestedToast'), 2200, 'info'))
.catch(() => showToast(t('orbit.ctxSuggestFailed'), 3000, 'error')); .catch(err => {
if (err instanceof OrbitSuggestBlockedError && err.reason === 'muted') {
showToast(t('orbit.suggestBlockedMuted'), 3500, 'error');
} else if (err instanceof OrbitSuggestBlockedError && err.reason === 'cap-reached') {
showToast(t('orbit.suggestBlockedCap'), 3500, 'info');
} else {
showToast(t('orbit.ctxSuggestFailed'), 3000, 'error');
}
});
} else if (orbitRole === 'host') { } else if (orbitRole === 'host') {
hostEnqueueToOrbit(songId) hostEnqueueToOrbit(songId)
.then(() => showToast(t('orbit.ctxAddedHostToast'), 2200, 'info')) .then(() => showToast(t('orbit.ctxAddedHostToast'), 2200, 'info'))
+10
View File
@@ -1580,6 +1580,10 @@ export const deTranslation = {
participantsRemoveAria: '{{user}} aus dieser Session entfernen', participantsRemoveAria: '{{user}} aus dieser Session entfernen',
participantsBanTooltip: 'Permanent bannen', participantsBanTooltip: 'Permanent bannen',
participantsBanAria: '{{user}} permanent bannen', participantsBanAria: '{{user}} permanent bannen',
participantsMuteTooltip: 'Vorschläge sperren',
participantsUnmuteTooltip: 'Vorschläge erlauben',
participantsMuteAria: 'Vorschläge von {{user}} sperren',
participantsUnmuteAria: 'Vorschläge von {{user}} wieder erlauben',
confirmRemoveTitle: 'Aus Session entfernen?', confirmRemoveTitle: 'Aus Session entfernen?',
confirmRemoveBody: '{{user}} wird aus der Session geworfen, kann aber jederzeit über deinen Einladungslink wieder beitreten.', confirmRemoveBody: '{{user}} wird aus der Session geworfen, kann aber jederzeit über deinen Einladungslink wieder beitreten.',
confirmRemoveConfirm: 'Entfernen', confirmRemoveConfirm: 'Entfernen',
@@ -1605,6 +1609,12 @@ export const deTranslation = {
settingAutoShuffleHint: 'Periodischer Fisher-Yates-Shuffle der kommenden Warteschlange. Aus: Reihenfolge wird nur verändert, wenn du selbst sortierst.', settingAutoShuffleHint: 'Periodischer Fisher-Yates-Shuffle der kommenden Warteschlange. Aus: Reihenfolge wird nur verändert, wenn du selbst sortierst.',
settingShuffleInterval: 'Alle', settingShuffleInterval: 'Alle',
settingShuffleIntervalHint: 'Wie oft die kommende Warteschlange während der Session neu gemischt wird.', settingShuffleIntervalHint: 'Wie oft die kommende Warteschlange während der Session neu gemischt wird.',
settingMaxPending: 'Max offene Vorschläge',
settingMaxPendingHint: 'Begrenzt, wie viele Gast-Vorschläge gleichzeitig auf Bestätigung warten dürfen. 0 = unbegrenzt.',
pendingCounter: '{{count}} / {{max}} offen',
pendingCounterTooltip: 'Wartende Gast-Vorschläge / Limit',
suggestBlockedMuted: 'Der Host hat dich für diese Session gesperrt — keine Vorschläge möglich.',
suggestBlockedCap: 'Approval-Liste ist voll — warte bis der Host welche durchwinkt.',
settingShuffleIntervalValue_one: '{{count}} Min.', settingShuffleIntervalValue_one: '{{count}} Min.',
settingShuffleIntervalValue_other: '{{count}} Min.', settingShuffleIntervalValue_other: '{{count}} Min.',
settingShuffleNow: 'Jetzt mischen', settingShuffleNow: 'Jetzt mischen',
+10
View File
@@ -1584,6 +1584,10 @@ export const enTranslation = {
participantsRemoveAria: 'Remove {{user}} from this session', participantsRemoveAria: 'Remove {{user}} from this session',
participantsBanTooltip: 'Ban permanently', participantsBanTooltip: 'Ban permanently',
participantsBanAria: 'Permanently ban {{user}}', participantsBanAria: 'Permanently ban {{user}}',
participantsMuteTooltip: 'Mute suggestions',
participantsUnmuteTooltip: 'Allow suggestions',
participantsMuteAria: 'Mute suggestions from {{user}}',
participantsUnmuteAria: 'Allow suggestions from {{user}}',
confirmRemoveTitle: 'Remove from session?', confirmRemoveTitle: 'Remove from session?',
confirmRemoveBody: '{{user}} will be dropped from the session, but can re-join via your invite link.', confirmRemoveBody: '{{user}} will be dropped from the session, but can re-join via your invite link.',
confirmRemoveConfirm: 'Remove', confirmRemoveConfirm: 'Remove',
@@ -1609,6 +1613,12 @@ export const enTranslation = {
settingAutoShuffleHint: "Periodic FisherYates shuffle of the upcoming queue. Off: order only changes when you rearrange it.", settingAutoShuffleHint: "Periodic FisherYates shuffle of the upcoming queue. Off: order only changes when you rearrange it.",
settingShuffleInterval: 'Reshuffle every', settingShuffleInterval: 'Reshuffle every',
settingShuffleIntervalHint: 'How often the upcoming queue gets reshuffled while the session runs.', settingShuffleIntervalHint: 'How often the upcoming queue gets reshuffled while the session runs.',
settingMaxPending: 'Max pending suggestions',
settingMaxPendingHint: 'Cap on how many guest suggestions can wait for approval. 0 = unlimited.',
pendingCounter: '{{count}} / {{max}} pending',
pendingCounterTooltip: 'Pending guest suggestions / cap',
suggestBlockedMuted: 'The host muted you for this session — suggestions are off.',
suggestBlockedCap: 'Approval queue is full — wait for the host to clear some.',
settingShuffleIntervalValue_one: '{{count}} min', settingShuffleIntervalValue_one: '{{count}} min',
settingShuffleIntervalValue_other: '{{count}} min', settingShuffleIntervalValue_other: '{{count}} min',
settingShuffleNow: 'Shuffle now', settingShuffleNow: 'Shuffle now',
+10
View File
@@ -1567,6 +1567,10 @@ export const esTranslation = {
participantsRemoveAria: 'Quitar a {{user}} de esta sesión', participantsRemoveAria: 'Quitar a {{user}} de esta sesión',
participantsBanTooltip: 'Banear permanentemente', participantsBanTooltip: 'Banear permanentemente',
participantsBanAria: 'Banear permanentemente a {{user}}', participantsBanAria: 'Banear permanentemente a {{user}}',
participantsMuteTooltip: 'Silenciar sugerencias',
participantsUnmuteTooltip: 'Permitir sugerencias',
participantsMuteAria: 'Silenciar las sugerencias de {{user}}',
participantsUnmuteAria: 'Volver a permitir las sugerencias de {{user}}',
confirmRemoveTitle: '¿Quitar de la sesión?', confirmRemoveTitle: '¿Quitar de la sesión?',
confirmRemoveBody: '{{user}} será expulsado de la sesión, pero puede volver a unirse por tu enlace de invitación.', confirmRemoveBody: '{{user}} será expulsado de la sesión, pero puede volver a unirse por tu enlace de invitación.',
confirmRemoveConfirm: 'Quitar', confirmRemoveConfirm: 'Quitar',
@@ -1592,6 +1596,12 @@ export const esTranslation = {
settingAutoShuffleHint: 'Mezclado Fisher-Yates periódico de la cola próxima. Desactivado: el orden solo cambia cuando lo reorganizas.', settingAutoShuffleHint: 'Mezclado Fisher-Yates periódico de la cola próxima. Desactivado: el orden solo cambia cuando lo reorganizas.',
settingShuffleInterval: 'Remezclar cada', settingShuffleInterval: 'Remezclar cada',
settingShuffleIntervalHint: 'Con qué frecuencia se remezcla la cola próxima durante la sesión.', settingShuffleIntervalHint: 'Con qué frecuencia se remezcla la cola próxima durante la sesión.',
settingMaxPending: 'Máx. sugerencias pendientes',
settingMaxPendingHint: 'Límite de sugerencias de invitados que pueden esperar aprobación a la vez. 0 = ilimitado.',
pendingCounter: '{{count}} / {{max}} pendientes',
pendingCounterTooltip: 'Sugerencias de invitados pendientes / límite',
suggestBlockedMuted: 'El anfitrión te silenció en esta sesión — sugerencias desactivadas.',
suggestBlockedCap: 'La cola de aprobación está llena — espera a que el anfitrión despeje algunas.',
settingShuffleIntervalValue_one: '{{count}} min', settingShuffleIntervalValue_one: '{{count}} min',
settingShuffleIntervalValue_other: '{{count}} min', settingShuffleIntervalValue_other: '{{count}} min',
settingShuffleNow: 'Mezclar ahora', settingShuffleNow: 'Mezclar ahora',
+10
View File
@@ -1562,6 +1562,10 @@ export const frTranslation = {
participantsRemoveAria: 'Retirer {{user}} de cette session', participantsRemoveAria: 'Retirer {{user}} de cette session',
participantsBanTooltip: 'Bannir définitivement', participantsBanTooltip: 'Bannir définitivement',
participantsBanAria: 'Bannir définitivement {{user}}', participantsBanAria: 'Bannir définitivement {{user}}',
participantsMuteTooltip: 'Bloquer les suggestions',
participantsUnmuteTooltip: 'Autoriser les suggestions',
participantsMuteAria: 'Bloquer les suggestions de {{user}}',
participantsUnmuteAria: 'Autoriser à nouveau les suggestions de {{user}}',
confirmRemoveTitle: 'Retirer de la session ?', confirmRemoveTitle: 'Retirer de la session ?',
confirmRemoveBody: '{{user}} sera retiré de la session mais peut rejoindre via ton lien d\'invitation.', confirmRemoveBody: '{{user}} sera retiré de la session mais peut rejoindre via ton lien d\'invitation.',
confirmRemoveConfirm: 'Retirer', confirmRemoveConfirm: 'Retirer',
@@ -1587,6 +1591,12 @@ export const frTranslation = {
settingAutoShuffleHint: 'Mélange Fisher-Yates périodique de la file à venir. Désactivé : l\'ordre ne change que lorsque tu le réorganises.', settingAutoShuffleHint: 'Mélange Fisher-Yates périodique de la file à venir. Désactivé : l\'ordre ne change que lorsque tu le réorganises.',
settingShuffleInterval: 'Remélanger toutes les', settingShuffleInterval: 'Remélanger toutes les',
settingShuffleIntervalHint: 'Fréquence de remélange de la file pendant la session.', settingShuffleIntervalHint: 'Fréquence de remélange de la file pendant la session.',
settingMaxPending: 'Max suggestions en attente',
settingMaxPendingHint: 'Limite le nombre de suggestions invitées qui attendent ton approbation. 0 = illimité.',
pendingCounter: '{{count}} / {{max}} en attente',
pendingCounterTooltip: 'Suggestions invitées en attente / limite',
suggestBlockedMuted: 'L\'hôte t\'a coupé le micro pour cette session — suggestions désactivées.',
suggestBlockedCap: 'La file d\'approbation est pleine — attends que l\'hôte en traite.',
settingShuffleIntervalValue_one: '{{count}} min', settingShuffleIntervalValue_one: '{{count}} min',
settingShuffleIntervalValue_other: '{{count}} min', settingShuffleIntervalValue_other: '{{count}} min',
settingShuffleNow: 'Mélanger maintenant', settingShuffleNow: 'Mélanger maintenant',
+10
View File
@@ -1561,6 +1561,10 @@ export const nbTranslation = {
participantsRemoveAria: 'Fjern {{user}} fra denne økten', participantsRemoveAria: 'Fjern {{user}} fra denne økten',
participantsBanTooltip: 'Uteste permanent', participantsBanTooltip: 'Uteste permanent',
participantsBanAria: 'Uteste {{user}} permanent', participantsBanAria: 'Uteste {{user}} permanent',
participantsMuteTooltip: 'Blokker forslag',
participantsUnmuteTooltip: 'Tillat forslag',
participantsMuteAria: 'Blokker forslag fra {{user}}',
participantsUnmuteAria: 'Tillat forslag fra {{user}} igjen',
confirmRemoveTitle: 'Fjerne fra økten?', confirmRemoveTitle: 'Fjerne fra økten?',
confirmRemoveBody: '{{user}} fjernes fra økten, men kan bli med igjen via invitasjonslenken din.', confirmRemoveBody: '{{user}} fjernes fra økten, men kan bli med igjen via invitasjonslenken din.',
confirmRemoveConfirm: 'Fjern', confirmRemoveConfirm: 'Fjern',
@@ -1586,6 +1590,12 @@ export const nbTranslation = {
settingAutoShuffleHint: 'Periodisk Fisher-Yates-stokking av kommende kø. Av: rekkefølgen endres bare når du omorganiserer den.', settingAutoShuffleHint: 'Periodisk Fisher-Yates-stokking av kommende kø. Av: rekkefølgen endres bare når du omorganiserer den.',
settingShuffleInterval: 'Stokk på nytt hver', settingShuffleInterval: 'Stokk på nytt hver',
settingShuffleIntervalHint: 'Hvor ofte kommende kø stokkes på nytt mens økten kjører.', settingShuffleIntervalHint: 'Hvor ofte kommende kø stokkes på nytt mens økten kjører.',
settingMaxPending: 'Maks ventende forslag',
settingMaxPendingHint: 'Hvor mange gjesteforslag som samtidig kan vente på godkjenning. 0 = ubegrenset.',
pendingCounter: '{{count}} / {{max}} venter',
pendingCounterTooltip: 'Ventende gjesteforslag / grense',
suggestBlockedMuted: 'Verten har blokkert deg for denne økten — forslag er av.',
suggestBlockedCap: 'Godkjenningskøen er full — vent til verten tar unna noen.',
settingShuffleIntervalValue_one: '{{count}} min', settingShuffleIntervalValue_one: '{{count}} min',
settingShuffleIntervalValue_other: '{{count}} min', settingShuffleIntervalValue_other: '{{count}} min',
settingShuffleNow: 'Stokk nå', settingShuffleNow: 'Stokk nå',
+10
View File
@@ -1561,6 +1561,10 @@ export const nlTranslation = {
participantsRemoveAria: '{{user}} uit deze sessie verwijderen', participantsRemoveAria: '{{user}} uit deze sessie verwijderen',
participantsBanTooltip: 'Permanent bannen', participantsBanTooltip: 'Permanent bannen',
participantsBanAria: '{{user}} permanent bannen', participantsBanAria: '{{user}} permanent bannen',
participantsMuteTooltip: 'Voorstellen blokkeren',
participantsUnmuteTooltip: 'Voorstellen toestaan',
participantsMuteAria: 'Voorstellen van {{user}} blokkeren',
participantsUnmuteAria: 'Voorstellen van {{user}} weer toestaan',
confirmRemoveTitle: 'Uit sessie verwijderen?', confirmRemoveTitle: 'Uit sessie verwijderen?',
confirmRemoveBody: '{{user}} wordt uit de sessie verwijderd, maar kan opnieuw deelnemen via je uitnodigingslink.', confirmRemoveBody: '{{user}} wordt uit de sessie verwijderd, maar kan opnieuw deelnemen via je uitnodigingslink.',
confirmRemoveConfirm: 'Verwijderen', confirmRemoveConfirm: 'Verwijderen',
@@ -1586,6 +1590,12 @@ export const nlTranslation = {
settingAutoShuffleHint: 'Periodieke Fisher-Yates-shuffle van de komende wachtrij. Uit: de volgorde verandert alleen wanneer je zelf herschikt.', settingAutoShuffleHint: 'Periodieke Fisher-Yates-shuffle van de komende wachtrij. Uit: de volgorde verandert alleen wanneer je zelf herschikt.',
settingShuffleInterval: 'Opnieuw shufflen elke', settingShuffleInterval: 'Opnieuw shufflen elke',
settingShuffleIntervalHint: 'Hoe vaak de komende wachtrij tijdens de sessie opnieuw wordt geshuffled.', settingShuffleIntervalHint: 'Hoe vaak de komende wachtrij tijdens de sessie opnieuw wordt geshuffled.',
settingMaxPending: 'Max openstaande voorstellen',
settingMaxPendingHint: 'Hoeveel gastvoorstellen tegelijk op goedkeuring mogen wachten. 0 = onbeperkt.',
pendingCounter: '{{count}} / {{max}} open',
pendingCounterTooltip: 'Wachtende gastvoorstellen / limiet',
suggestBlockedMuted: 'De host heeft je voor deze sessie geblokkeerd — voorstellen uitgeschakeld.',
suggestBlockedCap: 'De goedkeuringslijst is vol — wacht tot de host er een paar afhandelt.',
settingShuffleIntervalValue_one: '{{count}} min', settingShuffleIntervalValue_one: '{{count}} min',
settingShuffleIntervalValue_other: '{{count}} min', settingShuffleIntervalValue_other: '{{count}} min',
settingShuffleNow: 'Nu shufflen', settingShuffleNow: 'Nu shufflen',
+10
View File
@@ -1641,6 +1641,10 @@ export const ruTranslation = {
participantsRemoveAria: 'Удалить {{user}} из этой сессии', participantsRemoveAria: 'Удалить {{user}} из этой сессии',
participantsBanTooltip: 'Забанить навсегда', participantsBanTooltip: 'Забанить навсегда',
participantsBanAria: 'Забанить {{user}} навсегда', participantsBanAria: 'Забанить {{user}} навсегда',
participantsMuteTooltip: 'Запретить предлагать треки',
participantsUnmuteTooltip: 'Разрешить предлагать треки',
participantsMuteAria: 'Запретить {{user}} предлагать треки',
participantsUnmuteAria: 'Снова разрешить {{user}} предлагать треки',
confirmRemoveTitle: 'Удалить из сессии?', confirmRemoveTitle: 'Удалить из сессии?',
confirmRemoveBody: '{{user}} будет удалён из сессии, но может присоединиться снова по твоей ссылке-приглашению.', confirmRemoveBody: '{{user}} будет удалён из сессии, но может присоединиться снова по твоей ссылке-приглашению.',
confirmRemoveConfirm: 'Удалить', confirmRemoveConfirm: 'Удалить',
@@ -1666,6 +1670,12 @@ export const ruTranslation = {
settingAutoShuffleHint: 'Периодическое Fisher-Yates перемешивание предстоящей очереди. Выкл.: порядок меняется только при ручной перестановке.', settingAutoShuffleHint: 'Периодическое Fisher-Yates перемешивание предстоящей очереди. Выкл.: порядок меняется только при ручной перестановке.',
settingShuffleInterval: 'Перемешивать каждые', settingShuffleInterval: 'Перемешивать каждые',
settingShuffleIntervalHint: 'Как часто предстоящая очередь перемешивается во время сессии.', settingShuffleIntervalHint: 'Как часто предстоящая очередь перемешивается во время сессии.',
settingMaxPending: 'Макс. ожидающих заявок',
settingMaxPendingHint: 'Сколько гостевых предложений могут одновременно ждать одобрения. 0 = без лимита.',
pendingCounter: '{{count}} / {{max}} в ожидании',
pendingCounterTooltip: 'Ожидающие гостевые заявки / лимит',
suggestBlockedMuted: 'Хост отключил тебе предложение треков на этой сессии.',
suggestBlockedCap: 'Очередь одобрений переполнена — подожди, пока хост её разгребёт.',
settingShuffleIntervalValue_one: '{{count}} мин', settingShuffleIntervalValue_one: '{{count}} мин',
settingShuffleIntervalValue_few: '{{count}} мин', settingShuffleIntervalValue_few: '{{count}} мин',
settingShuffleIntervalValue_many: '{{count}} мин', settingShuffleIntervalValue_many: '{{count}} мин',
+10
View File
@@ -1554,6 +1554,10 @@ export const zhTranslation = {
participantsRemoveAria: '从此会话中移除 {{user}}', participantsRemoveAria: '从此会话中移除 {{user}}',
participantsBanTooltip: '永久封禁', participantsBanTooltip: '永久封禁',
participantsBanAria: '永久封禁 {{user}}', participantsBanAria: '永久封禁 {{user}}',
participantsMuteTooltip: '禁止投歌',
participantsUnmuteTooltip: '允许投歌',
participantsMuteAria: '禁止 {{user}} 投歌',
participantsUnmuteAria: '允许 {{user}} 重新投歌',
confirmRemoveTitle: '从会话中移除?', confirmRemoveTitle: '从会话中移除?',
confirmRemoveBody: '{{user}} 将从会话中移除,但可以通过你的邀请链接重新加入。', confirmRemoveBody: '{{user}} 将从会话中移除,但可以通过你的邀请链接重新加入。',
confirmRemoveConfirm: '移除', confirmRemoveConfirm: '移除',
@@ -1579,6 +1583,12 @@ export const zhTranslation = {
settingAutoShuffleHint: '即将播放队列的定期 Fisher-Yates 洗牌。关闭:顺序仅在你手动重新排列时改变。', settingAutoShuffleHint: '即将播放队列的定期 Fisher-Yates 洗牌。关闭:顺序仅在你手动重新排列时改变。',
settingShuffleInterval: '洗牌间隔', settingShuffleInterval: '洗牌间隔',
settingShuffleIntervalHint: '会话运行时即将播放队列的重新洗牌频率。', settingShuffleIntervalHint: '会话运行时即将播放队列的重新洗牌频率。',
settingMaxPending: '最大待审投歌数',
settingMaxPendingHint: '同时等待审核的访客投歌上限。0 = 不限制。',
pendingCounter: '{{count}} / {{max}} 待审',
pendingCounterTooltip: '等待中的访客投歌 / 上限',
suggestBlockedMuted: '主持人已禁止你在本场会话投歌。',
suggestBlockedCap: '审核队列已满,等主持人处理一些再继续。',
settingShuffleIntervalValue_one: '{{count}} 分钟', settingShuffleIntervalValue_one: '{{count}} 分钟',
settingShuffleIntervalValue_other: '{{count}} 分钟', settingShuffleIntervalValue_other: '{{count}} 分钟',
settingShuffleNow: '立即洗牌', settingShuffleNow: '立即洗牌',
+41
View File
@@ -11847,6 +11847,11 @@ html[data-psy-native-hidden="true"] *::after {
background: color-mix(in srgb, var(--ctp-red, #f38ba8) 12%, transparent); background: color-mix(in srgb, var(--ctp-red, #f38ba8) 12%, transparent);
border-color: color-mix(in srgb, var(--ctp-red, #f38ba8) 35%, transparent); border-color: color-mix(in srgb, var(--ctp-red, #f38ba8) 35%, transparent);
} }
.orbit-participants-pop__kick.is-active {
color: var(--ctp-peach, #fab387);
background: color-mix(in srgb, var(--ctp-peach, #fab387) 16%, transparent);
border-color: color-mix(in srgb, var(--ctp-peach, #fab387) 45%, transparent);
}
/* ── Exit modal ────────────────────────────────────────────────────── */ /* ── Exit modal ────────────────────────────────────────────────────── */
.orbit-exit-overlay { .orbit-exit-overlay {
@@ -12383,6 +12388,22 @@ html[data-psy-native-hidden="true"] *::after {
.orbit-settings-pop__row--stacked:hover { .orbit-settings-pop__row--stacked:hover {
background: transparent; background: transparent;
} }
.orbit-settings-pop__number {
width: 64px;
padding: 4px 6px;
border-radius: 6px;
background: var(--ctp-surface0, rgba(127, 127, 127, 0.12));
border: 1px solid color-mix(in srgb, var(--text-secondary) 18%, transparent);
color: var(--text-primary);
font-size: 12px;
font-variant-numeric: tabular-nums;
text-align: right;
flex-shrink: 0;
}
.orbit-settings-pop__number:focus {
outline: none;
border-color: var(--accent);
}
.orbit-settings-pop__preset-group { .orbit-settings-pop__preset-group {
display: flex; display: flex;
@@ -12519,6 +12540,26 @@ html[data-psy-native-hidden="true"] *::after {
white-space: nowrap; white-space: nowrap;
min-width: 0; min-width: 0;
} }
.orbit-queue-head__pending {
display: inline-flex;
align-items: center;
gap: 3px;
margin-left: auto;
padding: 1px 6px;
border-radius: 9px;
background: color-mix(in srgb, var(--accent) 12%, transparent);
border: 1px solid color-mix(in srgb, var(--accent) 28%, transparent);
color: var(--text-secondary);
font-size: 10px;
font-variant-numeric: tabular-nums;
flex-shrink: 0;
}
.orbit-queue-head__pending.is-full {
color: var(--ctp-red, #f38ba8);
background: color-mix(in srgb, var(--ctp-red, #f38ba8) 14%, transparent);
border-color: color-mix(in srgb, var(--ctp-red, #f38ba8) 40%, transparent);
}
.orbit-queue-head__pending svg { color: inherit; }
.orbit-guest-queue__current { .orbit-guest-queue__current {
position: relative; position: relative;
+103 -3
View File
@@ -456,7 +456,49 @@ export async function leaveOrbitSession(): Promise<void> {
* consume it and publish the authoritative queue update in the state blob. * consume it and publish the authoritative queue update in the state blob.
* No state mutation here the guest never touches canonical state. * No state mutation here the guest never touches canonical state.
*/ */
/** Why a guest's suggestion would be blocked, in priority order. `null` means
* the suggestion can proceed. */
export type OrbitSuggestGateReason = 'not-guest' | 'muted' | 'cap-reached' | null;
/**
* Evaluate whether the local guest is allowed to send a new suggestion right
* now used by both the UI (to disable buttons / show toasts) and
* {@link suggestOrbitTrack} as a defensive check.
*
* Mute check uses the host-pushed `state.suggestionBlocked` list. Cap check
* is approximate from the guest's POV: it counts every non-host entry in
* `state.queue` plus the local `pendingSuggestions` list that hasn't been
* reconciled yet. We can't subtract host-side merged/declined sets the
* guest never sees them so the count is conservative (over-, not under-).
*/
export function evaluateOrbitSuggestGate(): { allowed: boolean; reason: OrbitSuggestGateReason } {
const { role, state, pendingSuggestions } = useOrbitStore.getState();
if (role !== 'guest' || !state) return { allowed: false, reason: 'not-guest' };
const username = useAuthStore.getState().getActiveServer()?.username ?? '';
if (state.suggestionBlocked?.includes(username)) {
return { allowed: false, reason: 'muted' };
}
const cap = state.settings?.maxPending ?? 0;
if (cap > 0) {
const inState = state.queue.filter(q => q.addedBy !== state.host).length;
const total = inState + pendingSuggestions.length;
if (total >= cap) return { allowed: false, reason: 'cap-reached' };
}
return { allowed: true, reason: null };
}
export class OrbitSuggestBlockedError extends Error {
constructor(public readonly reason: Exclude<OrbitSuggestGateReason, null>) {
super(`Suggestion blocked: ${reason}`);
this.name = 'OrbitSuggestBlockedError';
}
}
export async function suggestOrbitTrack(trackId: string): Promise<void> { export async function suggestOrbitTrack(trackId: string): Promise<void> {
const gate = evaluateOrbitSuggestGate();
if (!gate.allowed && gate.reason && gate.reason !== 'not-guest') {
throw new OrbitSuggestBlockedError(gate.reason);
}
const { role, outboxPlaylistId, sessionId } = useOrbitStore.getState(); const { role, outboxPlaylistId, sessionId } = useOrbitStore.getState();
if (role !== 'guest') throw new Error('Not joined to a session as a guest'); if (role !== 'guest') throw new Error('Not joined to a session as a guest');
if (!outboxPlaylistId || !sessionId) throw new Error('No outbox bound'); if (!outboxPlaylistId || !sessionId) throw new Error('No outbox bound');
@@ -853,6 +895,40 @@ export async function removeOrbitParticipant(username: string): Promise<void> {
} catch { /* best-effort */ } } catch { /* best-effort */ }
} }
/**
* Host: mute/unmute a participant's track suggestions.
*
* Symmetric pass `blocked: true` to add the username to
* `state.suggestionBlocked`, `false` to remove it. The participant remains
* in the session and continues to appear in the participants list; only new
* outbox entries are silently dropped during the host's sweep. The guest UI
* reads the same flag and disables its own Suggest controls so the user
* sees a clear "muted" state instead of silent failures.
*
* No-op outside host role, when the session isn't active, when the target
* is the host themselves, or when the toggle wouldn't change anything.
*/
export async function setOrbitSuggestionBlocked(username: string, blocked: boolean): Promise<void> {
const store = useOrbitStore.getState();
if (store.role !== 'host') return;
const state = store.state;
const sessionPlaylistId = store.sessionPlaylistId;
if (!state || !sessionPlaylistId) return;
if (username === state.host) return;
const current = state.suggestionBlocked ?? [];
const isBlocked = current.includes(username);
if (blocked === isBlocked) return;
const nextList = blocked
? [...current, username]
: current.filter(u => u !== username);
const nextState: OrbitState = { ...state, suggestionBlocked: nextList };
useOrbitStore.getState().setState(nextState);
try { await writeOrbitState(sessionPlaylistId, nextState); }
catch { /* best-effort; next host tick will re-push state */ }
}
/** /**
* Fold sweep results into an updated `OrbitState`. * Fold sweep results into an updated `OrbitState`.
* *
@@ -868,6 +944,7 @@ export function applyOutboxSnapshotsToState(
state: OrbitState, state: OrbitState,
snapshots: OutboxSnapshot[], snapshots: OutboxSnapshot[],
nowMs: number = Date.now(), nowMs: number = Date.now(),
opts?: { mergedKeys?: ReadonlySet<string>; declinedKeys?: ReadonlySet<string> },
): OrbitState { ): OrbitState {
// ── Queue additions ── // ── Queue additions ──
// Guest outboxes are append-only from the host's POV — the host reads the // Guest outboxes are append-only from the host's POV — the host reads the
@@ -877,18 +954,41 @@ export function applyOutboxSnapshotsToState(
// balloons indefinitely. A user re-suggesting the same track after it // balloons indefinitely. A user re-suggesting the same track after it
// lands/plays is a rare enough case to live with for now. // lands/plays is a rare enough case to live with for now.
const existingKeys = new Set<string>( const existingKeys = new Set<string>(
state.queue.map(q => `${q.addedBy}${q.trackId}`), state.queue.map(q => `${q.addedBy} ${q.trackId}`),
); );
if (state.currentTrack) { if (state.currentTrack) {
existingKeys.add(`${state.currentTrack.addedBy}${state.currentTrack.trackId}`); existingKeys.add(`${state.currentTrack.addedBy} ${state.currentTrack.trackId}`);
} }
// Compute remaining slots under the host's pending-approval cap. Items the
// host has merged or declined have left the approval queue and don't
// occupy a slot any more — without those sets we conservatively count
// every non-host queue entry as pending. Plus drop any new suggestion
// from a user the host has muted.
const blocked = new Set(state.suggestionBlocked ?? []);
const cap = state.settings?.maxPending ?? 0;
const merged = opts?.mergedKeys ?? new Set<string>();
const declined = opts?.declinedKeys ?? new Set<string>();
const pendingCount = cap > 0
? state.queue.filter(q =>
q.addedBy !== state.host
&& !merged.has(suggestionKey(q))
&& !declined.has(suggestionKey(q))
).length
: 0;
let remaining = cap > 0 ? Math.max(0, cap - pendingCount) : Infinity;
const newItems: OrbitQueueItem[] = []; const newItems: OrbitQueueItem[] = [];
outer:
for (const snap of snapshots) { for (const snap of snapshots) {
if (blocked.has(snap.user)) continue;
for (const trackId of snap.trackIds) { for (const trackId of snap.trackIds) {
const key = `${snap.user}${trackId}`; if (remaining <= 0) break outer;
const key = `${snap.user} ${trackId}`;
if (existingKeys.has(key)) continue; if (existingKeys.has(key)) continue;
existingKeys.add(key); existingKeys.add(key);
newItems.push({ trackId, addedBy: snap.user, addedAt: nowMs }); newItems.push({ trackId, addedBy: snap.user, addedAt: nowMs });
remaining--;
} }
} }