diff --git a/src/app/dashboard/[subdomain]/editor/page.tsx b/src/app/dashboard/[subdomain]/editor/page.tsx index 45a2b91a..b11498bf 100644 --- a/src/app/dashboard/[subdomain]/editor/page.tsx +++ b/src/app/dashboard/[subdomain]/editor/page.tsx @@ -211,12 +211,6 @@ export default function SubdomainEditor() { : { pageId: `${page?.data?.characterId}-${page?.data?.noteId}` }), isPost: isPost, published, - externalUrl: - (values.slug || defaultSlug) && - `${getSiteLink({ - subdomain, - domain: site.data?.metadata?.content?.custom_domain, - })}/${encodeURIComponent(values.slug || defaultSlug)}`, applications: page.data?.metadata?.content?.sources, characterId: site.data?.characterId, cover: values.cover, diff --git a/src/app/dashboard/[subdomain]/import/markdown/page.tsx b/src/app/dashboard/[subdomain]/import/markdown/page.tsx index de9695da..71f15779 100644 --- a/src/app/dashboard/[subdomain]/import/markdown/page.tsx +++ b/src/app/dashboard/[subdomain]/import/markdown/page.tsx @@ -10,7 +10,6 @@ import { DashboardMain } from "~/components/dashboard/DashboardMain" import { ImportPreview } from "~/components/dashboard/ImportPreview" import { Button } from "~/components/ui/Button" import { Input } from "~/components/ui/Input" -import { getSiteLink } from "~/lib/helpers" import { useTranslation } from "~/lib/i18n/client" import { readFiles } from "~/lib/read-files" import { usePostNotes } from "~/queries/page" @@ -57,12 +56,6 @@ export default function ImportMarkdownPage() { }, ], date_published: file.date_published, - external_urls: [ - `${getSiteLink({ - subdomain, - domain: site.data?.metadata?.content?.custom_domain, - })}/${encodeURIComponent(file.slug)}`, - ], } }) setNotes(notes) diff --git a/src/app/dashboard/[subdomain]/import/mirror/page.tsx b/src/app/dashboard/[subdomain]/import/mirror/page.tsx index 03540ebd..08eb12c4 100644 --- a/src/app/dashboard/[subdomain]/import/mirror/page.tsx +++ b/src/app/dashboard/[subdomain]/import/mirror/page.tsx @@ -9,7 +9,6 @@ import { toast } from "react-hot-toast" import { DashboardMain } from "~/components/dashboard/DashboardMain" import { ImportPreview } from "~/components/dashboard/ImportPreview" import { Button } from "~/components/ui/Button" -import { getSiteLink } from "~/lib/helpers" import { useTranslation } from "~/lib/i18n/client" import { useCheckMirror, useGetMirrorXyz, usePostNotes } from "~/queries/page" import { useGetSite } from "~/queries/site" @@ -42,13 +41,7 @@ export default function ImportMarkdownPage() { }, ], date_published: note.date_published, - external_urls: [ - `${getSiteLink({ - subdomain, - domain: site.data?.metadata?.content?.custom_domain, - })}/${encodeURIComponent(note.slug)}`, - ...note.external_urls, - ], + external_urls: [...note.external_urls], })) const handleSubmit = form.handleSubmit(async (values) => { diff --git a/src/components/common/CommentInput.tsx b/src/components/common/CommentInput.tsx index 882bfebf..d57a29c6 100644 --- a/src/components/common/CommentInput.tsx +++ b/src/components/common/CommentInput.tsx @@ -70,7 +70,6 @@ export const CommentInput = ({ if (values.content) { updateComment.mutate({ content: values.content, - externalUrl: window.location.href, characterId: comment.characterId, noteId: comment.noteId, originalCharacterId, @@ -99,7 +98,6 @@ export const CommentInput = ({ characterId, noteId, content: values.content, - externalUrl: window.location.href, originalCharacterId, originalNoteId, }) diff --git a/src/lib/url-composer.ts b/src/lib/url-composer.ts index 6e8e3b59..06e66b4f 100644 --- a/src/lib/url-composer.ts +++ b/src/lib/url-composer.ts @@ -1,7 +1,7 @@ import { ConnectKitProviderProps } from "@crossbell/connect-kit" -import { CSB_XFEED } from "~/lib/env" -import { getNoteSlug, getSiteLink } from "~/lib/helpers" +import { CSB_XFEED, SITE_URL } from "~/lib/env" +import { getSiteLink } from "~/lib/helpers" export const urlComposer: ConnectKitProviderProps["urlComposer"] = { characterUrl: ({ handle }) => getSiteLink({ subdomain: handle }), @@ -13,27 +13,7 @@ export const urlComposer: ConnectKitProviderProps["urlComposer"] = { } if (originalNote.metadata?.content?.sources?.includes("xlog")) { - if (originalNote.metadata?.content?.external_urls?.[0]) { - return ( - originalNote.metadata.content.external_urls[0] + - (originalNote !== note ? `#comments` : "") - ) - } else { - const { character } = originalNote - - if (character) { - return ( - getSiteLink({ - subdomain: character.handle, - }) + - "/" + - getNoteSlug(originalNote) + - (originalNote !== note ? `#comments` : "") - ) - } else { - return "" - } - } + return `${SITE_URL}/api/redirection?characterId=${originalNote.characterId}¬eId=${originalNote.noteId}` } else { return `${CSB_XFEED}/notes/${note.characterId}-${note.noteId}` } diff --git a/src/models/page.model.ts b/src/models/page.model.ts index 79a98421..5b4699a7 100644 --- a/src/models/page.model.ts +++ b/src/models/page.model.ts @@ -56,7 +56,6 @@ export async function createOrUpdatePage( excerpt?: string /** Only needed when creating page */ isPost?: boolean - externalUrl?: string applications?: string[] cover?: { address?: string @@ -93,7 +92,6 @@ export async function createOrUpdatePage( action: input.pageId ? "update" : "add", }, { - ...(input.externalUrl && { related_urls: [input.externalUrl] }), ...(input.pageId && { id: input.pageId }), ...(input.title && { title: input.title }), ...(input.content && { @@ -779,12 +777,10 @@ export async function anonymousComment(input: { export async function updateComment( { content, - externalUrl, characterId, noteId, }: { content: string - externalUrl: string characterId: number noteId: number }, @@ -795,7 +791,6 @@ export async function updateComment( noteId, metadata: { content, - external_urls: [externalUrl], tags: ["comment"], sources: ["xlog"], }, diff --git a/src/queries/page.ts b/src/queries/page.ts index 1bd42856..dc96d863 100644 --- a/src/queries/page.ts +++ b/src/queries/page.ts @@ -297,14 +297,12 @@ export function useCommentPage() { characterId, noteId, content, - externalUrl, originalCharacterId, originalNoteId, }: { characterId: number noteId: number content: string - externalUrl: string originalCharacterId?: number originalNoteId?: number }) => { @@ -316,7 +314,6 @@ export function useCommentPage() { }, metadata: { content, - external_urls: [externalUrl], tags: ["comment"], sources: ["xlog"], },