referral query param updates

.env.sample

@@ -65,4 +65,4 @@ DATABASE_URL="postgresql://sn:password@db:5432/stackernews?schema=public"
 # postgres container stuff
 POSTGRES_PASSWORD=password
 POSTGRES_USER=sn
-POSTGRES_DB=stackernews
+POSTGRES_DB=stackernews

components/share.js

@@ -7,7 +7,7 @@ import { useToast } from './toast'
 export default function Share ({ item }) {
   const me = useMe()
   const toaster = useToast()
-  const url = `https://stacker.news/items/${item.id}${me ? `/r/${me.name}` : ''}`
+  const url = `https://stacker.news/items/${item.id}${me ? `?r=${me.name}` : ''}`
 
   return typeof window !== 'undefined' && navigator?.share
     ? (
@@ -57,7 +57,7 @@ export default function Share ({ item }) {
 export function CopyLinkDropdownItem ({ item }) {
   const me = useMe()
   const toaster = useToast()
-  const url = `https://stacker.news/items/${item.id}${me ? `/r/${me.name}` : ''}`
+  const url = `https://stacker.news/items/${item.id}${me ? `?r=${me.name}` : ''}`
   return (
     <Dropdown.Item
       onClick={async () => {

middleware.js

@@ -1,18 +1,18 @@
 import { NextResponse } from 'next/server'
 
 export function middleware (request) {
-  const regex = /(\/.*)?\/r\/([\w_]+)/
-  const m = regex.exec(request.nextUrl.pathname)
+  const snReferrer = request.nextUrl.searchParams.get('r')
+  if (snReferrer) {
+    const url = new URL('/', request.url)
+    url.search = request.nextUrl.search
+    url.hash = request.nextUrl.hash
 
-  const url = new URL(m[1] || '/', request.url)
-  url.search = request.nextUrl.search
-  url.hash = request.nextUrl.hash
-
-  const resp = NextResponse.redirect(url)
-  resp.cookies.set('sn_referrer', m[2])
-  return resp
+    const resp = NextResponse.next()
+    resp.cookies.set('sn_referrer', snReferrer)
+    return resp
+  }
 }
 
 export const config = {
-  matcher: ['/(.*/|)r/([\\w_]+)([?#]?.*)']
+  matcher: ['/(.*/|)([?#]?.*)']
 }

pages/_app.js

@@ -54,7 +54,7 @@ function MyApp ({ Component, pageProps: { ...props } }) {
     router.replace({
       pathname: router.pathname,
       query: { ...router.query, nodata: true }
-    }, router.asPath, { ...router.options, shallow: true }).catch((e) => {
+    }, props.me ? `?r=${props.me.name}` : router.asPath, { ...router.options, shallow: true }).catch((e) => {
       // workaround for https://github.com/vercel/next.js/issues/37362
       if (!e.cancelled) {
         console.log(e)