Skip to content

improve save to semble/margin #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
disnet merged 1 commit into from
Apr 10, 2026
Merged

improve save to semble/margin #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 46 additions & 35 deletions backend/src/routes/integrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ export async function handleCreateSembleCard(request: Request, env: Env): Promis
description?: string;
author?: string;
publishedAt?: string;
collections?: { uri: string; cid: string }[];
// Legacy single-collection fields — still accepted from in-flight queued entries
collectionUri?: string;
collectionCid?: string;
};
Expand All @@ -115,6 +117,13 @@ export async function handleCreateSembleCard(request: Request, env: Env): Promis
});
}

const collections: { uri: string; cid: string }[] =
body.collections && body.collections.length > 0
? body.collections
: body.collectionUri && body.collectionCid
? [{ uri: body.collectionUri, cid: body.collectionCid }]
: [];

const rkey = generateTID();
const metadata: Record<string, string> = {};
if (body.title) metadata.title = body.title;
Expand Down Expand Up @@ -142,12 +151,13 @@ export async function handleCreateSembleCard(request: Request, env: Env): Promis
});
}

// If a collection was specified, add the card to it via collectionLink
if (body.collectionUri && body.collectionCid) {
// For each selected collection, create a collectionLink record.
const collectionResults: { uri: string; error?: string }[] = [];
for (const col of collections) {
const linkRkey = generateTID();
const collectionLink = {
$type: 'network.cosmik.collectionLink',
collection: { uri: body.collectionUri, cid: body.collectionCid },
collection: { uri: col.uri, cid: col.cid },
card: { uri: result.data.uri, cid: result.data.cid },
addedBy: session.did,
addedAt: new Date().toISOString(),
Expand All @@ -158,23 +168,19 @@ export async function handleCreateSembleCard(request: Request, env: Env): Promis
linkRkey,
collectionLink
);
if (!linkResult.success) {
// Card was created but collection link failed — return success with warning
return new Response(
JSON.stringify({
uri: result.data.uri,
cid: result.data.cid,
collectionError: linkResult.error,
}),
{ status: 201, headers: { 'Content-Type': 'application/json' } }
);
}
collectionResults.push(
linkResult.success ? { uri: col.uri } : { uri: col.uri, error: linkResult.error }
);
}

return new Response(JSON.stringify({ uri: result.data.uri, cid: result.data.cid }), {
status: 201,
headers: { 'Content-Type': 'application/json' },
});
return new Response(
JSON.stringify({
uri: result.data.uri,
cid: result.data.cid,
...(collectionResults.length > 0 ? { collectionResults } : {}),
}),
{ status: 201, headers: { 'Content-Type': 'application/json' } }
);
}

/**
Expand Down Expand Up @@ -238,6 +244,8 @@ export async function handleCreateMarginBookmark(request: Request, env: Env): Pr
url: string;
title?: string;
description?: string;
collectionUris?: string[];
// Legacy single-collection field — still accepted from in-flight queued entries
collectionUri?: string;
};
try {
Expand All @@ -256,6 +264,13 @@ export async function handleCreateMarginBookmark(request: Request, env: Env): Pr
});
}

const collectionUris: string[] =
body.collectionUris && body.collectionUris.length > 0
? body.collectionUris
: body.collectionUri
? [body.collectionUri]
: [];

const rkey = generateTID();
const record = {
$type: 'at.margin.bookmark',
Expand All @@ -276,12 +291,13 @@ export async function handleCreateMarginBookmark(request: Request, env: Env): Pr
});
}

// If a collection was specified, add the bookmark to it
if (body.collectionUri) {
// For each selected collection, create a collectionItem record.
const collectionResults: { uri: string; error?: string }[] = [];
for (const uri of collectionUris) {
const itemRkey = generateTID();
const collectionItem = {
$type: 'at.margin.collectionItem',
collection: body.collectionUri,
collection: uri,
annotation: result.data.uri,
createdAt: new Date().toISOString(),
};
Expand All @@ -290,22 +306,17 @@ export async function handleCreateMarginBookmark(request: Request, env: Env): Pr
itemRkey,
collectionItem
);
if (!itemResult.success) {
return new Response(
JSON.stringify({
uri: result.data.uri,
cid: result.data.cid,
collectionError: itemResult.error,
}),
{ status: 201, headers: { 'Content-Type': 'application/json' } }
);
}
collectionResults.push(itemResult.success ? { uri } : { uri, error: itemResult.error });
}

return new Response(JSON.stringify({ uri: result.data.uri, cid: result.data.cid }), {
status: 201,
headers: { 'Content-Type': 'application/json' },
});
return new Response(
JSON.stringify({
uri: result.data.uri,
cid: result.data.cid,
...(collectionResults.length > 0 ? { collectionResults } : {}),
}),
{ status: 201, headers: { 'Content-Type': 'application/json' } }
);
}

/**
Expand Down
Loading
Loading