Refactor username decoding and URL generation

thebkht · Nov 16, 2023 · 155f04d · 155f04d
1 parent 5ddd5f8
commit 155f04d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/(Main)/[username]/[url]/layout.tsx b/app/(Main)/[username]/[url]/layout.tsx
@@ -14,11 +14,12 @@ type Props = {
 }
 
 async function getPostData(username: string, url: string) {
+     const decodedUsername = decodeURIComponent(username);
      const post = await postgres.post.findFirst({
        where: {
          url: url,
          author: {
-           username: username
+           username: decodedUsername.substring(1)
          }
        },
        include: {
@@ -93,9 +94,10 @@ async function getPostData(username: string, url: string) {
 export default async function PostLayout(
      { children, params }: Props
 ) {
+     const decodedUsername = decodeURIComponent(params.username);
      const author = await postgres.user.findFirst({
           where: {
-               username: params.username
+               username: decodedUsername.substring(1)
           },
           include: {
                posts: {

diff --git a/app/(Main)/[username]/layout.tsx b/app/(Main)/[username]/layout.tsx
@@ -10,8 +10,8 @@ export async function generateMetadata(
   { params }: Props
 ): Promise<Metadata> {
   try {
-    const encodedString = params.username.replace(/ /g, "%20");
-    const response = await fetch(`${process.env.DOMAIN}/api/users/${encodedString}`);
+    const decodedUsername = decodeURIComponent(params.username);
+    const response = await fetch(`${process.env.DOMAIN}/api/users/${decodedUsername.substring(1)}`);
     if (!response.ok) {
       throw new Error(`Error fetching user data: ${response.statusText}`);
     }

diff --git a/components/settings/profile-form.tsx b/components/settings/profile-form.tsx
@@ -81,7 +81,7 @@ const defaultValues: Partial<ProfileFormValues> = {
       action: (
         <ToastAction
           altText="View profile"
-          onClick={() => router.push(`/user/${data.username}`)}
+          onClick={() => router.push(`/@${data.username}`)}
           className="hover:text-secondary-foreground"
         >
           View profile