4 files changed, 7 insertions, 4 deletions
diff --git a/bskyweb/templates/base.html b/bskyweb/templates/base.html
index d72494da1..715b39fd2 100644
--- a/bskyweb/templates/base.html
+++ b/bskyweb/templates/base.html
@@ -95,6 +95,7 @@
   <meta name="application-name" content="Bluesky">
   <meta name="generator" content="bskyweb">
   <meta property="og:site_name" content="Bluesky Social" />
+  <meta name="twitter:site" content="@bluesky" />
   <link type="application/activity+json" href="" />
 
   {% block html_head_extra -%}{%- endblock %}
diff --git a/bskyweb/templates/home.html b/bskyweb/templates/home.html
index 9e5c670a2..0e148b37e 100644
--- a/bskyweb/templates/home.html
+++ b/bskyweb/templates/home.html
@@ -17,7 +17,6 @@
   <meta property="og:image" content="https://bsky.app/static/social-card-default-gradient.png" />
   <meta property="twitter:image" content="https://bsky.app/static/social-card-default-gradient.png"  />
 
-  <meta name="twitter:site" content="@bluesky" />
   <meta name="twitter:card" content="summary_large_image" />
 {%- endblock %}
 
diff --git a/bskyweb/templates/post.html b/bskyweb/templates/post.html
index 963af2065..6473bc284 100644
--- a/bskyweb/templates/post.html
+++ b/bskyweb/templates/post.html
@@ -14,7 +14,7 @@
   <meta property="profile:username" content="{{ profileView.Handle }}">
   {%- if requestURI %}
   <meta property="og:url" content="{{ requestURI }}">
-  <link rel="canonical" href="{{ requestURI }}" />
+  <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
   {% endif -%}
   {%- if postView.Author.DisplayName %}
   <meta property="og:title" content="{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})">
@@ -24,15 +24,18 @@
   {%- if postText %}
   <meta name="description" content="{{ postText }}">
   <meta property="og:description" content="{{ postText }}">
+  <meta property="twitter:description" content="{{ postText }}">
   {% endif -%}
   {%- if imgThumbUrls %}
   {% for imgThumbUrl in imgThumbUrls %}
   <meta property="og:image" content="{{ imgThumbUrl }}">
+  <meta property="twitter:image" content="{{ imgThumbUrl }}">
   {% endfor %}
   <meta name="twitter:card" content="summary_large_image">
   {%- elif postView.Author.Avatar %}
-  {# Don't use avatar image in cards; usually looks bad #}
   <meta name="twitter:card" content="summary">
+  <meta property="og:image" content="{{ postView.Author.Avatar }}">
+  <meta property="twitter:image" content="{{ postView.Author.Avatar }}">
   {% endif %}
   <meta name="twitter:label1" content="Posted At">
   <meta name="twitter:value1" content="{{ postView.IndexedAt }}">
diff --git a/bskyweb/templates/profile.html b/bskyweb/templates/profile.html
index af4180dc1..8506a9cff 100644
--- a/bskyweb/templates/profile.html
+++ b/bskyweb/templates/profile.html
@@ -15,7 +15,7 @@
   <meta property="profile:username" content="{{ profileView.Handle }}">
   {%- if requestURI %}
   <meta property="og:url" content="{{ requestURI }}">
-  <link rel="canonical" href="{{ requestURI }}" />
+  <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
   {% endif -%}
   {%- if profileView.DisplayName %}
   <meta property="og:title" content="{{ profileView.DisplayName }} (@{{ profileView.Handle }})">