From 9c4ddbcfbb608907b76df7fa7a57c256e9add3ea Mon Sep 17 00:00:00 2001
From: Daniele Tonon <tonon@vitamino.it>
Date: Sun, 16 Jul 2023 16:27:53 +0200
Subject: [PATCH] Fix og/twitter meta reverting to the old ones

---
 templates/note.html    | 10 ++++++----
 templates/profile.html |  9 ++++-----
 templates/relay.html   |  9 +++++----
 3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/templates/note.html b/templates/note.html
index 220c88d..825f09f 100644
--- a/templates/note.html
+++ b/templates/note.html
@@ -4,12 +4,14 @@
   <head>
 
     <title>Nostr Event {{.nevent}} by {{.metadata.Name | escapeString}}</title>
-    <meta property="og:title" content="Nostr Event {{.nevent | escapeString}} by {{.metadata.Name | escapeString}}" />
-    <meta name="twitter:title" content="Nostr Event {{.nevent | escapeString}} by {{.metadata.Name | escapeString}}" />
-    <meta property="og:site_name" content="{{.metadata.Name | escapeString}} nostr homepage" />
+    <meta property="og:title" content="{{.title | escapeString}}" />
+    <meta name="twitter:title" content="{{.twitterTitle | escapeString}}" />
+    <meta property="og:site_name" content="{{.authorLong | escapeString}}" /> 
     {{ if .textImageURL }}
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:site" content="@nostrprotocol" />
     <meta property="og:image" content="{{.textImageURL | escapeString}}" />
-    <meta property="twitter:image" content="{{.proxy}}{{.textImageURL | escapeString}}" />
+    <meta name="twitter:image" content="{{.textImageURL | escapeString}}" />
     {{ else }}
     <!---->
     <meta property="twitter:card" content="summary" />
diff --git a/templates/profile.html b/templates/profile.html
index e220390..322557d 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -3,17 +3,16 @@
   <meta charset="UTF-8" />
   <head>
     <title>{{.metadata.Name | escapeString}} on nostr - {{.npub}}</title>
-    <meta property="og:title" content="{{.metadata.Name | escapeString}} on nostr - {{.npub | escapeString}}" />
-    <meta name="twitter:title" content="{{.metadata.Name | escapeString}} on nostr - {{.npub | escapeString}}" />
-    <meta property="og:site_name" content="{{.metadata.Name | escapeString}} nostr homepage" />
+    <meta property="og:title" content="{{.title | escapeString}}" />
+    <meta property="og:site_name" content="{{.npub | escapeString}}" />
     {{ if .metadata.Picture }}
     <meta property="og:image" content="{{.metadata.Picture | escapeString}}" />
     <meta property="twitter:image" content="{{.proxy}}{{.metadata.Picture | escapeString}}" />
     {{end}}
     {{ if .metadata.About }}
-    <meta property="og:description" content="{{.metadata.DisplayName | escapeString}} - {{.metadata.About | escapeString}}" />
-    <meta name="twitter:description" content="{{.metadata.DisplayName | escapeString}} - {{.metadata.About | escapeString}}" />
+    <meta property="og:description" content="{{.metadata.About | escapeString}}" />
     {{end}}
+    <meta property="twitter:card" content="summary" />
 
     <link rel="canonical" href="https://nostr.com/{{.npub | escapeString }}" />
     <link rel="sitemap" type="application/xml" title="Sitemap for {{.npub | escapeString}}" href="/{{.npub | escapeString}}.xml">
diff --git a/templates/relay.html b/templates/relay.html
index b9cf01a..961bd44 100644
--- a/templates/relay.html
+++ b/templates/relay.html
@@ -2,10 +2,10 @@
 <html class="theme--default">
   <meta charset="UTF-8" />
   <head>
-    <title>Nostr Relay {{.hostname | escapeString}}</title>
-    <meta property="og:title" content="{{.info.Name | escapeString}} - A nostr relay" />
-    <meta name="twitter:title" content="{{.info.Name | escapeString}} - A nostr relay" />
-    <meta property="og:site_name" content="{{.hostname | escapeString}} nostr relay homepage" />
+    <title>Nostr Relay {{.hostname | escapeString}} - {{.info.Name | escapeString}}</title>
+    <meta property="og:title" content="{{.hostname | escapeString}} - nostr relay" />
+    <meta name="twitter:title" content="{{.hostname | escapeString}} - nostr relay" />
+    <meta property="og:site_name" content="{{.hostname | escapeString}} - nostr relay" />
     {{ if .info.Icon }}
     <meta property="og:image" content="{{.info.Icon | escapeString}}" />
     <meta property="twitter:image" content="{{.proxy}}{{.info.Icon | escapeString}}" />
@@ -14,6 +14,7 @@
     <meta property="og:description" content="{{.info.Description | escapeString}}" />
     <meta name="twitter:description" content="{{.info.Description | escapeString}}" />
     {{end}}
+    <meta property="twitter:card" content="summary" />
 
     <link rel="sitemap" type="application/xml" title="Sitemap for {{.hostname | escapeString}}" href="/{{.hostname | escapeString}}.xml">
 
