Refactor and improve seo schema.org data (#10613)

(cherry picked from commit 60917d1125)

bskyweb/templates/post.html

@@ -15,8 +15,13 @@
   <meta property="og:type" content="article">
   <meta property="profile:username" content="{{ postView.Author.Handle }}">
   {%- if requestURI %}
+  {% if canonicalURL %}
+  <meta property="og:url" content="{{ canonicalURL }}">
+  <link rel="canonical" href="{{ canonicalURL }}" />
+  {% else %}
   <meta property="og:url" content="{{ requestURI }}">
   <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
+  {% endif %}
   {% endif -%}
   {%- if postView.Author.DisplayName %}
   <meta property="og:title" content="{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})">
@@ -34,6 +39,11 @@
   <meta property="twitter:image" content="{{ imgThumbUrl }}">
   {% endfor %}
   <meta name="twitter:card" content="summary_large_image">
+  {% else %}
+  <meta property="og:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
+  <meta property="twitter:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
+  <meta name="twitter:card" content="summary">
+  {% endif %}
   {%- if videoUrl %}
   <meta property="og:video" content="{{ videoUrl }}">
   <meta property="og:video:type" content="{{ videoType }}">
@@ -42,11 +52,6 @@
   <meta property="og:video:height" content="{{ videoHeight }}">
   {% endif -%}
   {% endif -%}
-  {% else %}
-  <meta property="og:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
-  <meta property="twitter:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
-  <meta name="twitter:card" content="summary">
-  {% endif %}
   <meta name="twitter:label1" content="Posted At">
   <meta name="twitter:value1" content="{{ postView.IndexedAt }}">
   {%- if postView.LikeCount %}
@@ -64,52 +69,20 @@
   <meta property="article:published_time" content="{{ postView.IndexedAt }}">
   <link rel="alternate" type="application/json+oembed" href="https://embed.bsky.app/oembed?format=json&url={{ postView.Uri | urlencode }}" />
   <link rel="alternate" href="{{ postView.Uri }}" />
-  <script type="application/ld+json">
-    {
-      "@context": "https://schema.org",
-      "@type": "DiscussionForumPosting",
-      "author": {
-        "@type": "Person",
-        {%- if postView.Author.DisplayName %}
-        "name": "{{ postView.Author.DisplayName }}",
-        "alternateName": "@{{ postView.Author.Handle }}",
-        {% else %}
-        "name": "@{{ postView.Author.Handle }}",
-        {% endif -%}
-        "url": "https://bsky.app/profile/{{ postView.Author.Handle }}"
-      },
-      {%- if postText %}
-      "text": "{{ postText }}",
-      {% endif %}
-      {%- if imageThumbUrls %}
-      "image": "{{ imageThumbUrls[0] }}",
-      {% endif %}
-      "datePublished": "{{ postView.IndexedAt }}",
-      "interactionStatistic": [
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/LikeAction",
-          "userInteractionCount": {{ postView.LikeCount }}
-        },
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/CommentAction",
-          "userInteractionCount": {{ postView.ReplyCount }}
-        },
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/ShareAction",
-          "userInteractionCount": {{ postView.RepostCount + postView.QuoteCount }}
-        }
-      ]
-    }
-  </script>
+  {%- if postJSONLD %}
+  <script type="application/ld+json">{{ postJSONLD|safe }}</script>
+  {% endif -%}
 {%- elif requiresAuth and profileHandle -%}
   <meta property="og:type" content="article">
   <meta property="profile:username" content="{{ profileHandle }}">
   {%- if requestURI %}
+  {% if canonicalURL %}
+  <meta property="og:url" content="{{ canonicalURL }}">
+  <link rel="canonical" href="{{ canonicalURL }}" />
+  {% else %}
   <meta property="og:url" content="{{ requestURI }}">
   <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
+  {% endif %}
   {% endif -%}
   {%- if profileDisplayName %}
   <meta property="og:title" content="{{ profileDisplayName }} (@{{ profileHandle }})">