diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 1b418c425..fd2901bc3 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -61,13 +61,21 @@ window.addthis_config = { ui_click: true }; - <%= tag.meta name: "twitter:title", content: page_title %> - <%= tag.meta name: "og:title", content: page_title %> - <% if meta_description.present? %> - <%= tag.meta name: "description", content: meta_description %> - <%= tag.meta name: "og:description", content: meta_description %> + + <%= tag.meta name: "description", content: meta_description %> + + <%= tag.meta property: "og:type", content: "website" %> + <%= tag.meta property: "og:site_name", content: Danbooru.config.app_name %> + <%= tag.meta property: "og:title", content: page_title %> + <%= tag.meta property: "og:description", content: meta_description %> + <%= tag.meta property: "og:url", content: request.original_url %> + + <% if Danbooru.config.twitter_site.present? %> + <%= tag.meta name: "twitter:site", content: Danbooru.config.twitter_site %> + <%= tag.meta name: "twitter:title", content: page_title %> <%= tag.meta name: "twitter:description", content: meta_description %> <% end %> + <%= yield :html_header %> <%= raw Danbooru.config.custom_html_header_content %> diff --git a/app/views/posts/partials/index/_seo_meta_tags.html.erb b/app/views/posts/partials/index/_seo_meta_tags.html.erb index 05449e89d..994811fba 100644 --- a/app/views/posts/partials/index/_seo_meta_tags.html.erb +++ b/app/views/posts/partials/index/_seo_meta_tags.html.erb @@ -27,9 +27,6 @@ <%= tag.meta name: "canonical", content: posts_url(tags: params[:tags], host: Danbooru.config.hostname, protocol: "https") %> -<%= tag.meta name: "og:type", content: "website" %> -<%= tag.meta name: "og:site", content: Danbooru.config.app_name %> - <% if @post_set.best_post.present? %> <%= tag.meta name: "twitter:image", content: @post_set.best_post.open_graph_image_url %> <%= tag.meta name: "og:image", content: @post_set.best_post.open_graph_image_url %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index e677b14f5..f3d95a83d 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -160,22 +160,15 @@ <% content_for(:html_header) do %> - <% if @post.visible? %> <%= tag.meta name: "og:image", content: @post.open_graph_image_url %> <% end %> - <% if Danbooru.config.enable_post_search_counts %> - - <% end %> - <%= tag.meta name: "canonical", content: post_url(@post, host: Danbooru.config.hostname, protocol: "https") %> - <%# Twitter properties %> <% if @post.twitter_card_supported? %> - <%= tag.meta name: "twitter:site", content: Danbooru.config.twitter_site %> <% if @post.visible? %> <%= tag.meta name: "twitter:image", content: @post.open_graph_image_url %> @@ -185,7 +178,4 @@ <% if @post.rating == "e" %> <% end %> - - <%= tag.meta name: "og:type", content: "website" %> - <%= tag.meta name: "og:site", content: Danbooru.config.app_name %> <% end %>