From c4d7acc3f6755205b3c7f135ffb7b49a68f3d39f Mon Sep 17 00:00:00 2001
From: Sam <sam@sam.wf>
Date: Tue, 14 Mar 2023 22:26:21 +0100
Subject: [PATCH] fix(frontend): fix meta tags

---
 frontend/src/routes/@[username]/+page.svelte       |  2 +-
 .../routes/@[username]/[memberName]/+page.svelte   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/routes/@[username]/+page.svelte b/frontend/src/routes/@[username]/+page.svelte
index d20009d..916c040 100644
--- a/frontend/src/routes/@[username]/+page.svelte
+++ b/frontend/src/routes/@[username]/+page.svelte
@@ -234,7 +234,7 @@
   {:else if data.bio && data.bio !== ""}
     <meta
       property="og:description"
-      content="{data.bio.slice(0, 500)}${data.bio.length > 500 ? '…' : ''}"
+      content="{data.bio.slice(0, 500)}{data.bio.length > 500 ? '…' : ''}"
     />
   {:else}
     <meta property="og:description" content="@{data.name} on pronouns.cc" />
diff --git a/frontend/src/routes/@[username]/[memberName]/+page.svelte b/frontend/src/routes/@[username]/[memberName]/+page.svelte
index d71f425..28494e6 100644
--- a/frontend/src/routes/@[username]/[memberName]/+page.svelte
+++ b/frontend/src/routes/@[username]/[memberName]/+page.svelte
@@ -109,24 +109,26 @@
   {#if favNames.length !== 0 && favPronouns.length !== 0}
     <meta
       property="og:description"
-      content="{data.name} goes by {favNames.map((x) => x.value).join(', ')} and uses {favPronouns
-        .map((x) => pronounDisplay(x))
-        .join(', ')} pronouns."
+      content="{data.display_name ?? data.name} goes by {favNames
+        .map((x) => x.value)
+        .join(', ')} and uses {favPronouns.map((x) => pronounDisplay(x)).join(', ')} pronouns."
     />
   {:else if favNames.length !== 0}
     <meta
       property="og:description"
-      content="{data.name} goes by {favNames.map((x) => x.value).join(', ')}."
+      content="{data.display_name ?? data.name} goes by {favNames.map((x) => x.value).join(', ')}."
     />
   {:else if favPronouns.length !== 0}
     <meta
       property="og:description"
-      content="{data.name} uses {favPronouns.map((x) => pronounDisplay(x)).join(', ')} pronouns."
+      content="{data.display_name ?? data.name} uses {favPronouns
+        .map((x) => pronounDisplay(x))
+        .join(', ')} pronouns."
     />
   {:else if data.bio && data.bio !== ""}
     <meta
       property="og:description"
-      content="{data.bio.slice(0, 500)}${data.bio.length > 500 ? '…' : ''}"
+      content="{data.bio.slice(0, 500)}{data.bio.length > 500 ? '…' : ''}"
     />
   {:else}
     <meta property="og:description" content="{data.name} (@{data.user.name}) on pronouns.cc" />