From cb15655096c38fb93e79fea9f32592e0b5c214f4 Mon Sep 17 00:00:00 2001
From: Michael Gingras <mcg79@cornell.edu>
Date: Mon, 22 Apr 2024 14:04:34 -0600
Subject: [PATCH 1/2] Fixes duplicate twitter metadata

---
 src/app/delegates/[addressOrENSName]/page.tsx |  8 ++++----
 src/app/delegates/edit/page.tsx               |  8 ++++----
 src/app/delegates/page.jsx                    |  8 ++++----
 src/app/page.jsx                              | 13 +++++++++----
 src/app/proposals/[proposal_id]/page.jsx      |  8 ++++----
 src/app/retropgf/3/summary/page.tsx           |  8 ++++----
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/app/delegates/[addressOrENSName]/page.tsx b/src/app/delegates/[addressOrENSName]/page.tsx
index a0818b608..8ab90e13c 100644
--- a/src/app/delegates/[addressOrENSName]/page.tsx
+++ b/src/app/delegates/[addressOrENSName]/page.tsx
@@ -73,10 +73,10 @@ export async function generateMetadata(
         },
       ],
     },
-    other: {
-      ["twitter:card"]: "summary_large_image",
-      ["twitter:title"]: title,
-      ["twitter:description"]: description,
+    twitter: {
+      card: "summary_large_image",
+      title,
+      description,
     },
   };
 }
diff --git a/src/app/delegates/edit/page.tsx b/src/app/delegates/edit/page.tsx
index 88da75470..1b4f5fda1 100644
--- a/src/app/delegates/edit/page.tsx
+++ b/src/app/delegates/edit/page.tsx
@@ -22,10 +22,10 @@ export async function generateMetadata({}) {
         },
       ],
     },
-    other: {
-      ["twitter:card"]: "summary_large_image",
-      ["twitter:title"]: title,
-      ["twitter:description"]: description,
+    twitter: {
+      card: "summary_large_image",
+      title,
+      description,
     },
   };
 }
diff --git a/src/app/delegates/page.jsx b/src/app/delegates/page.jsx
index fb5ece981..8470c17ac 100644
--- a/src/app/delegates/page.jsx
+++ b/src/app/delegates/page.jsx
@@ -56,10 +56,10 @@ export async function generateMetadata({}, parent) {
         },
       ],
     },
-    other: {
-      ["twitter:card"]: "summary_large_image",
-      ["twitter:title"]: title,
-      ["twitter:description"]: description,
+    twitter: {
+      card: "summary_large_image",
+      title,
+      description,
     },
   };
 }
diff --git a/src/app/page.jsx b/src/app/page.jsx
index cd6e0b363..74422ce66 100644
--- a/src/app/page.jsx
+++ b/src/app/page.jsx
@@ -60,11 +60,16 @@ export async function generateMetadata({}, parent) {
         },
       ],
     },
-    other: {
-      ["twitter:card"]: "summary_large_image",
-      ["twitter:title"]: title,
-      ["twitter:description"]: description,
+    twitter: {
+      card: "summary_large_image",
+      title,
+      description,
     },
+    // other: {
+    //   ["twitter:card"]: "summary_large_image",
+    //   ["twitter:title"]: title,
+    //   ["twitter:description"]: description,
+    // },
   };
 }
 
diff --git a/src/app/proposals/[proposal_id]/page.jsx b/src/app/proposals/[proposal_id]/page.jsx
index f3a3f6f8a..d655769ac 100644
--- a/src/app/proposals/[proposal_id]/page.jsx
+++ b/src/app/proposals/[proposal_id]/page.jsx
@@ -34,10 +34,10 @@ export async function generateMetadata({ params }, parent) {
         },
       ],
     },
-    other: {
-      ["twitter:card"]: "summary_large_image",
-      ["twitter:title"]: title,
-      ["twitter:description"]: description,
+    twitter: {
+      card: "summary_large_image",
+      title,
+      description,
     },
   };
 }
diff --git a/src/app/retropgf/3/summary/page.tsx b/src/app/retropgf/3/summary/page.tsx
index d21032c0d..4156ccb81 100644
--- a/src/app/retropgf/3/summary/page.tsx
+++ b/src/app/retropgf/3/summary/page.tsx
@@ -30,10 +30,10 @@ export async function generateMetadata() {
         },
       ],
     },
-    other: {
-      ["twitter:card"]: "summary_large_image",
-      ["twitter:title"]: title,
-      ["twitter:description"]: description,
+    twitter: {
+      card: "summary_large_image",
+      title,
+      description,
     },
   };
 }

From a1176fb49852e004ba5b9792a60db8a346a2101e Mon Sep 17 00:00:00 2001
From: Michael Gingras <mcg79@cornell.edu>
Date: Mon, 22 Apr 2024 14:06:22 -0600
Subject: [PATCH 2/2] Removes stale code from root page metadata generator

---
 src/app/page.jsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/app/page.jsx b/src/app/page.jsx
index 74422ce66..d5f9c0307 100644
--- a/src/app/page.jsx
+++ b/src/app/page.jsx
@@ -65,11 +65,6 @@ export async function generateMetadata({}, parent) {
       title,
       description,
     },
-    // other: {
-    //   ["twitter:card"]: "summary_large_image",
-    //   ["twitter:title"]: title,
-    //   ["twitter:description"]: description,
-    // },
   };
 }