From 53d2cee7ce43b332fa8c4c660b181ad85f451da0 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cory.dransfeldt@gmail.com>
Date: Mon, 11 Dec 2023 11:46:32 -0800
Subject: [PATCH] chore: simpler is better sometimes

---
 src/_includes/base.liquid                     | 48 +++++++++++++++++--
 src/_includes/schemas/base-schema.liquid      | 15 ------
 src/_includes/schemas/blogpost-schema.liquid  | 27 -----------
 ...r-lastfm-listening-data-to-listenbrainz.md |  1 +
 4 files changed, 45 insertions(+), 46 deletions(-)
 delete mode 100644 src/_includes/schemas/base-schema.liquid
 delete mode 100644 src/_includes/schemas/blogpost-schema.liquid

diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid
index 94c452e8..57154ac0 100644
--- a/src/_includes/base.liquid
+++ b/src/_includes/base.liquid
@@ -8,8 +8,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="canonical" href="{{ fullUrl }}" />
     <meta property="og:title" content="{% if title %}{{ title }} • {% endif %}{{meta.siteName}}" />
-    <meta name="description" content="{% if excerpt %}{{ excerpt}}{% else %}{{ meta.siteDescription }}{% endif %}" />
-    <meta property="og:description" content="{% if excerpt %}{{ excerpt}}{% else %}{{ meta.siteDescription }}{% endif %}" />
+    <meta name="description" content="{% if description %}{{ description }}{% else %}{{ meta.siteDescription }}{% endif %}" />
+    <meta property="og:description" content="{% if description %}{{ description }}{% else %}{{ meta.siteDescription }}{% endif %}" />
     <meta property="og:type" content="article" />
     <meta property="og:url" content="{{ fullUrl }}" />
     <meta property="og:image" content="{{ image | getPostImage }}">
@@ -52,9 +52,49 @@
       title="Cory Dransfeldt's activity feed"
       type="application/rss+xml">
       {% if schema == 'blog' %}
-        {% render "schemas/blogpost-schema.liquid", meta: meta, page: page %}
+        <script type="application/ld+json">
+          {
+            "@context": "https://schema.org",
+            "@type": "BlogPosting",
+            "mainEntityOfPage": {
+              "@type": "WebPage"
+            },
+            "isPartOf": {
+              "@id": "{{ meta.url }}#website"
+            },
+            "@id": "{{ fullUrl }}",
+            "headline": "{%- if title %}{{ title }} • {% endif -%}{{ meta.siteName }}",
+            "description": "{% if description %}{{ description }}{% else %}{{ meta.siteDescription }}{% endif %}",
+            "image": "{% if image %}{{ image }}{% else %}{{ meta.meta_data.opengraph_default }}{% endif %}",
+            "inLanguage": "{{ meta.locale }}",
+            "publisher": {
+              "@type": "{{ meta.siteType }}",
+              "name": "{{ meta.author }}",
+              "url": "{{ meta.url }}"
+            },
+            "author": {
+              "@type": "Person",
+              "name": "{{ meta.author }}"
+            },
+            "datePublished": "{{ page.date | isoDateOnly }}"
+          }
+        </script>
       {% else %}
-        {% render "schemas/base-schema.liquid", meta: meta, page: page %}
+        <script type="application/ld+json">
+          {
+            "@context": "https://schema.org",
+            "@graph": [
+              {
+                "@type": "WebSite",
+                "@id": "{{ meta.url }}#website",
+                "url": "{{ meta.url }}",
+                "name": "{%- if title %}{{ title }} • {% endif -%}{{ meta.siteName }}",
+                "description": "{% if description %}{{ description }}{% else %}{{ meta.siteDescription }}{% endif %}",
+                "inLanguage": "{{ meta.locale }}"
+              }
+            ]
+          }
+        </script>
       {% endif %}
     <script defer data-domain="coryd.dev" src="/js/script.js"></script>
     <script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
diff --git a/src/_includes/schemas/base-schema.liquid b/src/_includes/schemas/base-schema.liquid
deleted file mode 100644
index bd70b6bc..00000000
--- a/src/_includes/schemas/base-schema.liquid
+++ /dev/null
@@ -1,15 +0,0 @@
-<script type="application/ld+json">
-  {
-    "@context": "https://schema.org",
-    "@graph": [
-      {
-        "@type": "WebSite",
-        "@id": "{{ meta.url }}#website",
-        "url": "{{ meta.url }}",
-        "name": "{{ meta.siteName }}",
-        "description": "{% if page.description %}{{ page.description }}{% else %}{{ meta.siteDescription }}{% endif %}",
-        "inLanguage": "{{ meta.locale }}"
-      }
-    ]
-  }
-</script>
\ No newline at end of file
diff --git a/src/_includes/schemas/blogpost-schema.liquid b/src/_includes/schemas/blogpost-schema.liquid
deleted file mode 100644
index 78c7ed99..00000000
--- a/src/_includes/schemas/blogpost-schema.liquid
+++ /dev/null
@@ -1,27 +0,0 @@
-<script type="application/ld+json">
-  {
-    "@context": "https://schema.org",
-    "@type": "BlogPosting",
-    "mainEntityOfPage": {
-      "@type": "WebPage"
-    },
-    "isPartOf": {
-      "@id": "{{ meta.url }}#website"
-    },
-    "@id": "{{ page.url }}",
-    "headline": "{{ page.title or meta.siteName }}",
-    "description": "{% if page.description %}{{ page.description }}{% else %}{{ meta.siteDescription }}{% endif %}",
-    "image": "{% if page.image %}{{ page.image }}{% else %}{{ meta.meta_data.opengraph_default }}{% endif %}",
-    "inLanguage": "{{ meta.locale }}",
-    "publisher": {
-      "@type": "{{ meta.siteType }}",
-      "name": "{{ meta.author }}",
-      "url": "{{ meta.url }}"
-    },
-    "author": {
-      "@type": "Person",
-      "name": "{{ meta.author }}"
-    },
-    "datePublished": "{{ page.date | isoDateOnly }}"
-  }
-</script>
\ No newline at end of file
diff --git a/src/posts/2023/programmatically-importing-your-lastfm-listening-data-to-listenbrainz.md b/src/posts/2023/programmatically-importing-your-lastfm-listening-data-to-listenbrainz.md
index 3ea4ad3a..c226de06 100644
--- a/src/posts/2023/programmatically-importing-your-lastfm-listening-data-to-listenbrainz.md
+++ b/src/posts/2023/programmatically-importing-your-lastfm-listening-data-to-listenbrainz.md
@@ -1,5 +1,6 @@
 ---
 title: 'Programmatically importing your Last.fm listening data to ListenBrainz'
+description: 'I love Last.fm, but in the interest of redundancy, Ive started programmatically importing my listening data from Last.fm into ListenBrainz.'
 date: '2023-12-05'
 draft: false
 tags: