From 94f77a46ddc3988976a9c7245cbc21f436fff6d3 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Tue, 19 Sep 2023 17:32:20 -0700 Subject: [PATCH] fix: feed cleanup --- config/feedFilters.js | 8 +++++--- .../partials/feeds/{content.liquid => rss.liquid} | 0 src/feeds/books.liquid | 2 +- src/feeds/feed.liquid | 2 +- src/feeds/follow.liquid | 2 +- src/feeds/links.liquid | 7 ++++--- .../2023/it-is-possible-to-both-stream-and-buy-music.md | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) rename src/_includes/partials/feeds/{content.liquid => rss.liquid} (100%) diff --git a/config/feedFilters.js b/config/feedFilters.js index b5de3aea..a412632a 100644 --- a/config/feedFilters.js +++ b/config/feedFilters.js @@ -3,7 +3,8 @@ const BASE_URL = 'https://coryd.dev' module.exports = { normalizeEntries: (entries) => { - return entries.map((entry) => { + const posts = [] + entries.forEach((entry) => { const dateKey = Object.keys(entry).find((key) => key.includes('date')) const date = new Date(entry[dateKey]) let excerpt = '' @@ -14,14 +15,15 @@ module.exports = { // if there's a valid entry return a normalized object if (entry && !entry.data?.link) { - return { + posts.push({ title: entry.data?.title || entry.title, url: entry.url.includes('http') ? entry.url : new URL(entry.url, BASE_URL).toString(), content: entry.description, date, excerpt, - } + }) } }) + return posts }, } diff --git a/src/_includes/partials/feeds/content.liquid b/src/_includes/partials/feeds/rss.liquid similarity index 100% rename from src/_includes/partials/feeds/content.liquid rename to src/_includes/partials/feeds/rss.liquid diff --git a/src/feeds/books.liquid b/src/feeds/books.liquid index 29796d71..4ea56501 100644 --- a/src/feeds/books.liquid +++ b/src/feeds/books.liquid @@ -2,7 +2,7 @@ layout: null permalink: /feeds/books --- -{% render "partials/feeds/content.liquid" +{% render "partials/feeds/rss.liquid" permalink:"/feeds/books" title:"Books • Cory Dransfeldt" description:"Books I'm currently reading." diff --git a/src/feeds/feed.liquid b/src/feeds/feed.liquid index d38bdf1f..2a13c26c 100644 --- a/src/feeds/feed.liquid +++ b/src/feeds/feed.liquid @@ -3,7 +3,7 @@ layout: null permalink: /feeds/posts --- {%- assign posts = collections.posts | reverse -%} -{% render "partials/feeds/content.liquid" +{% render "partials/feeds/rss.liquid" permalink:"/feeds/posts" title:"Cory Dransfeldt" description:"Posts from my site." diff --git a/src/feeds/follow.liquid b/src/feeds/follow.liquid index 7c6cfaff..5bd6e005 100644 --- a/src/feeds/follow.liquid +++ b/src/feeds/follow.liquid @@ -2,7 +2,7 @@ layout: null permalink: /feeds/follow --- -{% render "partials/feeds/content.liquid" +{% render "partials/feeds/rss.liquid" permalink:"/feeds/follow" title:"Follow • Cory Dransfeldt" description:"My activity from around the web." diff --git a/src/feeds/links.liquid b/src/feeds/links.liquid index b24f4a4d..2b435a4a 100644 --- a/src/feeds/links.liquid +++ b/src/feeds/links.liquid @@ -2,11 +2,12 @@ layout: null permalink: /feeds/links --- -{% render "partials/feeds/content.liquid" +{%- assign links = collections.links | reverse -%} +{% render "partials/feeds/rss.liquid" permalink:"/feeds/links" title:"Links • Cory Dransfeldt" description:"Links I've shared." - data:collections.links - updated:collections.links[0].date + data:links + updated:links[0].date site:site %} \ No newline at end of file diff --git a/src/posts/2023/it-is-possible-to-both-stream-and-buy-music.md b/src/posts/2023/it-is-possible-to-both-stream-and-buy-music.md index 625ba876..df711687 100644 --- a/src/posts/2023/it-is-possible-to-both-stream-and-buy-music.md +++ b/src/posts/2023/it-is-possible-to-both-stream-and-buy-music.md @@ -8,6 +8,6 @@ link: https://pxlnv.com/linklog/stream-buy-music/ --- > Streaming services are all the piracy with none of the guilt. It is a broken model that is only slightly better than when this stuff came through illicit downloads from risky places. If someone can buy music outright, artists will benefit, but I cannot see how it implicitly makes them a better music enjoyer. -[I've been streaming music again](https://coryd.dev/posts/2023/i-dont-want-streaming-music/) in part (and I know this is ridiculous) because Spotify is ubiquitous, well-integrated and has a — well — [API that's usable for my purposes](https://coryd.dev/posts/2023/road-to-madness-apple-music-charts/). I still buy music I stream from Bandcamp and archive it and I still buy too many shirts to support bands (I also import missing music into playlists and playlist folders as an analog to albums). I've also been able to scrobble listens more reliably and found some really great bands like PUP. We'll see if it lasts, but it feels like a good balance for now. +[I've been streaming music again](https://coryd.dev/posts/2023/i-dont-want-streaming-music/) in part (and I know this is ridiculous) because Spotify is ubiquitous, well-integrated and has a — well — [API that's usable for my purposes](https://coryd.dev/posts/2023/road-to-madness-apple-music-charts/). I still buy music I stream from Bandcamp and archive it and I still buy too many shirts to support bands (I also import missing music into playlists and playlist folders as an analog to albums). I've also been able to scrobble listens more reliably and found some really great bands like [PUP](https://open.spotify.com/artist/6A7uqgC2N1nUhrCLAytHxN). We'll see if it lasts, but it feels like a good balance for now.