From e53574970cb98da91b177124b4886084984dee45 Mon Sep 17 00:00:00 2001
From: Violet White <violet.white.dammit@protonmail.com>
Date: Mon, 16 Dec 2019 16:55:02 -0500
Subject: [PATCH] Fix issue #705 (#708)

* Fix issue #705

* Add canonical links to blogs too
---
 templates/blogs/details.rs.html | 3 ++-
 templates/posts/details.rs.html | 1 +
 templates/users/details.rs.html | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/blogs/details.rs.html b/templates/blogs/details.rs.html
index 30974f29..938a6645 100644
--- a/templates/blogs/details.rs.html
+++ b/templates/blogs/details.rs.html
@@ -24,6 +24,7 @@
 
 	<link href='@Instance::get_local().unwrap().compute_box("~", &blog.fqn, "atom.xml")' rel='alternate' type='application/atom+xml'>
 	<link href='@blog.ap_url' rel='alternate' type='application/activity+json'>
+	<link href='@blog.ap_url' rel='canonical'>
     @if !ctx.2.clone().map(|u| u.hide_custom_css).unwrap_or(false) {
         @if let Some(ref theme) = blog.theme {
             <link rel="stylesheet" href="@uri!(plume_static_files: file = Path::new("css").join(theme).join("theme.css"), _build_id = CACHE_NAME)">
@@ -61,7 +62,7 @@
                     <a href="@uri!(blogs::edit: name = &blog.fqn)" class="button" dir="auto">@i18n!(ctx.1, "Edit")</a>
                 }
             </div>
-            
+
             <main class="user-summary" dir="auto">
                 <p>
                     @i18n!(ctx.1, "There's one author on this blog: ", "There are {0} authors on this blog: "; authors.len())
diff --git a/templates/posts/details.rs.html b/templates/posts/details.rs.html
index 17829633..a11ddf55 100644
--- a/templates/posts/details.rs.html
+++ b/templates/posts/details.rs.html
@@ -20,6 +20,7 @@
     }
     <meta property="og:url" content="@uri!(posts::details: blog = &blog.fqn, slug = &article.slug, responding_to = _)"/>
     <meta property="og:description" content="@article.subtitle"/>
+    <link rel="canonical" href="@article.ap_url"/>
 
     @if !ctx.2.clone().map(|u| u.hide_custom_css).unwrap_or(false) {
         @if let Some(ref theme) = blog.theme {
diff --git a/templates/users/details.rs.html b/templates/users/details.rs.html
index 7663f2e0..617ce1ae 100644
--- a/templates/users/details.rs.html
+++ b/templates/users/details.rs.html
@@ -22,6 +22,7 @@
 
 	<link href='@Instance::get_local().unwrap().compute_box("@", &user.fqn, "atom.xml")' rel='alternate' type='application/atom+xml'>
 	<link href='@user.ap_url' rel='alternate' type='application/activity+json'>
+    <link rel="canonical"  href="@user.ap_url"/>
 }, {}, {
     @:header(ctx, &user, follows, is_remote, remote_url)