Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

bug fixed

daniel31x1335643faf85e7
diff --git a/lib/api/controllers/collections/collectionId/deleteCollectionById.ts b/lib/api/controllers/collections/collectionId/deleteCollectionById.ts
index f2bf43ad..58c6978b 100644
--- a/lib/api/controllers/collections/collectionId/deleteCollectionById.ts
+++ b/lib/api/controllers/collections/collectionId/deleteCollectionById.ts
@@ -64,23 +64,37 @@ export default async function deleteCollection(
await removeFromOrders(userId, collectionId);
- return await prisma.collection.delete({
+ const links = await prisma.link.findMany({
where: {
- id: collectionId,
+ collectionId: collectionId,
},
- include: {
- links: true,
+ select: {
+ id: true,
},
});
- });
- const { links, ...data } = deletedCollection;
+ const linkIds = links.map((link) => link.id);
+
+ await meiliClient?.index("links").deleteDocuments(linkIds);
+
+ await prisma.link.deleteMany({
+ where: {
+ collection: {
+ id: collectionId,
+ },
+ },
+ });
- const linkIds = links.map((link) => link.id);
+ const collection = await prisma.collection.delete({
+ where: {
+ id: collectionId,
+ },
+ });
- meiliClient?.index("links").deleteDocuments(linkIds);
+ return collection;
+ });
- return { response: data, status: 200 };
+ return { response: deletedCollection, status: 200 };
}
async function deleteSubCollections(collectionId: number) {
@@ -110,7 +124,7 @@ async function deleteSubCollections(collectionId: number) {
const linkIds = links.map((link) => link.id);
- meiliClient?.index("links").deleteDocuments(linkIds);
+ await meiliClient?.index("links").deleteDocuments(linkIds);
await prisma.link.deleteMany({
where: {
diff --git a/lib/api/controllers/links/bulk/deleteLinksById.ts b/lib/api/controllers/links/bulk/deleteLinksById.ts
index d832f545..2c0951e7 100644
--- a/lib/api/controllers/links/bulk/deleteLinksById.ts
+++ b/lib/api/controllers/links/bulk/deleteLinksById.ts
@@ -47,7 +47,7 @@ export default async function deleteLinksById(
if (collectionIsAccessible) removeFiles(linkId, collectionIsAccessible.id);
}
- meiliClient?.index("links").deleteDocuments(linkIds);
+ await meiliClient?.index("links").deleteDocuments(linkIds);
return { response: deletedLinks, status: 200 };
}
diff --git a/lib/api/controllers/links/linkId/deleteLinkById.ts b/lib/api/controllers/links/linkId/deleteLinkById.ts
index 5ba48ded..07dbf768 100644
--- a/lib/api/controllers/links/linkId/deleteLinkById.ts
+++ b/lib/api/controllers/links/linkId/deleteLinkById.ts
@@ -27,7 +27,7 @@ export default async function deleteLink(userId: number, linkId: number) {
removeFiles(linkId, collectionIsAccessible.id);
- meiliClient?.index("links").deleteDocument(deleteLink.id);
+ await meiliClient?.index("links").deleteDocument(deleteLink.id);
return { response: deleteLink, status: 200 };
}
diff --git a/lib/api/controllers/migration/importFromHTMLFile.ts b/lib/api/controllers/migration/importFromHTMLFile.ts
index 44330dde..ade69084 100644
--- a/lib/api/controllers/migration/importFromHTMLFile.ts
+++ b/lib/api/controllers/migration/importFromHTMLFile.ts
@@ -1,7 +1,7 @@
import { prisma } from "@/lib/api/db";
import createFolder from "@/lib/api/storage/createFolder";
import { JSDOM } from "jsdom";
-import { decodeHTML, DecodingMode } from "entities";
+import { decodeHTML } from "entities";
import { parse, Node, Element, TextNode } from "himalaya";
import { hasPassedLimit } from "../../verifyCapacity";
@@ -294,5 +294,5 @@ function processNodes(nodes: Node[]) {
}
function decodeEntities(encoded: string | undefined): string {
- return decodeHTML(encoded ?? "", DecodingMode.Attribute);
+ return decodeHTML(encoded ?? "");
}
diff --git a/lib/api/controllers/users/userId/deleteUserById.ts b/lib/api/controllers/users/userId/deleteUserById.ts
index 9340243e..83b2397a 100644
--- a/lib/api/controllers/users/userId/deleteUserById.ts
+++ b/lib/api/controllers/users/userId/deleteUserById.ts
@@ -125,7 +125,7 @@ export default async function deleteUserById(
const linkIds = links.map((link) => link.id);
- meiliClient?.index("links").deleteDocuments(linkIds);
+ await meiliClient?.index("links").deleteDocuments(linkIds);
// Delete links
await prisma.link.deleteMany({