format

components/LinkViews/Layouts/ListView.tsx

@@ -3,7 +3,7 @@ import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 
 export default function ListView({
   links,
-  showCheckbox = true
+  showCheckbox = true,
 }: {
   links: LinkIncludingShortenedCollectionAndTags[];
   showCheckbox?: boolean;

components/LinkViews/LinkCard.tsx

@@ -37,7 +37,9 @@ export default function LinkCard({
 
   const { links, getLink, setSelectedLinks, selectedLinks } = useLinkStore();
 
-  const handleCheckboxClick = (link: LinkIncludingShortenedCollectionAndTags) => {
+  const handleCheckboxClick = (
+    link: LinkIncludingShortenedCollectionAndTags
+  ) => {
     if (selectedLinks.includes(link)) {
       setSelectedLinks(selectedLinks.filter((e) => e !== link));
     } else {
@@ -99,14 +101,17 @@ export default function LinkCard({
       ref={ref}
       className="border border-solid border-neutral-content bg-base-200 shadow-md hover:shadow-none duration-100 rounded-2xl relative"
     >
-      {showCheckbox && (permissions === true || permissions?.canCreate || permissions?.canDelete) &&
+      {showCheckbox &&
+        (permissions === true ||
+          permissions?.canCreate ||
+          permissions?.canDelete) && (
           <input
             type="checkbox"
             className="checkbox checkbox-primary my-auto ml-3 mt-3 absolute z-20 bg-white dark:bg-base-200"
             checked={selectedLinks.includes(link)}
             onChange={() => handleCheckboxClick(link)}
           />
-      }
+        )}
       <Link
         href={generateLinkHref(link, account)}
         target="_blank"

components/LinkViews/LinkList.tsx

@@ -33,7 +33,9 @@ export default function LinkCardCompact({
   const { account } = useAccountStore();
   const { links, setSelectedLinks, selectedLinks } = useLinkStore();
 
-  const handleCheckboxClick = (link: LinkIncludingShortenedCollectionAndTags) => {
+  const handleCheckboxClick = (
+    link: LinkIncludingShortenedCollectionAndTags
+  ) => {
     if (selectedLinks.includes(link)) {
       setSelectedLinks(selectedLinks.filter((e) => e !== link));
     } else {
@@ -71,17 +73,21 @@ export default function LinkCardCompact({
   return (
     <>
       <div
-        className={`border-neutral-content relative items-center flex ${!showInfo && !isPWA() ? "hover:bg-base-300 p-3" : "py-3"
+        className={`border-neutral-content relative items-center flex ${
+          !showInfo && !isPWA() ? "hover:bg-base-300 p-3" : "py-3"
         } duration-200 rounded-lg`}
       >
-        {showCheckbox && (permissions === true || permissions?.canCreate || permissions?.canDelete) &&
+        {showCheckbox &&
+          (permissions === true ||
+            permissions?.canCreate ||
+            permissions?.canDelete) && (
             <input
               type="checkbox"
               className="checkbox checkbox-primary my-auto mr-2"
               checked={selectedLinks.includes(link)}
               onChange={() => handleCheckboxClick(link)}
             />
-        }
+          )}
         <Link
           href={generateLinkHref(link, account)}
           target="_blank"

components/ModalContent/BulkDeleteLinksModal.tsx

@@ -11,13 +11,24 @@ export default function BulkDeleteLinksModal({ onClose }: Props) {
   const { selectedLinks, setSelectedLinks, deleteLinksById } = useLinkStore();
 
   const deleteLink = async () => {
-		const load = toast.loading(`Deleting ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : ""}...`);
+    const load = toast.loading(
+      `Deleting ${selectedLinks.length} Link${
+        selectedLinks.length > 1 ? "s" : ""
+      }...`
+    );
 
-		const response = await deleteLinksById(selectedLinks.map(link => link.id as number));
+    const response = await deleteLinksById(
+      selectedLinks.map((link) => link.id as number)
+    );
 
     toast.dismiss(load);
 
-		response.ok && toast.success(`Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : ""}`);
+    response.ok &&
+      toast.success(
+        `Deleted ${selectedLinks.length} Link${
+          selectedLinks.length > 1 ? "s" : ""
+        }`
+      );
 
     setSelectedLinks([]);
     onClose();
@@ -25,19 +36,17 @@ export default function BulkDeleteLinksModal({ onClose }: Props) {
 
   return (
     <Modal toggleModal={onClose}>
-			<p className="text-xl font-thin text-red-500">Delete {selectedLinks.length} Link{selectedLinks.length > 1 ? "s" : ""}</p>
+      <p className="text-xl font-thin text-red-500">
+        Delete {selectedLinks.length} Link{selectedLinks.length > 1 ? "s" : ""}
+      </p>
 
       <div className="divider mb-3 mt-1"></div>
 
       <div className="flex flex-col gap-3">
         {selectedLinks.length > 1 ? (
-					<p>
+          <p>Are you sure you want to delete {selectedLinks.length} links?</p>
-						Are you sure you want to delete {selectedLinks.length} links?
-					</p>
         ) : (
-					<p>
+          <p>Are you sure you want to delete this link?</p>
-						Are you sure you want to delete this link?
-					</p>
         )}
 
         <div role="alert" className="alert alert-warning">

components/ModalContent/BulkEditLinksModal.tsx

@@ -13,7 +13,9 @@ type Props = {
 export default function BulkEditLinksModal({ onClose }: Props) {
   const { updateLinks, selectedLinks, setSelectedLinks } = useLinkStore();
   const [submitLoader, setSubmitLoader] = useState(false);
-	const [updatedValues, setUpdatedValues] = useState<Pick<LinkIncludingShortenedCollectionAndTags, "tags" | "collectionId">>({ tags: [] });
+  const [updatedValues, setUpdatedValues] = useState<
+    Pick<LinkIncludingShortenedCollectionAndTags, "tags" | "collectionId">
+  >({ tags: [] });
 
   const setCollection = (e: any) => {
     const collectionId = e?.value || null;

components/ModalContent/NewLinkModal.tsx

@@ -197,7 +197,8 @@ export default function NewLinkModal({ onClose }: Props) {
             {optionsExpanded ? "Hide" : "More"} Options
           </p>
           <i
-            className={`${optionsExpanded ? "bi-chevron-up" : "bi-chevron-down"
+            className={`${
+              optionsExpanded ? "bi-chevron-up" : "bi-chevron-down"
             }`}
           ></i>
         </div>

lib/api/archiveHandler.ts

@@ -23,8 +23,7 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
   const browser = await chromium.launch();
   const context = await browser.newContext({
     ...devices["Desktop Chrome"],
-    ignoreHTTPSErrors:
+    ignoreHTTPSErrors: process.env.IGNORE_HTTPS_ERRORS === "true",
-      process.env.IGNORE_HTTPS_ERRORS === "true",
   });
   const page = await context.newPage();
 

lib/api/controllers/links/bulk/deleteLinksById.ts

@@ -3,7 +3,10 @@ import { UsersAndCollections } from "@prisma/client";
 import getPermission from "@/lib/api/getPermission";
 import removeFile from "@/lib/api/storage/removeFile";
 
-export default async function deleteLinksById(userId: number, linkIds: number[]) {
+export default async function deleteLinksById(
+  userId: number,
+  linkIds: number[]
+) {
   if (!linkIds || linkIds.length === 0) {
     return { response: "Please choose valid links.", status: 401 };
   }

lib/api/controllers/links/bulk/updateLinks.ts

@@ -1,7 +1,14 @@
 import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 import updateLinkById from "../linkId/updateLinkById";
 
-export default async function updateLinks(userId: number, links: LinkIncludingShortenedCollectionAndTags[], newData: Pick<LinkIncludingShortenedCollectionAndTags, "tags" | "collectionId">) {
+export default async function updateLinks(
+  userId: number,
+  links: LinkIncludingShortenedCollectionAndTags[],
+  newData: Pick<
+    LinkIncludingShortenedCollectionAndTags,
+    "tags" | "collectionId"
+  >
+) {
   let allUpdatesSuccessful = true;
 
   // Have to use a loop here rather than updateMany, see the following:
@@ -13,10 +20,14 @@ export default async function updateLinks(userId: number, links: LinkIncludingSh
       collection: {
         ...link.collection,
         id: newData.collectionId ?? link.collection.id,
-			}
+      },
     };
 
-		const updatedLink = await updateLinkById(userId, link.id as number, updatedData);
+    const updatedLink = await updateLinkById(
+      userId,
+      link.id as number,
+      updatedData
+    );
 
     if (updatedLink.status !== 200) {
       allUpdatesSuccessful = false;

lib/client/generateLinkHref.ts

@@ -1,27 +1,39 @@
-import { AccountSettings, ArchivedFormat, LinkIncludingShortenedCollectionAndTags } from "@/types/global";
+import {
+  AccountSettings,
+  ArchivedFormat,
+  LinkIncludingShortenedCollectionAndTags,
+} from "@/types/global";
 import { LinksRouteTo } from "@prisma/client";
-import { pdfAvailable, readabilityAvailable, screenshotAvailable } from "../shared/getArchiveValidity";
+import {
-
+  pdfAvailable,
-export const generateLinkHref = (link: LinkIncludingShortenedCollectionAndTags, account: AccountSettings): string => {
+  readabilityAvailable,
+  screenshotAvailable,
+} from "../shared/getArchiveValidity";
 
+export const generateLinkHref = (
+  link: LinkIncludingShortenedCollectionAndTags,
+  account: AccountSettings
+): string => {
   // Return the links href based on the account's preference
   // If the user's preference is not available, return the original link
   switch (account.linksRouteTo) {
     case LinksRouteTo.ORIGINAL:
-			return link.url || '';
+      return link.url || "";
     case LinksRouteTo.PDF:
-			if (!pdfAvailable(link)) return link.url || '';
+      if (!pdfAvailable(link)) return link.url || "";
 
       return `/preserved/${link?.id}?format=${ArchivedFormat.pdf}`;
     case LinksRouteTo.READABLE:
-			if (!readabilityAvailable(link)) return link.url || '';
+      if (!readabilityAvailable(link)) return link.url || "";
 
       return `/preserved/${link?.id}?format=${ArchivedFormat.readability}`;
     case LinksRouteTo.SCREENSHOT:
-			if (!screenshotAvailable(link)) return link.url || '';
+      if (!screenshotAvailable(link)) return link.url || "";
 
-			return `/preserved/${link?.id}?format=${link?.image?.endsWith("png") ? ArchivedFormat.png : ArchivedFormat.jpeg}`;
+      return `/preserved/${link?.id}?format=${
+        link?.image?.endsWith("png") ? ArchivedFormat.png : ArchivedFormat.jpeg
+      }`;
     default:
-			return link.url || '';
+      return link.url || "";
   }
 };

lib/shared/getArchiveValidity.ts

@@ -1,6 +1,8 @@
 import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 
-export function screenshotAvailable(link: LinkIncludingShortenedCollectionAndTags) {
+export function screenshotAvailable(
+  link: LinkIncludingShortenedCollectionAndTags
+) {
   return (
     link &&
     link.image &&
@@ -15,7 +17,9 @@ export function pdfAvailable(link: LinkIncludingShortenedCollectionAndTags) {
   );
 }
 
-export function readabilityAvailable(link: LinkIncludingShortenedCollectionAndTags) {
+export function readabilityAvailable(
+  link: LinkIncludingShortenedCollectionAndTags
+) {
   return (
     link &&
     link.readable &&

pages/api/v1/links/index.ts

@@ -43,7 +43,11 @@ export default async function links(req: NextApiRequest, res: NextApiResponse) {
       response: newlink.response,
     });
   } else if (req.method === "PUT") {
-    const updated = await updateLinks(user.id, req.body.links, req.body.newData);
+    const updated = await updateLinks(
+      user.id,
+      req.body.links,
+      req.body.newData
+    );
     return res.status(updated.status).json({
       response: updated.response,
     });

pages/collections/[id].tsx

@@ -34,7 +34,8 @@ export default function Index() {
 
   const router = useRouter();
 
-  const { links, selectedLinks, setSelectedLinks, deleteLinksById } = useLinkStore();
+  const { links, selectedLinks, setSelectedLinks, deleteLinksById } =
+    useLinkStore();
   const { collections } = useCollectionStore();
 
   const [sortBy, setSortBy] = useState<Sort>(Sort.DateNewestFirst);
@@ -96,7 +97,6 @@ export default function Index() {
   const [bulkDeleteLinksModal, setBulkDeleteLinksModal] = useState(false);
   const [bulkEditLinksModal, setBulkEditLinksModal] = useState(false);
 
-
   const [viewMode, setViewMode] = useState<string>(
     localStorage.getItem("viewMode") || ViewMode.Card
   );
@@ -119,13 +119,24 @@ export default function Index() {
   };
 
   const bulkDeleteLinks = async () => {
-    const load = toast.loading(`Deleting ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : ""}...`);
+    const load = toast.loading(
+      `Deleting ${selectedLinks.length} Link${
+        selectedLinks.length > 1 ? "s" : ""
+      }...`
+    );
 
-    const response = await deleteLinksById(selectedLinks.map((link) => link.id as number));
+    const response = await deleteLinksById(
+      selectedLinks.map((link) => link.id as number)
+    );
 
     toast.dismiss(load);
 
-    response.ok && toast.success(`Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : ""}!`);
+    response.ok &&
+      toast.success(
+        `Deleted ${selectedLinks.length} Link${
+          selectedLinks.length > 1 ? "s" : ""
+        }!`
+      );
   };
 
   return (
@@ -133,7 +144,8 @@ export default function Index() {
       <div
         className="h-[60rem] p-5 flex gap-3 flex-col"
         style={{
-          backgroundImage: `linear-gradient(${activeCollection?.color}20 10%, ${settings.theme === "dark" ? "#262626" : "#f3f4f6"
+          backgroundImage: `linear-gradient(${activeCollection?.color}20 10%, ${
+            settings.theme === "dark" ? "#262626" : "#f3f4f6"
           } 13rem, ${settings.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,
         }}
       >
@@ -312,29 +324,42 @@ export default function Index() {
                 type="checkbox"
                 className="checkbox checkbox-primary"
                 onChange={() => handleSelectAll()}
-                checked={selectedLinks.length === links.length && links.length > 0}
+                checked={
+                  selectedLinks.length === links.length && links.length > 0
+                }
               />
               {selectedLinks.length > 0 && (
                 <span>
-                  {selectedLinks.length} {selectedLinks.length === 1 ? 'link' : 'links'} selected
+                  {selectedLinks.length}{" "}
+                  {selectedLinks.length === 1 ? "link" : "links"} selected
                 </span>
               )}
             </div>
           )}
           <div className="flex gap-3">
-            {selectedLinks.length > 0 && (permissions === true || permissions?.canUpdate) &&
+            {selectedLinks.length > 0 &&
-              <button onClick={() => setBulkEditLinksModal(true)} className="btn btn-sm btn-accent dark:border-violet-400 text-white w-fit ml-auto">
+              (permissions === true || permissions?.canUpdate) && (
+                <button
+                  onClick={() => setBulkEditLinksModal(true)}
+                  className="btn btn-sm btn-accent dark:border-violet-400 text-white w-fit ml-auto"
+                >
                   Edit
                 </button>
-            }
+              )}
-            {selectedLinks.length > 0 && (permissions === true || permissions?.canDelete) &&
+            {selectedLinks.length > 0 &&
-              <button onClick={(e) => {
+              (permissions === true || permissions?.canDelete) && (
+                <button
+                  onClick={(e) => {
                     (document?.activeElement as HTMLElement)?.blur();
-                e.shiftKey ? bulkDeleteLinks() : setBulkDeleteLinksModal(true);
+                    e.shiftKey
-              }} className="btn btn-sm bg-red-400 border-red-400 hover:border-red-500 hover:bg-red-500 text-white w-fit ml-auto">
+                      ? bulkDeleteLinks()
+                      : setBulkDeleteLinksModal(true);
+                  }}
+                  className="btn btn-sm bg-red-400 border-red-400 hover:border-red-500 hover:bg-red-500 text-white w-fit ml-auto"
+                >
                   Delete
                 </button>
-            }
+              )}
           </div>
         </div>
 
@@ -375,7 +400,9 @@ export default function Index() {
             />
           )}
           {bulkDeleteLinksModal && (
-            <BulkDeleteLinksModal onClose={() => setBulkDeleteLinksModal(false)} />
+            <BulkDeleteLinksModal
+              onClose={() => setBulkDeleteLinksModal(false)}
+            />
           )}
           {bulkEditLinksModal && (
             <BulkEditLinksModal onClose={() => setBulkEditLinksModal(false)} />

pages/dashboard.tsx

@@ -168,7 +168,10 @@ export default function Dashboard() {
         >
           {links[0] ? (
             <div className="w-full">
-              <LinkComponent links={links.slice(0, showLinks)} showCheckbox={false} />
+              <LinkComponent
+                links={links.slice(0, showLinks)}
+                showCheckbox={false}
+              />
             </div>
           ) : (
             <div

pages/tags/[id].tsx

@@ -145,7 +145,8 @@ export default function Index() {
                   </p>
                   <div className="relative">
                     <div
-                      className={`dropdown dropdown-bottom font-normal ${activeTag?.name.length && activeTag?.name.length > 8
+                      className={`dropdown dropdown-bottom font-normal ${
+                        activeTag?.name.length && activeTag?.name.length > 8
                           ? "dropdown-end"
                           : ""
                       }`}

store/links.ts

@@ -23,7 +23,13 @@ type LinkStore = {
   updateLink: (
     link: LinkIncludingShortenedCollectionAndTags
   ) => Promise<ResponseObject>;
-  updateLinks: (links: LinkIncludingShortenedCollectionAndTags[], newData: Pick<LinkIncludingShortenedCollectionAndTags, "tags" | "collectionId">) => Promise<ResponseObject>;
+  updateLinks: (
+    links: LinkIncludingShortenedCollectionAndTags[],
+    newData: Pick<
+      LinkIncludingShortenedCollectionAndTags,
+      "tags" | "collectionId"
+    >
+  ) => Promise<ResponseObject>;
   removeLink: (linkId: number) => Promise<ResponseObject>;
   deleteLinksById: (linkIds: number[]) => Promise<ResponseObject>;
   resetLinks: () => void;
@@ -142,9 +148,7 @@ const useLinkStore = create<LinkStore>()((set) => ({
     if (response.ok) {
       set((state) => ({
         links: state.links.map((e) =>
-          links.some((link) => link.id === e.id)
+          links.some((link) => link.id === e.id) ? { ...e, ...newData } : e
-            ? { ...e, ...newData }
-            : e
         ),
       }));
       useTagStore.getState().setTags();