From 046f8a7bac3ab949f0c8e9bce0b1b217ed190585 Mon Sep 17 00:00:00 2001
From: Jasmine Y <jyyyeung@connect.ust.hk>
Date: Sat, 4 May 2024 01:59:19 +0800
Subject: [PATCH] Fix Timestamp Parsing Error that renders Invalid Datetime
 (#252)

* fix: Some timestamps cannot be parsed

* fix: update dateToZulu to use try catch
---
 .eleventy.js                                 |  8 ++++++--
 src/site/_includes/components/timestamps.njk | 18 ++++++++++++++----
 src/site/sitemap.njk                         |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.eleventy.js b/.eleventy.js
index 604f32c..c3a8724 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -517,9 +517,13 @@ module.exports = function (eleventyConfig) {
 
 
   eleventyConfig.addFilter("dateToZulu", function (date) {
-    if (!date) return "";
-    return new Date(date).toISOString("dd-MM-yyyyTHH:mm:ssZ");
+    try {
+      return new Date(date).toISOString("dd-MM-yyyyTHH:mm:ssZ");
+    } catch {
+      return "";
+    }
   });
+  
   eleventyConfig.addFilter("jsonify", function (variable) {
     return JSON.stringify(variable) || '""';
   });
diff --git a/src/site/_includes/components/timestamps.njk b/src/site/_includes/components/timestamps.njk
index 20cc51e..b8ca03c 100644
--- a/src/site/_includes/components/timestamps.njk
+++ b/src/site/_includes/components/timestamps.njk
@@ -1,7 +1,17 @@
 <script src=" https://fastly.jsdelivr.net/npm/luxon@3.2.1/build/global/luxon.min.js "></script>
 <script defer>
-    TIMESTAMP_FORMAT = "{{meta.timestampSettings.timestampFormat}}";
-    document.querySelectorAll('.human-date').forEach(function (el) {
-        el.innerHTML = luxon.DateTime.fromISO(el.getAttribute('data-date') || el.innerText).toFormat(TIMESTAMP_FORMAT);
-      });
+  TIMESTAMP_FORMAT = "{{meta.timestampSettings.timestampFormat}}";
+  document.querySelectorAll('.human-date').forEach(function (el) {
+    date = el.getAttribute('data-date') || el.innerText
+    parsed_date = luxon.DateTime.fromISO(date)
+    if (parsed_date.invalid != null){
+      // Date cannot be parsed
+      parsed_date = luxon.DateTime.fromSQL(date)
+    }
+    if (parsed_date.invalid != null){
+      // Date still cannot be parsed
+      parsed_date = luxon.DateTime.fromHTML(date)
+    }
+    el.innerHTML = parsed_date.toFormat(TIMESTAMP_FORMAT);
+  })
 </script>
\ No newline at end of file
diff --git a/src/site/sitemap.njk b/src/site/sitemap.njk
index 949bc06..9605ef1 100644
--- a/src/site/sitemap.njk
+++ b/src/site/sitemap.njk
@@ -7,7 +7,7 @@ eleventyExcludeFromCollections: true
     {% for page in collections.all %}
         <url>
             <loc>{{ meta.siteBaseUrl }}{{ page.url | url }}</loc>
-            <lastmod>{{ page.date.toISOString() }}</lastmod>
+            <lastmod>{{ page.date | dateToZulu }}</lastmod>
         </url>
     {% endfor %}
 </urlset>
\ No newline at end of file