From 7978b440ecf99dadd6849acc2d18fa4fdf00f38d Mon Sep 17 00:00:00 2001
From: "Jeferson S. Brito" <30840709+jeferson-sb@users.noreply.github.com>
Date: Wed, 7 Jul 2021 10:17:39 -0300
Subject: [PATCH] Fix collections/series meta tags (#13772)

* Fix collections/series meta tags

* Remove twitter creator meta tag

* Remove canonical meta-tag
---
 app/views/collections/_meta.html.erb | 14 +++++++-------
 app/views/collections/index.html.erb |  3 ++-
 app/views/collections/show.html.erb  |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/views/collections/_meta.html.erb b/app/views/collections/_meta.html.erb
index 3c722fc62..3e3a5f657 100644
--- a/app/views/collections/_meta.html.erb
+++ b/app/views/collections/_meta.html.erb
@@ -1,17 +1,17 @@
 <% title title_string %>
-<link rel="canonical" href="<%= app_url("/about") %>" />
-<meta name="description" content="<%= title_string %> on <%= community_name %>">
+
+<meta name="description" content="<%= description_string %>">
 <%= meta_keywords_default %>
 
 <meta property="og:type" content="article" />
-<meta property="og:url" content="<%= app_url("/about") %>" />
-<meta property="og:title" content="About <%= community_name %>" />
+<meta property="og:url" content="<%= app_url(path) %>" />
+<meta property="og:title" content="<%= title_string %>" />
 <meta property="og:image" content="<%= Settings::General.main_social_image %>" />
-<meta property="og:description" content="<%= community_name %> is great!" />
+<meta property="og:description" content="<%= description_string %>" />
 <meta property="og:site_name" content="<%= community_name %>" />
 
 <meta name="twitter:card" content="summary_large_image">
 <meta name="twitter:site" content="@<%= Settings::General.social_media_handles["twitter"] %>">
-<meta name="twitter:title" content="About <%= community_name %>">
-<meta name="twitter:description" content="<%= community_name %> is great!">
+<meta name="twitter:title" content="<%= title_string %>">
+<meta name="twitter:description" content="<%= description_string %>">
 <meta name="twitter:image:src" content="<%= Settings::General.main_social_image %>">
diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb
index eb069adad..87f1840a2 100644
--- a/app/views/collections/index.html.erb
+++ b/app/views/collections/index.html.erb
@@ -1,7 +1,8 @@
 <% title_string = "#{@user.name}'s Series" %>
+<% description_string = "View #{title_string} on #{community_name}" %>
 
 <%= content_for :page_meta do %>
-  <%= render "collections/meta", title_string: title_string %>
+  <%= render "collections/meta", title_string: title_string, description_string: description_string, path: "#{@user.username}/series/" %>
 <% end %>
 
 <main id="main-content" class="crayons-layout crayons-layout--1-col">
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index f0962b578..f4f22dc31 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -1,7 +1,8 @@
 <% title_string = "#{@collection.slug} Series' Articles" %>
+<% description_string = "View #{title_string} on #{community_name}" %>
 
 <%= content_for :page_meta do %>
-  <%= render "collections/meta", title_string: title_string %>
+  <%= render "collections/meta", title_string: title_string, description_string: description_string, path: @collection.path %>
 <% end %>
 
 <div class="crayons-layout crayons-layout--1-col">