Merge branch 'dev' of https://github.com/linkwarden/linkwarden into dev

lib/api/controllers/migration/importFromHTMLFile.ts

@@ -63,7 +63,8 @@ async function processBookmarks(
         ) as Element;
 
         if (collectionName) {
-          const collectionNameContent = (collectionName.children[0] as TextNode)?.content;
+          const collectionNameContent = (collectionName.children[0] as TextNode)
+            ?.content;
           if (collectionNameContent) {
             collectionId = await createCollection(
               userId,
@@ -274,4 +275,3 @@ function processNodes(nodes: Node[]) {
   nodes.forEach(findAndProcessDL);
   return nodes;
 }
-

lib/client/getPublicCollectionData.ts

@@ -9,6 +9,9 @@ const getPublicCollectionData = async (
 ) => {
   const res = await fetch("/api/v1/public/collections/" + collectionId);
 
+  if (res.status === 400)
+    return { response: "Collection not found.", status: 400 };
+
   const data = await res.json();
 
   setData(data.response);

pages/public/collections/[id].tsx

@@ -71,7 +71,13 @@ export default function PublicCollections() {
 
   useEffect(() => {
     if (router.query.id) {
-      getPublicCollectionData(Number(router.query.id), setCollection);
+      getPublicCollectionData(Number(router.query.id), setCollection).then(
+        (res) => {
+          if (res.status === 400) {
+            router.push("/dashboard");
+          }
+        }
+      );
     }
   }, [collections]);