xwx.moe/el.xwx.moe
xwx.moe/ el.xwx.moe
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

Merge pull request #507 from GoodM4ven/missing-duplicate-checks 

[Enhancement] Accounting for "www." prefix for duplicates
This commit is contained in:
Daniel 2024-04-15 08:09:10 +03:30 committed by GitHub
parent ece09c6f3b baadd6c06b
commit a89274fc03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/api/controllers/links/postLink.ts
View File

@ -119,15 +119,24 @@ export default async function postLink(
}); });
if (user?.preventDuplicateLinks) { if (user?.preventDuplicateLinks) {
const url = link.url?.trim().replace(/\/+$/, ""); // trim and remove trailing slashes from the URL
const hasWwwPrefix = url?.includes(`://www.`);
const urlWithoutWww = hasWwwPrefix ? url?.replace(`://www.`, "://") : url;
const urlWithWww = hasWwwPrefix ? url : url?.replace("://", `://www.`);
console.log(url, urlWithoutWww, urlWithWww);
const existingLink = await prisma.link.findFirst({ const existingLink = await prisma.link.findFirst({
where: { where: {
url: link.url?.trim(), OR: [{ url: urlWithWww }, { url: urlWithoutWww }],
collection: { collection: {
ownerId: userId, ownerId: userId,
}, },
}, },
}); });
console.log(url, urlWithoutWww, urlWithWww, "DONE!");
if (existingLink) if (existingLink)
return { return {
response: "Link already exists", response: "Link already exists",
@ -174,7 +183,7 @@ export default async function postLink(
const newLink = await prisma.link.create({ const newLink = await prisma.link.create({
data: { data: {
url: link.url?.trim() || null, url: link.url?.trim().replace(/\/+$/, "") || null,
name: link.name, name: link.name,
description, description,
type: linkType, type: linkType,