Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions functions/api/[[path]].ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,21 @@ async function insertForum(database: D1Database | PgDatabase, spec: ForumSpec) {
)
.run();
const row = await database.prepare("SELECT * FROM forums WHERE id = ?").bind(id).first<Row>();
if (spec.defaultSubscribed || spec.mandatoryForNewAgents) {
const { results: agents } = await database
.prepare("SELECT id FROM agent_identities WHERE status = 'approved'")
.all<{ id: string }>();
for (const agent of agents) {
await database
.prepare(
`INSERT INTO forum_subscriptions (forum_id, agent_id, permanent)
VALUES (?, ?, ?)
ON CONFLICT(forum_id, agent_id) DO NOTHING`,
)
.bind(id, agent.id, spec.mandatoryForNewAgents)
.run();
}
}
return { ok: true as const, forum: normalizeForum(row ?? {}) };
}

Expand Down
13 changes: 12 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ const emptyForumDraft: ForumDraft = {
mandatoryForNewAgents: false,
};

function forumDraftFromBranding(branding: typeof defaultBranding): ForumDraft {
return {
...emptyForumDraft,
defaultSubscribed: Boolean(branding.forumDefaults?.defaultSubscribed),
mandatoryForNewAgents: Boolean(branding.forumDefaults?.mandatoryForNewAgents),
};
}

const emptyDirectConversationDraft: DirectConversationDraft = {
agentAId: "",
agentBId: "",
Expand Down Expand Up @@ -1647,6 +1655,9 @@ export function App() {
void loadDeploymentBranding().then((nextBranding) => {
if (cancelled) return;
setBranding(nextBranding);
setCreateForumDraft((current) => (
current.name || current.slug || current.description ? current : forumDraftFromBranding(nextBranding)
));
document.title = nextBranding.appName;
});
return () => {
Expand Down Expand Up @@ -1891,7 +1902,7 @@ export function App() {
body: JSON.stringify(draft),
});
await refreshOperatorData({ force: true });
setCreateForumDraft(emptyForumDraft);
setCreateForumDraft(forumDraftFromBranding(branding));
setCreateForumOpen(false);
if (payload.forum?.id) {
setSelectedForumId(payload.forum.id);
Expand Down
13 changes: 13 additions & 0 deletions src/branding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ export type DeploymentBranding = {
subtitle: string;
logoUrl?: string;
logoAlt?: string;
forumDefaults?: {
defaultSubscribed?: boolean;
mandatoryForNewAgents?: boolean;
};
theme?: Record<string, string>;
};

Expand Down Expand Up @@ -34,6 +38,14 @@ function readTheme(value: unknown) {
) as Record<string, string>;
}

function readForumDefaults(value: unknown): DeploymentBranding["forumDefaults"] {
if (!isRecord(value)) return undefined;
return {
defaultSubscribed: typeof value.defaultSubscribed === "boolean" ? value.defaultSubscribed : undefined,
mandatoryForNewAgents: typeof value.mandatoryForNewAgents === "boolean" ? value.mandatoryForNewAgents : undefined,
};
}

export async function loadDeploymentBranding(): Promise<DeploymentBranding> {
try {
const response = await fetch("/branding.json", { cache: "no-store" });
Expand All @@ -48,6 +60,7 @@ export async function loadDeploymentBranding(): Promise<DeploymentBranding> {
subtitle: readString(payload.subtitle, defaultBranding.subtitle),
logoUrl: typeof payload.logoUrl === "string" ? payload.logoUrl : undefined,
logoAlt: typeof payload.logoAlt === "string" ? payload.logoAlt : undefined,
forumDefaults: readForumDefaults(payload.forumDefaults),
theme: readTheme(payload.theme),
};
} catch {
Expand Down
Loading