From 6f39c346d90161705cb5d1de44d22003e94f6d1a Mon Sep 17 00:00:00 2001
From: FantasticMao <maomao8017@gmail.com>
Date: Thu, 9 Apr 2020 01:41:21 +0800
Subject: [PATCH 1/2] Support two SEO friendly tags: <meta name="description">
 and <meta name="keywords">.

---
 CONTRIBUTORS.md              | 1 +
 layouts/_default/baseof.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2254e5789..3c3c5361a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -64,3 +64,4 @@
 - [Santiago González](https://github.com/netrules)
 - [Codruț Constantin Gușoi](https://www.sdwolfz.pro)
 - [Clément Pannetier](https://clementpannetier.dev)
+- [FantasticMao](https://github.com/FantasticMao)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2c6f232ac..056bc3227 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
-    {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
-    {{ with .Site.Params.keywords }}<meta name="keywords" content="{{ . }}">{{ end }}
+    <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ if .IsPage }}{{ with .Params.description }}{{ . }}{{ else }}{{ .Summary }}{{ end }}{{ else }}{{ .Site.Params.description }}{{ end }}{{ end }}">
+    <meta name="keywords" content="{{ with .Keywords }}{{ delimit . "," }}{{ else }}{{ if .IsPage }}{{ with .Params.keywords }}{{ delimit . "," }}{{ else }}{{ .Site.Params.keywords }}{{ end }}{{ else }}{{ .Site.Params.keywords }}{{ end }}{{ end }}">
 
     {{ template "_internal/twitter_cards.html" . }}
     {{ template "_internal/opengraph.html" . }}

From 7249b8ac5a9846e72b8944d963cf8f7d71dbf472 Mon Sep 17 00:00:00 2001
From: FantasticMao <maomao8017@gmail.com>
Date: Mon, 27 Apr 2020 00:03:52 +0800
Subject: [PATCH 2/2] Support two SEO friendly tags: <meta name="description">
 and <meta name="keywords">.

---
 layouts/_default/baseof.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 056bc3227..cd47ddcfa 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
-    <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ if .IsPage }}{{ with .Params.description }}{{ . }}{{ else }}{{ .Summary }}{{ end }}{{ else }}{{ .Site.Params.description }}{{ end }}{{ end }}">
-    <meta name="keywords" content="{{ with .Keywords }}{{ delimit . "," }}{{ else }}{{ if .IsPage }}{{ with .Params.keywords }}{{ delimit . "," }}{{ else }}{{ .Site.Params.keywords }}{{ end }}{{ else }}{{ .Site.Params.keywords }}{{ end }}{{ end }}">
+    <meta name="description" content="{{ .Description | default (.Summary | default .Site.Params.description ) }}">
+    <meta name="keywords" content="{{ (delimit .Keywords ",") | default .Site.Params.keywords }}">
 
     {{ template "_internal/twitter_cards.html" . }}
     {{ template "_internal/opengraph.html" . }}