Merge pull request #459 from IsaacWise06/issue/367

feat(links): Allow users to choose what happens when they click a link

lib/api/controllers/users/userId/updateUserById.ts

@@ -97,18 +97,18 @@ export default async function updateUserById(
         id: { not: userId },
         OR: emailEnabled
           ? [
-              {
-                username: data.username.toLowerCase(),
-              },
-              {
-                email: data.email?.toLowerCase(),
-              },
-            ]
+            {
+              username: data.username.toLowerCase(),
+            },
+            {
+              email: data.email?.toLowerCase(),
+            },
+          ]
           : [
-              {
-                username: data.username.toLowerCase(),
-              },
-            ],
+            {
+              username: data.username.toLowerCase(),
+            },
+          ],
       },
     });
 
@@ -186,6 +186,7 @@ export default async function updateUserById(
       archiveAsScreenshot: data.archiveAsScreenshot,
       archiveAsPDF: data.archiveAsPDF,
       archiveAsWaybackMachine: data.archiveAsWaybackMachine,
+      linksRouteTo: data.linksRouteTo,
       password:
         data.newPassword && data.newPassword !== ""
           ? newHashedPassword

lib/client/generateLinkHref.ts

@@ -0,0 +1,29 @@
+import useAccountStore from "@/store/account";
+import { ArchivedFormat, LinkIncludingShortenedCollectionAndTags } from "@/types/global";
+import { LinksRouteTo } from "@prisma/client";
+import { pdfAvailable, readabilityAvailable, screenshotAvailable } from "../shared/getArchiveValidity";
+
+export const generateLinkHref = (link: LinkIncludingShortenedCollectionAndTags): string => {
+	const { account } = useAccountStore();
+
+	// 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 || '';
+		case LinksRouteTo.PDF:
+			if (!pdfAvailable(link)) return link.url || '';
+
+			return `/preserved/${link?.id}?format=${ArchivedFormat.pdf}`;
+		case LinksRouteTo.READABLE:
+			if (!readabilityAvailable(link)) return link.url || '';
+
+			return `/preserved/${link?.id}?format=${ArchivedFormat.readability}`;
+		case LinksRouteTo.SCREENSHOT:
+			if (!screenshotAvailable(link)) return link.url || '';
+
+			return `/preserved/${link?.id}?format=${link?.image?.endsWith("png") ? ArchivedFormat.png : ArchivedFormat.jpeg}`;
+		default:
+			return link.url || '';
+	}
+};

lib/shared/getArchiveValidity.ts

@@ -1,4 +1,6 @@
-export function screenshotAvailable(link: any) {
+import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
+
+export function screenshotAvailable(link: LinkIncludingShortenedCollectionAndTags) {
   return (
     link &&
     link.image &&
@@ -7,13 +9,13 @@ export function screenshotAvailable(link: any) {
   );
 }
 
-export function pdfAvailable(link: any) {
+export function pdfAvailable(link: LinkIncludingShortenedCollectionAndTags) {
   return (
     link && link.pdf && link.pdf !== "pending" && link.pdf !== "unavailable"
   );
 }
 
-export function readabilityAvailable(link: any) {
+export function readabilityAvailable(link: LinkIncludingShortenedCollectionAndTags) {
   return (
     link &&
     link.readable &&