Discord picker: per-bot permission status, owner's preferred bot (server-26#225 S4)
Node-page picker and the admin Add form now show, per voice channel, whether
a radio bot can stream there, from S3's voice-check routes:
- Badge per channel: Ready / Needs fix (names the missing permission) /
Couldn't check / Bots busy / No radio bot / Not a voice channel / Limit N.
- The chosen channel shows "<bot> can't Speak in #dispatch: <what removed it>"
plus c2-core's fix sentence, and an expandable per-bot list.
- Footer: "Permissions checked 40s ago · Re-check" (refresh=1, rate limited
server-side; a limited re-check says so). Invite links when no bot fits.
- Start is disabled only on a definite refusal (needs_fix, bad_channel);
unknown fails open. A channel this system already plays in is judged by
the bot that carries it, so Update/move is never blocked by the other bots.
- Admin Add form disables bots that are definitely denied in the bot list.
- 409 refusals (missing_permissions, preferred_busy, preferred_other_node,
bad_channel) are shown verbatim, multi-line.
Org owners (owner decision Q2) get "Radio bot per system" on
Settings > Organization: their own systems, their own BYO bots, set/clear
through S3's PUT /tokens/{id}/prefer/{system}. New GET /tokens/org/preferred
lists only the caller org's systems and bots (no pool bots, no token
strings; a pool bot an admin chose is flagged, not named).
The prefer route now drops the 5-minute doc_get_cached entry for every
system it rewrites, so a new preference applies to the next start.
Stacked on feat/225-s3-perm-check: must merge after S3.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Logan Cusano
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
2c2cf9d9be
commit
1ee1560383
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useMemo, useState } from "react";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { c2api } from "@/lib/c2api";
|
||||
import {
|
||||
type DiscordAdminOverview,
|
||||
@@ -12,8 +12,18 @@ import {
|
||||
shortId,
|
||||
streamHealth,
|
||||
} from "@/lib/discord";
|
||||
import {
|
||||
blocksStart,
|
||||
channelVerdict,
|
||||
normalizeVoiceCheck,
|
||||
parseC2Error as parseStartError,
|
||||
type ParsedC2Error,
|
||||
type VoiceCheck,
|
||||
type VoiceCheckBot,
|
||||
} from "@/lib/discordPicker";
|
||||
import { Button } from "@/components/ui/Button";
|
||||
import { DIM, Field, INPUT, InviteLinks, Panel, Status, Table, TD } from "./ui";
|
||||
import { BotDetails, CheckFooter, FixText, VerdictBadge } from "./VoiceCheckBits";
|
||||
|
||||
// Radio channels = discord_streams docs, desired vs actual. Start/Stop/Add go
|
||||
// through the same routes the Discord bot uses (POST /discord/streams,
|
||||
@@ -25,6 +35,11 @@ import { DIM, Field, INPUT, InviteLinks, Panel, Status, Table, TD } from "./ui";
|
||||
// each with its own radio bot and system (server-26#213 follow-up). Stop,
|
||||
// Start and Remove all act on the row's stream_id, so the other streams in
|
||||
// the same channel keep playing. Add never replaces an existing stream.
|
||||
//
|
||||
// The Add form checks the typed channel with Discord (server-26#225:
|
||||
// GET /discord/guilds/{id}/voice-check, admin): per-bot status, bots that
|
||||
// definitely can't stream there are disabled in the bot list, and Start is
|
||||
// disabled only when every bot is definitely denied (unknown fails open).
|
||||
|
||||
type Invite = { name: string; invite_url: string | null }[];
|
||||
|
||||
@@ -48,7 +63,43 @@ function AddChannelForm({
|
||||
const [systemId, setSystemId] = useState("");
|
||||
const [botId, setBotId] = useState("");
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [error, setError] = useState<{ message: string; invite: Invite } | null>(null);
|
||||
const [error, setError] = useState<(Omit<ParsedC2Error, "invite"> & { invite: Invite }) | null>(null);
|
||||
const [check, setCheck] = useState<
|
||||
{ key: string; data: VoiceCheck | null; busy: boolean; error: string | null; limited: boolean } | null
|
||||
>(null);
|
||||
|
||||
const cid = channelId.trim();
|
||||
const checkKey = SNOWFLAKE.test(cid) && guildId ? `${guildId}:${cid}` : "";
|
||||
const runCheck = useCallback(async (key: string, refresh: boolean) => {
|
||||
const [gid, ch] = key.split(":");
|
||||
setCheck((c) => ({ key, data: c?.key === key ? c.data : null, busy: true, error: null, limited: false }));
|
||||
try {
|
||||
const data = normalizeVoiceCheck(await c2api.getGuildVoiceCheck(gid, ch, refresh));
|
||||
setCheck((c) => (c?.key === key ? { key, data, busy: false, error: null, limited: refresh && data.refreshed === false } : c));
|
||||
} catch (err) {
|
||||
const e = parseStartError(err);
|
||||
setCheck((c) =>
|
||||
c?.key === key ? { key, data: c.data, busy: false, error: e.status === 404 ? null : e.message, limited: false } : c,
|
||||
);
|
||||
}
|
||||
}, []);
|
||||
// Check the channel once its ID looks complete (debounced while typing).
|
||||
useEffect(() => {
|
||||
if (!checkKey) {
|
||||
setCheck(null);
|
||||
return;
|
||||
}
|
||||
const t = setTimeout(() => runCheck(checkKey, false), 400);
|
||||
return () => clearTimeout(t);
|
||||
}, [checkKey, runCheck]);
|
||||
const liveCheck = check && check.key === checkKey ? check : null;
|
||||
const checkOn = liveCheck?.data?.enabled !== false;
|
||||
const checked = liveCheck?.data && checkOn ? liveCheck.data.channels[cid] : undefined;
|
||||
const verdict = liveCheck?.data && checkOn ? channelVerdict(checked) : null;
|
||||
const shownName = channelName.trim() || checked?.name || null;
|
||||
// Per-bot result, by token id (the admin route sends ids) or else by name.
|
||||
const botCheck = (b: RadioBot): VoiceCheckBot | undefined =>
|
||||
checked?.bots.find((x) => (x.token_id ? x.token_id === b.token_id : x.name === b.name || x.name === b.bot_name));
|
||||
|
||||
const org = guilds.find((g) => g.guild_id === guildId)?.acting_org_id ?? null;
|
||||
const systems = overview.systems.filter((s) => s.org_id == null || s.org_id === org);
|
||||
@@ -58,6 +109,8 @@ function AddChannelForm({
|
||||
for (const s of overview.streams) {
|
||||
if (s.desired === "on" && s.guild_id === guildId && s.token_id) busyHere.set(s.token_id, s);
|
||||
}
|
||||
const chosenBot = botId ? bots.find((b) => b.token_id === botId) : undefined;
|
||||
const chosenBotDenied = chosenBot ? botCheck(chosenBot)?.ok === false : false;
|
||||
const inChannel = overview.streams.filter(
|
||||
(s) => s.desired === "on" && s.guild_id === guildId && s.channel_id === channelId.trim(),
|
||||
);
|
||||
@@ -65,7 +118,7 @@ function AddChannelForm({
|
||||
async function submit(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
if (!SNOWFLAKE.test(channelId.trim())) {
|
||||
setError({ message: "Voice channel ID is the 17–20 digit number from Discord (right-click the channel → Copy Channel ID).", invite: [] });
|
||||
setError({ message: "Voice channel ID is the 17–20 digit number from Discord (right-click the channel → Copy Channel ID).", invite: [], code: null, status: null });
|
||||
return;
|
||||
}
|
||||
setSaving(true);
|
||||
@@ -86,12 +139,16 @@ function AddChannelForm({
|
||||
setError({
|
||||
message: `${res.system_name || "That system"} is already playing in this voice channel, so nothing was added or changed. Pick another system to add a second stream, or Remove the existing row to change its label or bot.`,
|
||||
invite: [],
|
||||
code: "already_on",
|
||||
status: null,
|
||||
});
|
||||
return;
|
||||
}
|
||||
onDone();
|
||||
} catch (err) {
|
||||
setError(parseC2Error(err));
|
||||
const e = parseStartError(err);
|
||||
setError({ ...e, invite: parseC2Error(err).invite });
|
||||
if (e.code === "missing_permissions" && checkKey) runCheck(checkKey, false);
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
@@ -142,16 +199,42 @@ function AddChannelForm({
|
||||
<option value="">Any free bot in this server</option>
|
||||
{usableBots.map((b) => {
|
||||
const busy = busyHere.get(b.token_id);
|
||||
const bc = botCheck(b);
|
||||
const denied = bc?.ok === false;
|
||||
return (
|
||||
<option key={b.token_id} value={b.token_id} disabled={!!busy}>
|
||||
<option key={b.token_id} value={b.token_id} disabled={!!busy || denied}>
|
||||
{busy
|
||||
? `${b.name} — in use here (${busy.system_name || busy.system_id || "radio"}${busy.channel_name ? ` in ${busy.channel_name}` : ""})`
|
||||
: `Use ${b.name}`}
|
||||
: denied
|
||||
? `${b.name} — can't ${bc.missing.length ? bc.missing.join(", ") : "join"} in this channel`
|
||||
: `Use ${b.name}`}
|
||||
</option>
|
||||
);
|
||||
})}
|
||||
</select>
|
||||
</Field>
|
||||
{checkKey && (
|
||||
<div className="sm:col-span-3 space-y-1">
|
||||
<div className="flex items-center gap-2 text-xs text-ink-muted">
|
||||
<span>Permissions in {shownName ? `#${shownName.replace(/^#/, "")}` : "this channel"}:</span>
|
||||
{checkOn && <VerdictBadge verdict={verdict} loading={liveCheck?.busy} />}
|
||||
</div>
|
||||
{verdict && <FixText verdict={verdict} channelName={shownName} />}
|
||||
{chosenBotDenied && (
|
||||
<div className="text-xs text-sev-major">The bot you picked can't stream into this channel — pick another, or fix it in Discord and Re-check.</div>
|
||||
)}
|
||||
{checkOn && <BotDetails channel={checked} channelName={shownName} />}
|
||||
<CheckFooter
|
||||
checkedAt={liveCheck?.data?.checked_at ?? null}
|
||||
busy={!!liveCheck?.busy}
|
||||
error={liveCheck?.error ?? null}
|
||||
disabled={!checkOn}
|
||||
limited={!!liveCheck?.limited}
|
||||
invite={verdict && ["fix", "no_bot", "busy"].includes(verdict.kind) ? liveCheck?.data?.invite : undefined}
|
||||
onRecheck={() => runCheck(checkKey, true)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{inChannel.length > 0 && (
|
||||
<div className="sm:col-span-3 text-xs text-ink-muted">
|
||||
This voice channel already plays{" "}
|
||||
@@ -160,13 +243,20 @@ function AddChannelForm({
|
||||
</div>
|
||||
)}
|
||||
{error && (
|
||||
<div className="sm:col-span-3 text-xs text-sev-major">
|
||||
<div role="alert" className="sm:col-span-3 text-xs text-sev-major whitespace-pre-line">
|
||||
{error.message}
|
||||
<InviteLinks invite={error.invite} />
|
||||
</div>
|
||||
)}
|
||||
<div className="sm:col-span-3 flex gap-2">
|
||||
<Button type="submit" size="sm" disabled={saving || !systemId}>{saving ? "Starting…" : "Start radio channel"}</Button>
|
||||
<Button
|
||||
type="submit"
|
||||
size="sm"
|
||||
disabled={saving || !systemId || blocksStart(verdict) || chosenBotDenied}
|
||||
title={blocksStart(verdict) ? "No radio bot in this server can stream into this channel — fix the permission in Discord, then Re-check." : undefined}
|
||||
>
|
||||
{saving ? "Starting…" : "Start radio channel"}
|
||||
</Button>
|
||||
<Button type="button" size="sm" variant="ghost" onClick={onCancel}>Cancel</Button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user