Updated pixel/link endpoints. Added name to rawQuery.

src/app/(collect)/p/[slug]/route.ts

@@ -1,6 +1,10 @@
+export const dynamic = 'force-dynamic';
+
 import { NextResponse } from 'next/server';
 import { notFound } from '@/lib/response';
+import redis from '@/lib/redis';
 import { findPixel } from '@/queries/prisma';
+import { Pixel } from '@/generated/prisma/client';
 import { POST } from '@/app/api/send/route';
 
 const image = Buffer.from('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw', 'base64');
@@ -8,14 +12,34 @@ const image = Buffer.from('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICR
 export async function GET(request: Request, { params }: { params: Promise<{ slug: string }> }) {
   const { slug } = await params;
 
-  const pixel = await findPixel({
-    where: {
-      slug,
-    },
-  });
+  let pixel: Pixel;
 
-  if (!pixel) {
-    return notFound();
+  if (redis.enabled) {
+    pixel = await redis.client.fetch(
+      `pixel:${slug}`,
+      async () => {
+        return findPixel({
+          where: {
+            slug,
+          },
+        });
+      },
+      86400,
+    );
+
+    if (!pixel) {
+      return notFound();
+    }
+  } else {
+    pixel = await findPixel({
+      where: {
+        slug,
+      },
+    });
+
+    if (!pixel) {
+      return notFound();
+    }
   }
 
   const payload = {
@@ -23,7 +47,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
     payload: {
       pixel: pixel.id,
       url: request.url,
-      referrer: request.referrer,
+      referrer: request.headers.get('referer'),
     },
   };
 
@@ -33,13 +57,12 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
     body: JSON.stringify(payload),
   });
 
-  const res = await POST(req);
+  await POST(req);
 
   return new NextResponse(image, {
     headers: {
       'Content-Type': 'image/gif',
       'Content-Length': image.length.toString(),
-      'x-umami-collect': JSON.stringify(res),
     },
   });
 }

src/app/(collect)/q/[slug]/route.ts

@@ -1,19 +1,43 @@
+export const dynamic = 'force-dynamic';
+
 import { NextResponse } from 'next/server';
 import { notFound } from '@/lib/response';
 import { findLink } from '@/queries/prisma';
 import { POST } from '@/app/api/send/route';
+import { Link } from '@/generated/prisma/client';
+import redis from '@/lib/redis';
 
 export async function GET(request: Request, { params }: { params: Promise<{ slug: string }> }) {
   const { slug } = await params;
 
-  const link = await findLink({
-    where: {
-      slug,
-    },
-  });
+  let link: Link;
 
-  if (!link) {
-    return notFound();
+  if (redis.enabled) {
+    link = await redis.client.fetch(
+      `link:${slug}`,
+      async () => {
+        return findLink({
+          where: {
+            slug,
+          },
+        });
+      },
+      86400,
+    );
+
+    if (!link) {
+      return notFound();
+    }
+  } else {
+    link = await findLink({
+      where: {
+        slug,
+      },
+    });
+
+    if (!link) {
+      return notFound();
+    }
   }
 
   const payload = {
@@ -21,7 +45,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
     payload: {
       link: link.id,
       url: request.url,
-      referrer: request.referrer,
+      referrer: request.headers.get('referer'),
     },
   };