From aa23becd14391432195257c05466b200396b7583 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Thu, 23 Jul 2020 22:23:31 +0800
Subject: [PATCH] Split post date format code snippets.

Code improvement
---
 _data/date_format.yml        |  4 +++-
 _includes/related-posts.html |  5 +----
 _includes/timeago.html       | 27 +++++++++++++++++++++++++++
 _layouts/category.html       |  2 +-
 _layouts/home.html           |  7 ++-----
 _layouts/post.html           | 13 ++-----------
 _layouts/tag.html            |  2 +-
 7 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 _includes/timeago.html

diff --git a/_data/date_format.yml b/_data/date_format.yml
index 3040be7..0a984ff 100644
--- a/_data/date_format.yml
+++ b/_data/date_format.yml
@@ -6,4 +6,6 @@
 
 
 tooltip: "%a, %b %e, %Y, %l:%M %p %z"
-post: "%b %e, %Y"
\ No newline at end of file
+post:
+  long: "%b %e, %Y"
+  short: "%b %e"
diff --git a/_includes/related-posts.html b/_includes/related-posts.html
index bfe4e49..fa256f3 100644
--- a/_includes/related-posts.html
+++ b/_includes/related-posts.html
@@ -93,10 +93,7 @@
       <div class="card">
         <a href="{{ post.url | relative_url }}">
           <div class="card-body">
-            <span class="timeago small">
-                {{ post.date | date: site.data.date_format.post }}
-                <i class="unloaded">{{ post.date | date_to_xmlschema }}</i>
-            </span>
+            {% include timeago.html date=post.date class="small" %}
             <h3 class="pt-0 mt-1 mb-3" data-toc-skip>{{ post.title }}</h3>
             <div class="text-muted small">
               <p>
diff --git a/_includes/timeago.html b/_includes/timeago.html
new file mode 100644
index 0000000..b6b7bcd
--- /dev/null
+++ b/_includes/timeago.html
@@ -0,0 +1,27 @@
+<!--
+  Date format snippet
+
+  v2.4.1
+  https://github.com/cotes2020/jekyll-theme-chirpy
+  © 2020 Cotes Chung
+  MIT License
+-->
+<span class="timeago {% if include.class %}{{ include.class }}{% endif %}"
+  {% if include.tooltip %}
+    data-toggle="tooltip"
+    data-placement="bottom"
+    title="{{ include.date | date: site.data.date_format.tooltip }}"
+  {% endif %}>
+
+  {% assign this_year = site.time | date: "%Y" %}
+  {% assign post_year = include.date | date: "%Y" %}
+
+  {% if post_year == this_year %}
+    {{ include.date | date: site.data.date_format.post.short }}
+  {% else %}
+    {{ include.date | date: site.data.date_format.post.long }}
+  {% endif %}
+
+  <i class="unloaded">{{ include.date | date_to_xmlschema }}</i>
+
+</span>
\ No newline at end of file
diff --git a/_layouts/category.html b/_layouts/category.html
index a53aff5..70fec40 100644
--- a/_layouts/category.html
+++ b/_layouts/category.html
@@ -18,7 +18,7 @@ layout: page
     <li class="d-flex justify-content-between pl-md-3 pr-md-3">
       <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
       <span class="dash flex-grow-1"></span>
-      <span class="text-muted small">{{ post.date | date: site.data.date_format.post }}</span>
+      <span class="text-muted small">{{ post.date | date: site.data.date_format.post.long }}</span>
     </li>
     {% endfor %}
   </ul>
diff --git a/_layouts/home.html b/_layouts/home.html
index c6ce1ce..c4ae342 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -66,11 +66,8 @@ layout: page
     <div class="post-meta text-muted">
       <!-- posted date -->
       <i class="far fa-clock fa-fw"></i>
-      <span class="timeago" data-toggle="tooltip" data-placement="bottom"
-        title="{{ post.date | date: site.data.date_format.tooltip }}">
-      {{ post.date | date: site.data.date_format.post }}
-      <i class="unloaded">{{ post.date | date_to_xmlschema }}</i>
-      </span>
+      {% include timeago.html date=post.date tooltip=true %}
+
       <!-- page views -->
       {% if site.google_analytics.pv.enabled %}
       <i class="far fa-eye fa-fw"></i>
diff --git a/_layouts/post.html b/_layouts/post.html
index d283cbb..3275e21 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -19,11 +19,7 @@ layout: default
         <!-- Published date and author -->
         <div>
           Posted
-          <span class="timeago" data-toggle="tooltip" data-placement="bottom"
-           title="{{ page.date | date: site.data.date_format.tooltip }}">
-            {{ page.date | date: site.data.date_format.post }}
-            <i class="unloaded">{{ page.date | date_to_xmlschema }}</i>
-          </span>
+          {% include timeago.html date=page.date tooltip=true %}
           by
           <span class="author">
           {% if page.author %}
@@ -50,12 +46,7 @@ layout: default
         {% if lastmod %}
         <div>
           Updated
-          <span class="timeago lastmod"
-            data-toggle="tooltip" data-placement="bottom"
-             title="{{ lastmod | date: site.data.date_format.tooltip }}">
-            {{ lastmod | date: site.data.date_format.post }}
-            <i class="unloaded">{{ lastmod | date_to_xmlschema}}</i>
-          </span>
+          {% include timeago.html date=lastmod class="lastmod" tooltip=true %}
         </div>
         {% endif %}
 
diff --git a/_layouts/tag.html b/_layouts/tag.html
index f90ec33..646162d 100644
--- a/_layouts/tag.html
+++ b/_layouts/tag.html
@@ -18,7 +18,7 @@ layout: page
     <li class="d-flex justify-content-between pl-md-3 pr-md-3">
       <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
       <span class="dash flex-grow-1"></span>
-      <span class="text-muted small">{{ post.date | date: site.data.date_format.post }}</span>
+      <span class="text-muted small">{{ post.date | date: site.data.date_format.post.long }}</span>
     </li>
     {% endfor %}
   </ul>