v4: playlists have categories of their own — a set apart from the dumps', which admins manage on /manage under "Playlist categories", next to "Dump categories". Each category now has a kind, dump or playlist, its slug and name unique within its kind only; migration 0025 rebuilds categories with the column, every existing one becoming a dump category with its dumps, and adds playlist_categories. A playlist's owner files it under any of them in the create and edit forms, and it shows them as chips on its card and its page, each leading to /playlists/<slug>.
/playlists is the new page of every public playlist, newest first (GET /api/playlists), and /playlists/<slug> a playlist category's, with a menu of the categories, linked from the user menu as "All playlists"; `playlists` is reserved as a dump category's slug, and one that had it is renamed. A profile's Playlists tab narrows to a playlist category with the same menu as its Dumps tab (?category=), and so do the Dumps and Playlists tabs of /search, each with its own kind (category and playlistCategory for GET /api/search), another tab dropping it. The category service takes the kind throughout, so a dump can't be filed under a playlist category nor the other way round, and categoryJoin is the one filter join the dump, follow and playlist services share. useCategories(kind) gives one kind's set from the one fetch, CategoryChips replaces the chips the dump card and page each drew, useCategoryFilter keeps a list to its category as the socket brings more, and useCategorySelection holds a form's picked categories. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
khannurien
@@ -56,7 +56,8 @@ import { relinkBacklinks } from "./backlink-service.ts";
|
||||
import {
|
||||
assertCategoriesExist,
|
||||
attachCategoryIds,
|
||||
setDumpCategories,
|
||||
categoryJoin,
|
||||
setCategories,
|
||||
} from "./category-service.ts";
|
||||
import { LIKE, likePattern } from "../lib/like.ts";
|
||||
import { parseRows } from "../model/rows.ts";
|
||||
@@ -114,7 +115,7 @@ export async function createUrlDump(
|
||||
if (!isValidHttpUrl(request.url)) {
|
||||
throw new APIException(400, "Invalid URL");
|
||||
}
|
||||
assertCategoriesExist(request.categoryIds ?? []);
|
||||
assertCategoriesExist("dump", request.categoryIds ?? []);
|
||||
|
||||
const dumpId = crypto.randomUUID();
|
||||
const createdAt = new Date();
|
||||
@@ -144,7 +145,7 @@ export async function createUrlDump(
|
||||
richContent ? JSON.stringify(richContent) : null,
|
||||
isPrivate ? 1 : 0,
|
||||
);
|
||||
setDumpCategories(dumpId, categoryIds);
|
||||
setCategories("dump", dumpId, categoryIds);
|
||||
});
|
||||
|
||||
const dump: Dump = { ...fetchDump(dumpId), categoryIds };
|
||||
@@ -184,7 +185,7 @@ export async function createFileDump(
|
||||
if (file.size > DUMP_MAX_FILE_SIZE_BYTES) {
|
||||
throw new APIException(400, "File too large (max 50 MB)");
|
||||
}
|
||||
assertCategoriesExist(categoryIds);
|
||||
assertCategoriesExist("dump", categoryIds);
|
||||
|
||||
const dumpId = crypto.randomUUID();
|
||||
const createdAt = new Date();
|
||||
@@ -215,7 +216,7 @@ export async function createFileDump(
|
||||
file.size,
|
||||
isPrivate ? 1 : 0,
|
||||
);
|
||||
setDumpCategories(dumpId, dedupedCategoryIds);
|
||||
setCategories("dump", dumpId, dedupedCategoryIds);
|
||||
});
|
||||
} catch (err) {
|
||||
// Leave no file behind when the write or the insert fails.
|
||||
@@ -262,7 +263,7 @@ export function getDump(dumpId: string, requestingUserId?: string): Dump {
|
||||
if (dump.isPrivate && dump.userId !== requestingUserId) {
|
||||
throw new APIException(404, "Dump not found");
|
||||
}
|
||||
attachCategoryIds([dump]);
|
||||
attachCategoryIds("dump", [dump]);
|
||||
return dump;
|
||||
}
|
||||
|
||||
@@ -288,13 +289,15 @@ export function getDumpByPath(
|
||||
/**
|
||||
* Returns a page of the dumps `requestingUserId` may see whose title, note, or
|
||||
* previewed title or description contains `query`, newest first, with how many
|
||||
* match in all. `GET /api/search` calls it.
|
||||
* match in all, optionally only those in the dump category `categoryId`.
|
||||
* `GET /api/search` calls it.
|
||||
*/
|
||||
export function searchDumps(
|
||||
query: string,
|
||||
page: number,
|
||||
limit: number,
|
||||
requestingUserId?: string,
|
||||
categoryId?: string,
|
||||
): { items: Dump[]; total: number } {
|
||||
if (!query.trim()) return { items: [], total: 0 };
|
||||
const pattern = likePattern(query);
|
||||
@@ -302,29 +305,28 @@ export function searchDumps(
|
||||
|
||||
const searchClause =
|
||||
`(title ${LIKE} OR comment ${LIKE} OR json_extract(rich_content,'$.title') ${LIKE} OR json_extract(rich_content,'$.description') ${LIKE})`;
|
||||
const searchParams = [pattern, pattern, pattern, pattern] as const;
|
||||
const privacyClause = requestingUserId
|
||||
? "(is_private = 0 OR user_id = ?)"
|
||||
: "is_private = 0";
|
||||
const [catJoin, catParams] = categoryJoin("dump", "dumps", categoryId);
|
||||
const params = [
|
||||
...catParams,
|
||||
...(requestingUserId ? [requestingUserId] : []),
|
||||
pattern,
|
||||
pattern,
|
||||
pattern,
|
||||
pattern,
|
||||
];
|
||||
|
||||
if (requestingUserId) {
|
||||
const rows = db.prepare(
|
||||
`SELECT ${SELECT_COLS} FROM dumps WHERE (is_private = 0 OR user_id = ?) AND ${searchClause} ORDER BY created_at DESC LIMIT ? OFFSET ?;`,
|
||||
).all(requestingUserId, ...searchParams, limit, offset);
|
||||
const totalRow = db.prepare(
|
||||
`SELECT COUNT(*) as count FROM dumps WHERE (is_private = 0 OR user_id = ?) AND ${searchClause};`,
|
||||
).get(requestingUserId, ...searchParams) as { count: number } | undefined;
|
||||
const items = parseRows(rows, isDumpRow, dumpRowToApi);
|
||||
attachCategoryIds(items);
|
||||
return { items, total: totalRow?.count ?? 0 };
|
||||
} else {
|
||||
const rows = db.prepare(
|
||||
`SELECT ${SELECT_COLS} FROM dumps WHERE is_private = 0 AND ${searchClause} ORDER BY created_at DESC LIMIT ? OFFSET ?;`,
|
||||
).all(...searchParams, limit, offset);
|
||||
const totalRow = db.prepare(
|
||||
`SELECT COUNT(*) as count FROM dumps WHERE is_private = 0 AND ${searchClause};`,
|
||||
).get(...searchParams) as { count: number } | undefined;
|
||||
const items = parseRows(rows, isDumpRow, dumpRowToApi);
|
||||
attachCategoryIds(items);
|
||||
return { items, total: totalRow?.count ?? 0 };
|
||||
}
|
||||
const rows = db.prepare(
|
||||
`SELECT ${SELECT_COLS} FROM dumps ${catJoin} WHERE ${privacyClause} AND ${searchClause} ORDER BY created_at DESC LIMIT ? OFFSET ?;`,
|
||||
).all(...params, limit, offset);
|
||||
const totalRow = db.prepare(
|
||||
`SELECT COUNT(*) as count FROM dumps ${catJoin} WHERE ${privacyClause} AND ${searchClause};`,
|
||||
).get(...params) as { count: number } | undefined;
|
||||
const items = parseRows(rows, isDumpRow, dumpRowToApi);
|
||||
attachCategoryIds("dump", items);
|
||||
return { items, total: totalRow?.count ?? 0 };
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -352,7 +354,7 @@ export function listDumps(
|
||||
}
|
||||
|
||||
const items = rows.map(dumpRowToApi);
|
||||
attachCategoryIds(items);
|
||||
attachCategoryIds("dump", items);
|
||||
return pageOf(items, limit);
|
||||
}
|
||||
|
||||
@@ -372,7 +374,7 @@ export function listTopDumps(from: Date, to: Date, limit: number): Dump[] {
|
||||
LIMIT ?;`,
|
||||
).all(from.toISOString(), to.toISOString(), limit);
|
||||
const items = parseRows(rows, isDumpRow, dumpRowToApi);
|
||||
attachCategoryIds(items);
|
||||
attachCategoryIds("dump", items);
|
||||
return items;
|
||||
}
|
||||
|
||||
@@ -441,7 +443,7 @@ export async function updateDump(
|
||||
): Promise<Dump> {
|
||||
const dump = fetchDump(dumpId);
|
||||
if (request.categoryIds !== undefined) {
|
||||
assertCategoriesExist(request.categoryIds);
|
||||
assertCategoriesExist("dump", request.categoryIds);
|
||||
}
|
||||
if (dump.kind === "url" && !isValidHttpUrl(request.url ?? dump.url!)) {
|
||||
throw new APIException(400, "Invalid URL");
|
||||
@@ -479,10 +481,10 @@ export async function updateDump(
|
||||
);
|
||||
if (request.categoryIds !== undefined) {
|
||||
const ids = [...new Set(request.categoryIds)];
|
||||
setDumpCategories(dumpId, ids);
|
||||
setCategories("dump", dumpId, ids);
|
||||
updatedDump.categoryIds = ids;
|
||||
} else {
|
||||
attachCategoryIds([updatedDump]);
|
||||
attachCategoryIds("dump", [updatedDump]);
|
||||
}
|
||||
broadcastDumpChange(dump, updatedDump);
|
||||
notifyIfWentPublic(dump, updatedDump);
|
||||
@@ -550,10 +552,10 @@ export async function updateDump(
|
||||
|
||||
if (request.categoryIds !== undefined) {
|
||||
const ids = [...new Set(request.categoryIds)];
|
||||
setDumpCategories(dumpId, ids);
|
||||
setCategories("dump", dumpId, ids);
|
||||
updatedDump.categoryIds = ids;
|
||||
} else {
|
||||
attachCategoryIds([updatedDump]);
|
||||
attachCategoryIds("dump", [updatedDump]);
|
||||
}
|
||||
|
||||
broadcastDumpChange(dump, updatedDump);
|
||||
@@ -610,7 +612,7 @@ export async function replaceFileDump(
|
||||
if (dump.kind !== "file") {
|
||||
throw new APIException(400, "Not a file dump");
|
||||
}
|
||||
if (categoryIds !== undefined) assertCategoriesExist(categoryIds);
|
||||
if (categoryIds !== undefined) assertCategoriesExist("dump", categoryIds);
|
||||
if (slug !== undefined) changeSlug("dump", dump, slug, exempt);
|
||||
|
||||
// The new file is written beside the old one and renamed over it (atomic: a
|
||||
@@ -650,7 +652,7 @@ export async function replaceFileDump(
|
||||
dumpId,
|
||||
);
|
||||
if (categoryIds !== undefined) {
|
||||
setDumpCategories(dumpId, [...new Set(categoryIds)]);
|
||||
setCategories("dump", dumpId, [...new Set(categoryIds)]);
|
||||
}
|
||||
});
|
||||
} catch (err) {
|
||||
@@ -664,7 +666,7 @@ export async function replaceFileDump(
|
||||
if (categoryIds !== undefined) {
|
||||
dump.categoryIds = [...new Set(categoryIds)];
|
||||
} else {
|
||||
attachCategoryIds([dump]);
|
||||
attachCategoryIds("dump", [dump]);
|
||||
}
|
||||
|
||||
if (comment) {
|
||||
@@ -690,20 +692,6 @@ export async function replaceFileDump(
|
||||
return updatedDump;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the join that keeps only the dumps `d` filed under `categoryId`,
|
||||
* with its parameters, or nothing without one. The lists of a user's dumps
|
||||
* filter by it.
|
||||
*/
|
||||
function categoryJoin(categoryId?: string): [string, string[]] {
|
||||
return categoryId
|
||||
? [
|
||||
"INNER JOIN dump_categories dc ON dc.dump_id = d.id AND dc.category_id = ?",
|
||||
[categoryId],
|
||||
]
|
||||
: ["", []];
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a page of `userId`'s dumps, newest first, for
|
||||
* `GET /api/users/:key/dumps`, optionally only those in `categoryId`. The
|
||||
@@ -720,7 +708,7 @@ export function getDumpsByUser(
|
||||
): Page<Dump> {
|
||||
const offset = (page - 1) * limit;
|
||||
const privacyFilter = includePrivate ? "" : " AND d.is_private = 0";
|
||||
const [catJoin, catParams] = categoryJoin(categoryId);
|
||||
const [catJoin, catParams] = categoryJoin("dump", "d", categoryId);
|
||||
const rows = db.prepare(
|
||||
`SELECT ${SELECT_COLS_ALIASED} FROM dumps d ${catJoin}
|
||||
WHERE d.user_id = ?${privacyFilter}
|
||||
@@ -730,7 +718,7 @@ export function getDumpsByUser(
|
||||
throw new APIException(500, "Malformed dump data");
|
||||
}
|
||||
const items = rows.map(dumpRowToApi);
|
||||
attachCategoryIds(items);
|
||||
attachCategoryIds("dump", items);
|
||||
return pageOf(items, limit);
|
||||
}
|
||||
|
||||
@@ -753,7 +741,7 @@ export function getVotedDumpsByUser(
|
||||
const privacyFilter = isOwn
|
||||
? "(d.is_private = 0 OR d.user_id = ?)"
|
||||
: "d.is_private = 0";
|
||||
const [catJoin, catParams] = categoryJoin(categoryId);
|
||||
const [catJoin, catParams] = categoryJoin("dump", "d", categoryId);
|
||||
const rows = db.prepare(
|
||||
`SELECT ${SELECT_COLS_ALIASED}
|
||||
FROM dumps d
|
||||
@@ -773,7 +761,7 @@ export function getVotedDumpsByUser(
|
||||
throw new APIException(500, "Malformed dump data");
|
||||
}
|
||||
const items = rows.map(dumpRowToApi);
|
||||
attachCategoryIds(items);
|
||||
attachCategoryIds("dump", items);
|
||||
return pageOf(items, limit);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user