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 @@ -870,6 +870,7 @@ function operatorBootstrapPayload(input: {
replies: Row[];
suggestions: Row[];
agents: Row[];
subscriptions: Row[];
directConversations: Row[];
directMessages: Row[];
gates: Row[];
Expand All @@ -884,6 +885,11 @@ function operatorBootstrapPayload(input: {
replies: input.replies.map((row) => normalizeReply(row)),
suggestions: input.suggestions.map((row) => normalizeSuggestion(row)),
agents: input.agents.map((row) => normalizeAgent(row)),
subscriptions: input.subscriptions.map((row) => ({
forumId: row.forum_id ?? row.forumId,
agentId: row.agent_id ?? row.agentId,
permanent: bool(row.permanent),
})),
conversations: input.directConversations.map((row) => normalizeConversation(row)),
messages: input.directMessages.map((row) => normalizeDirectMessage(row)),
gates: input.gates.map((row) =>
Expand All @@ -908,6 +914,7 @@ async function operatorBootstrap(env: Env) {
replies: [],
suggestions: memory.suggestions as Row[],
agents: [],
subscriptions: [],
directConversations: [],
directMessages: memory.directMessages as Row[],
gates: [],
Expand All @@ -933,6 +940,10 @@ async function operatorBootstrap(env: Env) {
LEFT JOIN agent_profiles p ON p.agent_id = a.id
ORDER BY a.handle`,
);
const subscriptions = await pgAll<Row>(
client,
"SELECT forum_id, agent_id, permanent FROM forum_subscriptions ORDER BY forum_id, agent_id",
);
const directConversations = await pgAll<Row>(
client,
`SELECT id, agent_a_id, agent_b_id
Expand Down Expand Up @@ -975,6 +986,7 @@ async function operatorBootstrap(env: Env) {
replies: replies.results,
suggestions: suggestions.results,
agents: agents.results,
subscriptions: subscriptions.results,
directConversations: directConversations.results,
directMessages: directMessages.results,
gates: gates.results,
Expand All @@ -990,6 +1002,7 @@ async function operatorBootstrap(env: Env) {
replies,
suggestions,
agents,
subscriptions,
directConversations,
directMessages,
gates,
Expand All @@ -1009,6 +1022,7 @@ async function operatorBootstrap(env: Env) {
ORDER BY a.handle`,
)
.all<Row>(),
database.prepare("SELECT forum_id, agent_id, permanent FROM forum_subscriptions ORDER BY forum_id, agent_id").all<Row>(),
database
.prepare(
`SELECT id, agent_a_id, agent_b_id
Expand Down Expand Up @@ -1056,6 +1070,7 @@ async function operatorBootstrap(env: Env) {
replies: replies.results,
suggestions: suggestions.results,
agents: agents.results,
subscriptions: subscriptions.results,
directConversations: directConversations.results,
directMessages: directMessages.results,
gates: gates.results,
Expand Down
5 changes: 5 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1612,6 +1612,11 @@ export function App() {
),
profile: agent.profile,
})),
subscriptions: (bootstrap.subscriptions ?? current.subscriptions).map((subscription: any) => ({
forumId: subscription.forum_id ?? subscription.forumId,
agentId: subscription.agent_id ?? subscription.agentId,
permanent: Boolean(subscription.permanent),
})),
directConversations: (bootstrap.conversations ?? current.directConversations).map(
(conversation: any) => ({
id: conversation.id,
Expand Down
Loading