From 1047d1fd2b1edb806ef47731cbfc95eaaedbd31e Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Tue, 9 Feb 2016 14:25:23 -0800
Subject: [PATCH] add more meta descriptions to more pages

---
 app/helpers/application_helper.rb        | 4 ++++
 app/views/explore/posts/popular.html.erb | 4 ++++
 app/views/pools/index.html.erb           | 4 ++++
 app/views/pools/show.html.erb            | 4 ++++
 app/views/posts/index.html.erb           | 4 +++-
 app/views/posts/show.html.erb            | 1 +
 config/danbooru_default_config.rb        | 4 ++++
 7 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f773726b9..d6d40160e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -51,6 +51,10 @@ module ApplicationHelper
     DText.parse(text)
   end
 
+  def strip_dtext(text)
+    DText.strip(text)
+  end
+
   def error_messages_for(instance_name)
     instance = instance_variable_get("@#{instance_name}")
 
diff --git a/app/views/explore/posts/popular.html.erb b/app/views/explore/posts/popular.html.erb
index c8d24bff0..101fa020d 100644
--- a/app/views/explore/posts/popular.html.erb
+++ b/app/views/explore/posts/popular.html.erb
@@ -15,3 +15,7 @@
 <% content_for(:page_title) do %>
   Popular - <%= Danbooru.config.app_name %>
 <% end %>
+
+<% content_for(:html_header) do %>
+  <meta name="description" content="The most popular posts per day">
+<% end %>
\ No newline at end of file
diff --git a/app/views/pools/index.html.erb b/app/views/pools/index.html.erb
index e4fb55b39..cc1bf6168 100644
--- a/app/views/pools/index.html.erb
+++ b/app/views/pools/index.html.erb
@@ -42,3 +42,7 @@
 <% content_for(:page_title) do %>
   Pools - <%= Danbooru.config.app_name %>
 <% end %>
+
+<% content_for(:html_header) do %>
+  <meta name="description" content="Pools are groups of posts with something in common. The most common use of pools is for posts that are part of a series (such as a comic, or a group of images released by an artist).">
+<% end %>
diff --git a/app/views/pools/show.html.erb b/app/views/pools/show.html.erb
index 53557eeed..0adcf2bf4 100644
--- a/app/views/pools/show.html.erb
+++ b/app/views/pools/show.html.erb
@@ -27,3 +27,7 @@
 <% content_for(:page_title) do %>
   Pool - <%= @pool.pretty_name %> - <%= Danbooru.config.app_name %>
 <% end %>
+
+<% content_for(:html_header) do %>
+  <meta name="description" content="<%= strip_dtext(@pool.description) %>">
+<% end %>
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index d4efe2263..149038fac 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -57,7 +57,9 @@
 <%= content_for(:html_header) do %>
   <link href="<%= posts_path(:format => 'atom', :tags => params[:tags]) %>" rel="alternate" title="ATOM" type="application/atom+xml" />
   <% if @post_set.has_wiki? %>
-    <meta name="description" content="<%= @post_set.wiki_page.presenter.blurb %>"></meta>
+    <meta name="description" content="<%= @post_set.wiki_page.presenter.blurb %>">
+  <% else %>
+    <meta name="description" content="<%= Danbooru.config.description %>">
   <% end %>
   <%= missed_post_search_count_js %>
   <% if @post_set.hide_from_crawler? %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 7a6f6ce19..2d547abf1 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -143,6 +143,7 @@
 <% end %>
 
 <% content_for(:html_header) do %>
+  <meta name="description" content="<%= @post.presenter.humanized_tag_string %>">
   <meta name="tags" content="<%= @post.tag_string %>">
   <meta name="favorites" content="<%= @post.fav_string %>">
   <meta name="pools" content="<%= @post.pool_string %>">
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index e0f90198c..8dfbb8a5d 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -16,6 +16,10 @@ module Danbooru
       end
     end
 
+    def description
+      "Find good anime art fast"
+    end
+
     # The hostname of the server.
     def hostname
       Socket.gethostname