From ccd0cf8a371adce9ca31e86d18780d4f5a0a1d7a Mon Sep 17 00:00:00 2001
From: Alec LaLonde <alec@convergencelabs.com>
Date: Tue, 9 Mar 2021 11:25:24 -0700
Subject: [PATCH] Revert "Revert "Redirect to the proper player page URL when
 appropriate""

This reverts commit 3775db64c1213788a78f7e74278628b4279fd89d.
---
 packages/web/pages/player/[username].tsx | 27 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/web/pages/player/[username].tsx b/packages/web/pages/player/[username].tsx
index 9451e108..d0d21e94 100644
--- a/packages/web/pages/player/[username].tsx
+++ b/packages/web/pages/player/[username].tsx
@@ -180,12 +180,27 @@ export const getStaticPaths: GetStaticPaths<QueryParams> = async () => {
 export const getStaticProps = async (
   context: GetStaticPropsContext<QueryParams>,
 ) => {
-  const username = context.params?.username?.toLowerCase();
-  // usernames in the DB are lowercase. This essentially 
-  // makes this page's router variable case-insensitive.
-  let player = null;
-  if (username != null) {
-    player = await getPlayer(username?.toLowerCase());
+  const username = context.params?.username;
+  if (username == null) {
+    return {
+      redirect: {
+        desination: '/',
+        permanent: false
+      }
+    }
+  }
+
+  let player = await getPlayer(username);
+  if (player == null) {
+    player = await getPlayer(username.toLowerCase());
+    if (player != null) {
+      return {
+        redirect: {
+          destination: `/player/${username.toLowerCase()}`,
+          permanent: false
+        }
+      }
+    }
   }
   
   return {