From 0fde971a6d7a3198e7a67affc91d83b0e0212745 Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Tue, 25 Jul 2023 20:17:32 +0100
Subject: [PATCH] fix: empty twitterShareUrl after creating note

---
 .../[subdomain]/editor/page-component.tsx     | 55 ++++++++++---------
 src/lib/helpers.ts                            |  9 ++-
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/app/dashboard/[subdomain]/editor/page-component.tsx b/src/app/dashboard/[subdomain]/editor/page-component.tsx
index 71653381..da4fb154 100644
--- a/src/app/dashboard/[subdomain]/editor/page-component.tsx
+++ b/src/app/dashboard/[subdomain]/editor/page-component.tsx
@@ -52,7 +52,7 @@ import { getSiteLink, getTwitterShareUrl } from "~/lib/helpers"
 import { useTranslation } from "~/lib/i18n/client"
 import { getPageVisibility } from "~/lib/page-helpers"
 import { delStorage, setStorage } from "~/lib/storage"
-import { PageVisibilityEnum } from "~/lib/types"
+import { ExpandedNote, PageVisibilityEnum } from "~/lib/types"
 import { cn, pick } from "~/lib/utils"
 import { Rendered, renderPageContent } from "~/markdown"
 import { checkPageSlug } from "~/models/page.model"
@@ -283,27 +283,6 @@ export default function SubdomainEditor() {
 
   const { present, dismiss } = useModalStack()
 
-  const postUrl = `${getSiteLink({
-    subdomain,
-    domain: site.data?.metadata?.content?.custom_domain,
-  })}/${encodeURIComponent(values.slug || defaultSlug)}`
-  const transactionUrl = `${CSB_SCAN}/tx/${
-    page.data?.updatedTransactionHash || page.data?.transactionHash
-  }`
-
-  const twitterShareUrl =
-    page.data && site.data
-      ? getTwitterShareUrl({
-          page: page.data,
-          site: site.data,
-          t,
-        })
-      : ""
-
-  const getPostUrl = useGetState(postUrl)
-  const getTransactionUrl = useGetState(transactionUrl)
-  const getTwitterShareUrl_ = useGetState(twitterShareUrl)
-
   useEffect(() => {
     if (createPage.isSuccess || updatePage.isSuccess) {
       if (draftKey) {
@@ -326,15 +305,41 @@ export default function SubdomainEditor() {
             ?.noteId}&type=${searchParams?.get("type")}`,
         )
       }
+
+      const postUrl = `${getSiteLink({
+        subdomain,
+        domain: site.data?.metadata?.content?.custom_domain,
+      })}/${encodeURIComponent(values.slug || defaultSlug)}`
+
+      const transactionUrl = `${CSB_SCAN}/tx/${
+        page.data?.updatedTransactionHash || page.data?.transactionHash // TODO
+      }`
+
+      const twitterShareUrl =
+        page.data && site.data
+          ? getTwitterShareUrl({
+              page: {
+                metadata: {
+                  content: {
+                    slug: encodeURIComponent(values.slug || defaultSlug),
+                    title: values.title,
+                  },
+                },
+              } as ExpandedNote,
+              site: site.data,
+              t,
+            })
+          : ""
+
       const modalId = "publish-modal"
       present({
         title: `🎉 ${t("Published!")}`,
         id: modalId,
         content: (props) => (
           <PublishedModal
-            postUrl={getPostUrl()}
-            transactionUrl={getTransactionUrl()}
-            twitterShareUrl={getTwitterShareUrl_()}
+            postUrl={postUrl}
+            transactionUrl={transactionUrl}
+            twitterShareUrl={twitterShareUrl}
             {...props}
           />
         ),
diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
index 7830df1c..28d72d86 100644
--- a/src/lib/helpers.ts
+++ b/src/lib/helpers.ts
@@ -38,9 +38,12 @@ export const getNoteSlug = (note: NoteEntity) => {
 }
 
 export const getNoteSlugFromNote = (page: ExpandedNote) => {
-  return page.metadata?.content?.attributes?.find(
-    ($) => $.trait_type === "xlog_slug",
-  )?.value
+  return (
+    page.metadata?.content?.slug ||
+    page.metadata?.content?.attributes?.find(
+      ($) => $.trait_type === "xlog_slug",
+    )?.value
+  )
 }
 
 export const getTwitterShareUrl = ({