From cac90524ed39c0755a0d9ae80be7c37df12d1025 Mon Sep 17 00:00:00 2001 From: GoodM4ven Date: Fri, 8 Mar 2024 14:34:56 +0300 Subject: [PATCH] [Enhancement] Accounting for "www." prefix for duplicates --- lib/api/controllers/links/postLink.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/api/controllers/links/postLink.ts b/lib/api/controllers/links/postLink.ts index ec03d2a..e286454 100644 --- a/lib/api/controllers/links/postLink.ts +++ b/lib/api/controllers/links/postLink.ts @@ -116,9 +116,18 @@ export default async function postLink( }); if (user?.preventDuplicateLinks) { + const trimmedUrl = link.url?.trim(); + const wwwPrefix = 'www.'; + const hasWwwPrefix = trimmedUrl?.includes(`://${wwwPrefix}`); + const urlWithoutWww = hasWwwPrefix ? trimmedUrl?.replace(`://${wwwPrefix}`, '://') : trimmedUrl; + const urlWithWww = hasWwwPrefix ? trimmedUrl : trimmedUrl?.replace('://', `://${wwwPrefix}`); + const existingLink = await prisma.link.findFirst({ where: { - url: link.url?.trim(), + OR: [ + { url: trimmedUrl }, + { url: hasWwwPrefix ? urlWithoutWww : urlWithWww }, // Toggling "www." + ], collection: { ownerId: userId, },