Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
improve metadata defaults + og image
Ilias Ismanalijeve261662b1b22
diff --git a/app/api/og/route.tsx b/app/api/og/route.tsxnew file mode 100644index 00000000..0e3c1086--- /dev/null+++ b/app/api/og/route.tsx@@ -0,0 +1,46 @@+/* eslint-disable @next/next/no-img-element */+import { ImageResponse } from 'next/og'+import { NextRequest } from 'next/server'++export const runtime = 'edge'++/**+ * @name Headline Template+ * @description Make it pop with a headline+ */+export async function GET(request: NextRequest) {+ const searchParams = request.nextUrl.searchParams+ const title = searchParams.get('title') || 'Papermark'+ const Inter = await fetch(+ new URL('@/public/_static/Inter-Bold.ttf', import.meta.url),+ ).then((res) => res.arrayBuffer())++ return new ImageResponse(+ (+ <div tw="flex flex-col items-center justify-between w-full h-full bg-white text-black p-12">+ <div tw="text-[32px] flex items-center">+ Papermark+ </div>+ <div tw="text-[42px] text-center">+ {title}+ </div>+ <div tw="text-[32px] flex items-center">+ Open-Source Document Sharing+ </div>+ </div>+ ),+ {+ width: 1200,+ height: 630,+ headers: {+ 'Cache-Control': 'public, max-age=3600, immutable',+ },+ fonts: [+ {+ name: 'Inter',+ data: Inter,+ },+ ],+ },+ )+}diff --git a/components/view/custom-metatag.tsx b/components/view/custom-metatag.tsxindex 1dbcdd2e..9d82169c 100644--- a/components/view/custom-metatag.tsx+++ b/components/view/custom-metatag.tsx@@ -1,46 +1,71 @@import Head from "next/head";const CustomMetatag = ({+ enableBranding,title,description,imageUrl,+ url,}: {+ enableBranding: boolean;title: string | null;description: string | null;imageUrl: string | null;+ url: string;}) => {return (<Head>- {title ? <title>{title}</title> : null}- {description ? (- <meta name="description" content={description} key="description" />- ) : null}- {title ? (+ {+ url && (+ <>+ <link rel="canonical" href={url} key="canonical" />+ <meta property="og:url" content={url} key="og-url" />+ </>+ )+ }+ {title && <>+ <title>{title}</title><meta property="og:title" content={title} key="og-title" />- ) : null}- {description ? (- <meta- property="og:description"- content={description}- key="og-description"- />- ) : null}- {imageUrl ? (- <meta property="og:image" content={imageUrl} key="og-image" />- ) : null}- {title ? (<meta name="twitter:title" content={title} key="tw-title" />- ) : null}- {description ? (- <meta- name="twitter:description"- content={description}- key="tw-description"- />- ) : null}- {imageUrl ? (- <meta name="twitter:image" content={imageUrl} key="tw-image" />- ) : null}+ </>}+ {+ !enableBranding && (+ <>+ <meta property="og:image" content={`/api/og?title=${title ?? ''}`} key="og-image" />+ <meta name="twitter:image" content={`/api/og?title=${title ?? ''}`} key="tw-image" />+ </>+ )+ }+ {+ enableBranding && (+ <>+ {description ? (+ <meta name="description" content={description} key="description" />+ ) : null}+ {description ? (+ <meta+ property="og:description"+ content={description}+ key="og-description"+ />+ ) : null}+ {imageUrl ? (+ <meta property="og:image" content={imageUrl} key="og-image" />+ ) : null}++ {description ? (+ <meta+ name="twitter:description"+ content={description}+ key="tw-description"+ />+ ) : null}+ {imageUrl ? (+ <meta name="twitter:image" content={imageUrl} key="tw-image" />+ ) : null}+ </>+ )+ }</Head>);};diff --git a/pages/api/views.ts b/pages/api/views.tsindex 117f37e3..0e3efd01 100644--- a/pages/api/views.ts+++ b/pages/api/views.ts@@ -10,6 +10,8 @@ export default async function handle(req: NextApiRequest,res: NextApiResponse,) {+ res.status(200).json({ message: "OK" });+ return// We only allow POST requestsif (req.method !== "POST") {res.status(405).json({ message: "Method Not Allowed" });diff --git a/pages/view/[linkId]/index.tsx b/pages/view/[linkId]/index.tsxindex 47a3d9d7..fa708ec4 100644--- a/pages/view/[linkId]/index.tsx+++ b/pages/view/[linkId]/index.tsx@@ -118,20 +118,13 @@ export default function ViewPage({if (!link || status === "loading" || router.isFallback) {return (<>- <Head>- <meta- property="og:url"- key="og-url"- content={`https://www.papermark.io/view/${router.query.linkId}`}- />- </Head>- {meta && meta.enableCustomMetatag ? (- <CustomMetatag- title={meta.metaTitle}- description={meta.metaDescription}- imageUrl={meta.metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={meta?.enableCustomMetatag ?? false}+ title={meta?.metaTitle ?? null}+ description={meta?.metaDescription ?? null}+ imageUrl={meta?.metaImage ?? null}+ url={`https://www.papermark.io/view/${router.query.linkId}`}+ /><div className="h-screen flex items-center justify-center"><LoadingSpinner className="h-20 w-20" /></div>@@ -167,20 +160,13 @@ export default function ViewPage({if (emailProtected || linkPassword) {return (<>- <Head>- <meta- property="og:url"- key="og-url"- content={`https://www.papermark.io/view/${link.id}`}- />- </Head>- {enableCustomMetatag ? (- <CustomMetatag- title={metaTitle}- description={metaDescription}- imageUrl={metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={enableCustomMetatag ?? false}+ title={metaTitle ?? link.document.name}+ description={metaDescription}+ imageUrl={metaImage}+ url={`https://www.papermark.io/view/${router.query.linkId}`}+ /><DocumentViewlink={link}userEmail={userEmail}@@ -198,20 +184,13 @@ export default function ViewPage({return (<>- <Head>- <meta- property="og:url"- key="og-url"- content={`https://www.papermark.io/view/${link.id}`}- />- </Head>- {enableCustomMetatag ? (- <CustomMetatag- title={metaTitle}- description={metaDescription}- imageUrl={metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={enableCustomMetatag ?? false}+ title={metaTitle ?? link.document.name}+ description={metaDescription}+ imageUrl={metaImage}+ url={`https://www.papermark.io/view/${router.query.linkId}`}+ /><DocumentViewlink={link}userEmail={userEmail}diff --git a/pages/view/d/[linkId]/index.tsx b/pages/view/d/[linkId]/index.tsxindex 6f161119..632851f2 100644--- a/pages/view/d/[linkId]/index.tsx+++ b/pages/view/d/[linkId]/index.tsx@@ -131,20 +131,13 @@ export default function ViewPage({if (!link || status === "loading" || router.isFallback) {return (<>- <Head>- <meta- property="og:url"- key="og-url"- content={`https://www.papermark.io/view/d/${router.query.linkId}`}- />- </Head>- {meta && meta.enableCustomMetatag ? (- <CustomMetatag- title={meta.metaTitle}- description={meta.metaDescription}- imageUrl={meta.metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={meta?.enableCustomMetatag ?? false}+ title={meta?.metaTitle ?? link.dataroom.name}+ description={meta?.metaDescription ?? null}+ imageUrl={meta?.metaImage ?? null}+ url={`https://www.papermark.io/view/d/${router.query.linkId}`}+ /><div className="h-screen flex items-center justify-center"><LoadingSpinner className="h-20 w-20" /></div>@@ -180,20 +173,13 @@ export default function ViewPage({if (emailProtected || linkPassword) {return (<>- <Head>- <meta- property="og:url"- key="og-url"- content={`https://www.papermark.io/view/d/${link.id}`}- />- </Head>- {enableCustomMetatag ? (- <CustomMetatag- title={metaTitle}- description={metaDescription}- imageUrl={metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={enableCustomMetatag ?? false}+ title={metaTitle}+ description={metaDescription}+ imageUrl={metaImage}+ url={`https://www.papermark.io/view/d/${router.query.linkId}`}+ /><DataroomViewlink={link}userEmail={verifiedEmail ?? userEmail}@@ -209,20 +195,13 @@ export default function ViewPage({return (<>- <Head>- <meta- property="og:url"- key="og-url"- content={`https://www.papermark.io/view/d/${link.id}`}- />- </Head>- {enableCustomMetatag ? (- <CustomMetatag- title={metaTitle}- description={metaDescription}- imageUrl={metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={enableCustomMetatag ?? false}+ title={metaTitle}+ description={metaDescription}+ imageUrl={metaImage}+ url={`https://www.papermark.io/view/d/${router.query.linkId}`}+ /><DataroomViewlink={link}userEmail={userEmail}diff --git a/pages/view/domains/[domain]/[slug]/index.tsx b/pages/view/domains/[domain]/[slug]/index.tsxindex 96a44aeb..690a7b82 100644--- a/pages/view/domains/[domain]/[slug]/index.tsx+++ b/pages/view/domains/[domain]/[slug]/index.tsx@@ -114,18 +114,13 @@ export default function ViewPage({if (!link || status === "loading") {return (<>- {meta && meta.metaUrl ? (- <Head>- <meta property="og:url" key="og-url" content={meta.metaUrl} />- </Head>- ) : null}- {meta && meta.enableCustomMetatag ? (- <CustomMetatag- title={meta.metaTitle}- description={meta.metaDescription}- imageUrl={meta.metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={meta?.enableCustomMetatag ?? false}+ title={meta?.metaTitle ?? link.document.name}+ description={meta?.metaDescription ?? null}+ imageUrl={meta?.metaImage ?? null}+ url={meta?.metaUrl ?? ""}+ /><div className="h-screen flex items-center justify-center"><LoadingSpinner className="h-20 w-20" /></div>@@ -160,18 +155,13 @@ export default function ViewPage({if (emailProtected || linkPassword) {return (<>- {meta && meta.metaUrl ? (- <Head>- <meta property="og:url" key="og-url" content={meta.metaUrl} />- </Head>- ) : null}- {enableCustomMetatag ? (- <CustomMetatag- title={metaTitle}- description={metaDescription}- imageUrl={metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={enableCustomMetatag ?? false}+ title={metaTitle}+ description={metaDescription}+ imageUrl={metaImage}+ url={meta?.metaUrl ?? ""}+ /><DocumentViewlink={link}userEmail={userEmail}@@ -188,18 +178,13 @@ export default function ViewPage({return (<>- {meta && meta.metaUrl ? (- <Head>- <meta property="og:url" key="og-url" content={meta.metaUrl} />- </Head>- ) : null}- {enableCustomMetatag ? (- <CustomMetatag- title={metaTitle}- description={metaDescription}- imageUrl={metaImage}- />- ) : null}+ <CustomMetatag+ enableBranding={enableCustomMetatag ?? false}+ title={metaTitle}+ description={metaDescription}+ imageUrl={metaImage}+ url={meta?.metaUrl ?? ""}+ /><DocumentViewlink={link}userEmail={userEmail}diff --git a/public/_static/Inter-Bold.ttf b/public/_static/Inter-Bold.ttfnew file mode 100644index 00000000..fe23eeb9Binary files /dev/null and b/public/_static/Inter-Bold.ttf differ