From 7e55338697ff94bd75199df0dabd127a9ed26528 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Sat, 10 Aug 2024 16:15:22 -0700
Subject: [PATCH] chore: myriad feed fixes

---
 config/filters/index.js                       | 13 +++-
 package-lock.json                             |  4 +-
 package.json                                  |  2 +-
 src/assets/styles/feed.xsl                    |  2 +-
 src/includes/base.liquid                      | 11 ++--
 src/includes/partials/feeds/json.liquid       | 64 +++++++++++++------
 src/includes/partials/feeds/rss.liquid        |  9 ++-
 src/pages/dynamic/books/index.html            |  2 +-
 src/pages/dynamic/links.html                  |  2 +-
 src/pages/dynamic/watching/index.html         |  2 +-
 src/pages/feeds/json/all.liquid               |  3 +-
 src/pages/feeds/json/books.liquid             |  3 +-
 src/pages/feeds/json/links.liquid             |  3 +-
 src/pages/feeds/json/movies.liquid            |  3 +-
 .../feeds/json/{feed.liquid => posts.liquid}  |  3 +-
 src/pages/feeds/rss/all.liquid                |  3 +-
 src/pages/feeds/rss/books.liquid              |  3 +-
 src/pages/feeds/rss/links.liquid              |  3 +-
 src/pages/feeds/rss/movies.liquid             |  3 +-
 .../feeds/rss/{feed.liquid => posts.liquid}   |  3 +-
 20 files changed, 82 insertions(+), 59 deletions(-)
 rename src/pages/feeds/json/{feed.liquid => posts.liquid} (81%)
 rename src/pages/feeds/rss/{feed.liquid => posts.liquid} (81%)

diff --git a/config/filters/index.js b/config/filters/index.js
index d90d0c2a..ed72482a 100644
--- a/config/filters/index.js
+++ b/config/filters/index.js
@@ -120,6 +120,7 @@ export default {
       const md = mdGenerator()
       let excerpt = ''
       let url = ''
+      let author
       let title = entry.title
       const feedNote = '<hr/><p>This is a full text feed, but not all content can be rendered perfectly within the feed. If something looks off, feel free to <a href="https://coryd.dev">visit my site</a> for the original post.</p>'
 
@@ -128,7 +129,13 @@ export default {
       if (entry?.slug) url = new URL(entry.slug, BASE_URL).toString()
       if (entry?.link) {
         title = `${entry.title} via ${entry.authors.name}`
-        url = entry.link
+        url = entry.link,
+        author = {
+          name: entry.authors.name,
+          url: entry.authors.url,
+          mastodon: entry.authors?.mastodon || '',
+          rss: entry.authors?.rss_feed || ''
+        }
       }
       if (entry.description) excerpt = entry.description
       if (entry.type === 'book' || entry.type === 'movie' || entry.type === 'link') excerpt = `${entry.description}`
@@ -142,7 +149,9 @@ export default {
         content: entry.description,
         date,
         excerpt,
-        rating: entry?.rating || ''
+        rating: entry?.rating || '',
+        tags: entry?.tags || '',
+        author
       })
     })
     return posts
diff --git a/package-lock.json b/package-lock.json
index 58144dfb..2f00382d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "21.9.4",
+  "version": "21.10.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "21.9.4",
+      "version": "21.10.0",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.4.0",
diff --git a/package.json b/package.json
index ded5d311..ab5efc55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "21.9.4",
+  "version": "21.10.0",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "scripts": {
diff --git a/src/assets/styles/feed.xsl b/src/assets/styles/feed.xsl
index faa161d8..80a16105 100644
--- a/src/assets/styles/feed.xsl
+++ b/src/assets/styles/feed.xsl
@@ -303,7 +303,7 @@
               <p><a href="/feeds">View more of the feeds from my site.</a> <strong class="highlight-text">Or subscribe by adding the URL below to your feed reader of choice.</strong></p>
               <p>
                 <pre class="small">
-                  <code><xsl:value-of select="/rss/channel/feedUrl"/></code>
+                  <code><xsl:value-of select="rss/channel/atom:link/@href"/></code>
                 </pre>
               </p>
               <hr />
diff --git a/src/includes/base.liquid b/src/includes/base.liquid
index 78275bcd..08bd4c9b 100644
--- a/src/includes/base.liquid
+++ b/src/includes/base.liquid
@@ -102,12 +102,11 @@
     <link href="https://cdn.coryd.dev/{{ globals.apple_touch_icon }}?class=w200&v={% appVersion %}" rel="apple-touch-icon">
     <link rel="webmention" href="https://webmention.io/coryd.dev/webmention" />
     <link rel="pingback" href="https://webmention.io/coryd.dev/xmlrpc" />
-    <link type="application/atom+xml" rel="alternate" title="{{ globals.site_name }}" href="https://feedpress.me/coryd">
-    <link rel="alternate" type="application/json" title="{{ globals.site_name }}" href="https://feedpress.me/coryd.json" />
-    <link rel="alternate" href="https://feedpress.me/coryd-links" title="{{ globals.site_name }}'s links feed" type="application/rss+xml">
-    <link rel="alternate" href="https://feedpress.me/coryd-movies" title="{{ globals.site_name }}'s movies feed" type="application/rss+xml">
-    <link rel="alternate" href="https://feedpress.me/coryd-books" title="{{ globals.site_name }}'s books feed" type="application/rss+xml">
-    <link rel="alternate" href="https://feedpress.me/coryd-all" title="{{ globals.site_name }}'s activity feed" type="application/rss+xml">
+    <link type="application/atom+xml" rel="alternate" title="Posts / {{ globals.site_name }}" href="https://coryd.dev/feeds/posts">
+    <link rel="alternate" href="https://coryd.dev/feeds/links" title="Links / {{ globals.site_name }}" type="application/rss+xml">
+    <link rel="alternate" href="https://coryd.dev/feeds/movies" title="Movies / {{ globals.site_name }}'s movies feed" type="application/rss+xml">
+    <link rel="alternate" href="https://coryd.dev/feeds/books" title="Books / {{ globals.site_name }}" type="application/rss+xml">
+    <link rel="alternate" href="https://coryd.dev/feeds/all" title="All activity / {{ globals.site_name }}" type="application/rss+xml">
     <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>
     <script type="application/ld+json">
diff --git a/src/includes/partials/feeds/json.liquid b/src/includes/partials/feeds/json.liquid
index 52557386..0e95add7 100644
--- a/src/includes/partials/feeds/json.liquid
+++ b/src/includes/partials/feeds/json.liquid
@@ -1,21 +1,47 @@
 {
-  "version": "https://jsonfeed.org/version/1",
-  "title": "{{ title | escape }}",
-  "home_page_url": "{{ permalink | absoluteUrl: globals.url | escape }}",
-  "feed_url": "{{ permalink | absoluteUrl: globals.url | escape }}.json",
-  "description": "{{ description | escape }}",
-  "icon": "https://cdn.coryd.dev/{{ globals.feed_image | escape }}?class=w200&v={% appVersion %}",
-  "favicon": "https://cdn.coryd.dev/{{ globals.favicon_ico | escape }}?class=w50&v={% appVersion %}",
-  "items": [
-    {%- assign entries = data | normalizeEntries: 20 -%}
-    {%- for entry in entries -%}
-    {
-      "id": "{{ entry.url | encodeAmp | escape }}",
-      "url": "{{ entry.url | encodeAmp | escape }}",
-      "title": "{{ entry.title | escape }}{%- if entry.authors %} via {{ entry.authors.name | escape }}{%- endif %}{%- if entry.rating %} ({{ entry.rating | escape }}){%- endif %}",
-      "content_text": "{{ entry.excerpt | escape | replace: '\"', '\\"' }}",
-      "date_published": "{{ entry.date | stringToRFC822Date }}"
-    }{% if forloop.last == false %},{% endif %}
-    {%- endfor %}
-  ]
+    "version": "https://jsonfeed.org/version/1.1",
+    "title": "{{ title | escape }}",
+    "home_page_url": "{{ permalink | absoluteUrl | escape }}",
+    "feed_url": "{{ permalink | absoluteUrl | escape }}.json",
+    "description": "{{ globals.site_description | escape }}",
+    "icon": "https://cdn.coryd.dev/{{ globals.feed_image | escape }}?class=w200&v={% appVersion %}",
+    "favicon": "https://cdn.coryd.dev/{{ globals.favicon_ico | escape }}?class=w50&v={% appVersion %}",
+    "authors": [
+        {
+            "name": "{{ globals.site_name }}",
+            "url": "{{ globals.url | escape }}",
+            "avatar": "https://cdn.coryd.dev/{{ globals.avatar | escape }}?class=w200&v={% appVersion %}"
+        }
+    ],
+    "items": [
+        {%- assign entries = data | normalizeEntries: 20 -%}
+        {%- for entry in entries -%}
+        {%- assign summary = entry.content | strip_html | normalize_whitespace | escape -%}
+        {
+            "id": "{{ entry.url | encodeAmp | escape }}",
+            "title": "{{ entry.title | escape }}{% if entry.authors %} via {{ entry.authors.name | escape }}{% endif %}{% if entry.rating %} ({{ entry.rating | escape }}){% endif %}",
+            "url": "{{ entry.url | encodeAmp | escape }}",
+            "content_html": "{{ summary }}",
+            "summary": "{{ summary }}",
+            {%- if entry.author -%}
+            "external_url": "{{ entry.url | encodeAmp | escape }}",
+            "authors": [
+                {
+                  "name": "{{ entry.author.name | escape }}",
+                  "url": "{{ entry.author.url | escape }}",
+                  "mastodon": "{{ entry.author.mastodon | escape }}",
+                  "rss": "{{ entry.author.feed | escape }}"
+                }
+            ],
+            {%- endif %}
+            "date_published": "{{ entry.date | stringToRFC822Date }}"{%- if entry.tags -%},
+            "tags": [
+              {%- for tag in entry.tags -%}
+              "{{ tag | escape }}"{%- unless forloop.last -%}, {% endunless -%}
+              {%- endfor -%}
+            ]
+            {%- endif -%}
+        }{%- if forloop.last == false -%},{%- endif -%}
+        {%- endfor -%}
+    ]
 }
\ No newline at end of file
diff --git a/src/includes/partials/feeds/rss.liquid b/src/includes/partials/feeds/rss.liquid
index 4c3a9b0f..55cee5fe 100644
--- a/src/includes/partials/feeds/rss.liquid
+++ b/src/includes/partials/feeds/rss.liquid
@@ -2,16 +2,15 @@
 <?xml-stylesheet href="/assets/styles/feed.xsl" type="text/xsl" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <atom:link href="{{ permalink | absoluteUrl: globals.url }}" rel="self" type="application/rss+xml" />
-    <feedUrl>{{ permalink | absoluteUrl: globals.url }}</feedUrl>
+    <atom:link href="{{ permalink | absoluteUrl }}" rel="self" type="application/rss+xml" />
     {%- assign entries = data | normalizeEntries: 20 -%}
     <title><![CDATA[{{ title }}]]></title>
-    <description><![CDATA[{{ description }}]]></description>
-    <link>{{ permalink | absoluteUrl: globals.url }}</link>
+    <description><![CDATA[{{ globals.site_description }}]]></description>
+    <link>{{ permalink | absoluteUrl }}</link>
     <lastBuildDate>{{ updated | stringToRFC822Date }}</lastBuildDate>
     <image>
       <title><![CDATA[{{ title }}]]></title>
-      <link>{{ permalink | absoluteUrl: globals.url }}</link>
+      <link>{{ permalink | absoluteUrl }}</link>
       <url>{{ "https://cdn.coryd.dev/" | append: globals.feed_image | append: "?class=w200&amp;v=" | append: appVersion }}</url>
       <width>144</width>
       <height>144</height>
diff --git a/src/pages/dynamic/books/index.html b/src/pages/dynamic/books/index.html
index 27a46ad9..cf16c50a 100644
--- a/src/pages/dynamic/books/index.html
+++ b/src/pages/dynamic/books/index.html
@@ -11,7 +11,7 @@ schema: books
 <h2 class="page-header">Currently reading</h2>
 <p>Here's what I'm reading at the moment. I've finished <strong class="highlight-text">{{ currentBookCount }} books</strong> this year.</p>
 <p>{{ books.years | bookYearLinks }}</p>
-{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-books", text: "Subscribe to my books feed or follow along on this page" %}
+{% render "partials/blocks/banners/rss.liquid", url: "https://coryd.dev/feeds/books", text: "Subscribe to my books feed or follow along on this page" %}
 <hr />
 {% for book in bookData %}
 {% capture alt %}{{ book.title }} by {{ book.authors }}{% endcapture %}
diff --git a/src/pages/dynamic/links.html b/src/pages/dynamic/links.html
index 775cda4e..5b435019 100644
--- a/src/pages/dynamic/links.html
+++ b/src/pages/dynamic/links.html
@@ -10,7 +10,7 @@ permalink: "/links/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}
 {% if pagination.pageNumber == 0 %}
 <h2 class="page-header">Links</h2>
 <p>These are links I've liked or otherwise found interesting. They're all added manually, after having been read and, I suppose, properly considered.</p>
-{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-links", text: "Subscribe to my links feed or follow along on this page" %}
+{% render "partials/blocks/banners/rss.liquid", url: "https://coryd.dev/feeds/links", text: "Subscribe to my links feed or follow along on this page" %}
 <hr />
 {% endif %}
 <div class="link-grid">
diff --git a/src/pages/dynamic/watching/index.html b/src/pages/dynamic/watching/index.html
index 7f9eef6a..41b7e2d6 100644
--- a/src/pages/dynamic/watching/index.html
+++ b/src/pages/dynamic/watching/index.html
@@ -10,7 +10,7 @@ schema: watching
 <h2 class="watching page-header">{{ title }}</h2>
 {% render "partials/media/watching/hero.liquid" movie:featuredMovie %}
 <p>Here's all of the TV and movies I've been watching presented in what is (hopefully) an organized fashion.</p>
-{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-movies", text: "Subscribe to my movies feed or follow along on this page" %}
+{% render "partials/blocks/banners/rss.liquid", url: "https://coryd.dev/feeds/movies", text: "Subscribe to my movies feed or follow along on this page" %}
 <hr />
 <h3 id="movies" class="section-header no-top-margin">
   <a class="link-icon" href="/watching/recent/movies">
diff --git a/src/pages/feeds/json/all.liquid b/src/pages/feeds/json/all.liquid
index 3cf0f9a5..ea7e6a69 100644
--- a/src/pages/feeds/json/all.liquid
+++ b/src/pages/feeds/json/all.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/all.json"
 {% render "partials/feeds/json.liquid"
   permalink:"/feeds/all"
   title:"All activity / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:collections.allContent
   updated:collections.allContent[0].date
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/json/books.liquid b/src/pages/feeds/json/books.liquid
index 83f07feb..03666518 100644
--- a/src/pages/feeds/json/books.liquid
+++ b/src/pages/feeds/json/books.liquid
@@ -7,8 +7,7 @@ permalink: "/feeds/books.json"
 {% render "partials/feeds/json.liquid"
   permalink:"/feeds/books"
   title:"Books / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:bookData
   updated:bookData[0].date
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/json/links.liquid b/src/pages/feeds/json/links.liquid
index 5b6ef3bf..785312f3 100644
--- a/src/pages/feeds/json/links.liquid
+++ b/src/pages/feeds/json/links.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/links.json"
 {% render "partials/feeds/json.liquid"
   permalink:"/feeds/links"
   title:"Links / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:links
   updated:links[0].date
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/json/movies.liquid b/src/pages/feeds/json/movies.liquid
index 21c0018b..829a367d 100644
--- a/src/pages/feeds/json/movies.liquid
+++ b/src/pages/feeds/json/movies.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/movies.json"
 {% render "partials/feeds/json.liquid"
   permalink:"/feeds/movies"
   title:"Movies / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:movies.recentlyWatched
   updated:movies.recentlyWatched[0].lastWatched
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/json/feed.liquid b/src/pages/feeds/json/posts.liquid
similarity index 81%
rename from src/pages/feeds/json/feed.liquid
rename to src/pages/feeds/json/posts.liquid
index 48aa4722..b9fede3a 100644
--- a/src/pages/feeds/json/feed.liquid
+++ b/src/pages/feeds/json/posts.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/posts.json"
 {% render "partials/feeds/json.liquid"
   permalink:"/feeds/posts"
   title:"Posts / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:posts
   updated:posts[0].date
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/rss/all.liquid b/src/pages/feeds/rss/all.liquid
index f0b7a4a9..65172ab0 100644
--- a/src/pages/feeds/rss/all.liquid
+++ b/src/pages/feeds/rss/all.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/all"
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/all"
   title:"All activity / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:collections.allContent
   updated:collections.allContent[0].date
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/rss/books.liquid b/src/pages/feeds/rss/books.liquid
index 503494ac..4df39f78 100644
--- a/src/pages/feeds/rss/books.liquid
+++ b/src/pages/feeds/rss/books.liquid
@@ -7,8 +7,7 @@ permalink: "/feeds/books"
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/books"
   title:"Books / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:bookData
   updated:bookData[0].date
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/rss/links.liquid b/src/pages/feeds/rss/links.liquid
index 6e68867f..992af611 100644
--- a/src/pages/feeds/rss/links.liquid
+++ b/src/pages/feeds/rss/links.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/links"
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/links"
   title:"Links / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:links
   updated:links[0].date
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/rss/movies.liquid b/src/pages/feeds/rss/movies.liquid
index 5275c606..3f39f7b0 100644
--- a/src/pages/feeds/rss/movies.liquid
+++ b/src/pages/feeds/rss/movies.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/movies"
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/movies"
   title:"Movies / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:movies.recentlyWatched
   updated:movies.recentlyWatched[0].lastWatched
-  site:site
 %}
\ No newline at end of file
diff --git a/src/pages/feeds/rss/feed.liquid b/src/pages/feeds/rss/posts.liquid
similarity index 81%
rename from src/pages/feeds/rss/feed.liquid
rename to src/pages/feeds/rss/posts.liquid
index 9ceee394..1f3b7fcd 100644
--- a/src/pages/feeds/rss/feed.liquid
+++ b/src/pages/feeds/rss/posts.liquid
@@ -6,8 +6,7 @@ permalink: "/feeds/posts"
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/posts"
   title:"Posts / Cory Dransfeldt"
-  description:globals.site_description
+  globals:globals
   data:posts
   updated:posts[0].date
-  site:site
 %}
\ No newline at end of file