feat: album releases feeds + tv in search

config/collections/index.js

@@ -29,7 +29,7 @@ export const processContent = (collection) => {
   let id = 0
   const collectionData = collection.getAll()[0]
   const { data } = collectionData
-  const { posts, links, movies, books, pages, artists, genres, tv, concerts } = data
+  const { posts, links, movies, books, pages, artists, genres, tv, concerts, albumReleases } = data
 
   const parseDate = (date) => {
     if (!date) return null
@@ -66,6 +66,7 @@ export const processContent = (collection) => {
   }
 
   const movieData = movies['movies'].filter((movie) => movie['rating'])
+  const showData = tv['shows'].filter((show) => show['last_watched_at'])
   const bookData = books.all.filter((book) => book['rating'])
 
   const addItemToIndex = (items, icon, getUrl, getTitle, getTags) => {
@@ -87,6 +88,7 @@ export const processContent = (collection) => {
       items.forEach((item) => {
         let attribution
         let hashTags = tagsToHashtags(item) ? ' ' + tagsToHashtags(item) : ''
+        if (item['type'] === 'album-release') hashTags = ' #Music #NewMusic'
 
         // link attribution if properties exist
         if (item?.['authors']?.['mastodon']) {
@@ -97,7 +99,7 @@ export const processContent = (collection) => {
         }
 
         const content = {
-          url: `${BASE_URL}${item['url']}`,
+          url: !item['url']?.includes('http') ? `${BASE_URL}${item['url']}` : item['url'],
           title: `${icon}: ${getTitle(item)}${attribution ? ' via ' + attribution : ''}${hashTags}`,
           type: item['type']
         }
@@ -130,6 +132,7 @@ export const processContent = (collection) => {
   addItemToIndex(artists, '🎙️', (item) => item['url'], (item) => `${item['name']} (${item['country']}) - ${item['genre']}`, (item) => `['${item['genre']}']`)
   addItemToIndex(genres, '🎵', (item) => item['url'], (item) => item['name'], (item) => item.artists.map(artist => artist['name_string']))
   if (movieData) addItemToIndex(movieData, '🎥', (item) => item['url'], (item) => `${item['title']} (${item['rating']})`, (item) => item['tags'])
+  if (showData) addItemToIndex(showData, '📺', (item) => item['url'], (item) => `${item['title']} (${item['year']})`, (item) => item['tags'])
   if (bookData) addItemToIndex(bookData, '📖', (item) => item['url'], (item) => `${item['title']} (${item['rating']})`, (item) => item['tags'])
 
   addContent(posts, '📝', (item) => item['title'], (item) => item['date'])
@@ -137,6 +140,7 @@ export const processContent = (collection) => {
   addContent(books.all.filter((book) => book['status'] === 'finished'), '📖', (item) => `${item['title']}${item['rating'] ? ' (' + item['rating'] + ')' : ''}`, (item) => item['date'])
   addContent(movies['movies'], '🎥', (item) => `${item['title']}${item['rating'] ? ' (' + item['rating'] + ')' : ''}`, (item) => item['lastWatched'])
   addContent(concerts, '🎤', (item) => `${item['artistNameString'] ? item['artistNameString'] : item['artist']['name']} at ${item['venue']['name'].split(',')[0].trim()}`, (item) => item['date'])
+  addContent([...albumReleases['current']].reverse(), '📆', (item) => `${item['title']} by ${item['artist']}`, (item) => item['release_date'])
 
   addSiteMapContent(posts, (item) => item.title, (item) => item.date)
   addSiteMapContent(pages, (item) => item.title, (item) => item.date)

config/filters/index.js

@@ -4,7 +4,6 @@ import markdownIt from 'markdown-it'
 import markdownItAnchor from 'markdown-it-anchor'
 import markdownItFootnote from 'markdown-it-footnote'
 import sanitizeHtml from 'sanitize-html'
-
 import { shuffleArray, sanitizeMediaString } from '../utilities/index.js'
 
 const BASE_URL = 'https://coryd.dev'
@@ -108,47 +107,43 @@ export default {
     const entryData = limit ? entries.slice(0, limit) : entries
 
     entryData.forEach((entry) => {
-      const dateKey = Object.keys(entry).find(key => key.includes('date'))
-      const date = new Date(entry[dateKey])
       const md = mdGenerator()
-      let excerpt = ''
-      let url = ''
-      let author
-      let title = entry['title']
-      let image = entry['image']
+      const dateKey = Object.keys(entry).find(key => key.includes('date'))
+      let { title, image, url, slug, link, authors, description, type, content, backdrop, rating, tags } = entry
       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>'
+      const processedEntry = { title: title.trim(), date: new Date(entry[dateKey]), content: description }
 
-      if (entry['url']?.includes('http')) url = entry.url
-      if (!entry['url']?.includes('http')) url = new URL(entry['url'], BASE_URL).toString()
-      if (entry?.['slug']) url = new URL(entry['slug'], BASE_URL).toString()
-      if (entry?.['link']) {
-        title = `${entry['title']} via ${entry['authors']['name']}`
-        url = entry['link'],
-        author = {
-          name: entry['authors']['name'],
-          url: entry['authors']['url'],
-          mastodon: entry['.authors']?.['mastodon'] || '',
-          rss: entry['authors']?.['rss_feed'] || ''
+      if (url?.includes('http')) processedEntry['url'] = url
+      if (!url?.includes('http')) processedEntry['url'] = new URL(url, BASE_URL).toString()
+      if (slug) processedEntry['url'] = new URL(slug, BASE_URL).toString()
+      if (link) {
+        processedEntry['title'] = `${title} via ${authors['name']}`
+        processedEntry['url'] = link,
+        processedEntry['author'] = {
+          name: authors['name'],
+          url: authors['url'],
+          mastodon: authors?.['mastodon'] || '',
+          rss: authors?.['rss_feed'] || ''
         }
       }
-      if (entry['description']) excerpt = entry['description']
-      if (entry['type'] === 'book' || entry['type'] === 'movie' || entry['type'] === 'link') excerpt = sanitizeHtml(`${md.render(entry.description)}`)
-      if (entry?.['slug'] && entry['content']) excerpt = sanitizeHtml(`${md.render(entry['content'])}${feedNote}`, {
+      if (description) processedEntry['excerpt'] = description
+      if (['book', 'movie', 'link'].includes(type)) processedEntry['excerpt'] = sanitizeHtml(`${md.render(description)}`)
+      if (slug && content) processedEntry['excerpt'] = sanitizeHtml(`${md.render(content)}${feedNote}`, {
         disallowedTagsMode: 'completelyDiscard'
       })
-      if (entry['backdrop']) image = entry['backdrop']
-      if (entry) posts.push({
-        title: title.trim(),
-        url,
-        image,
-        content: entry['description'],
-        date,
-        excerpt,
-        rating: entry?.['rating'] || '',
-        tags: entry?.['tags'] || '',
-        author
-      })
+
+      processedEntry['image'] = backdrop || image
+
+      if (rating) processedEntry['rating'] = rating
+      if (tags) processedEntry['tags'] = tags
+      if (type === 'album-release') {
+        processedEntry['excerpt'] = `Check out the new release: <a href="${url}">${url}</a>`
+        processedEntry['content'] = `Check out the new release: ${url}`
+      }
+
+      if (entry) posts.push(processedEntry)
     })
+
     return posts
   },
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "24.4.5",
+  "version": "24.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "24.4.5",
+      "version": "24.5.0",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.5.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "24.4.5",
+  "version": "24.5.0",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "scripts": {

src/data/albumReleases.js

@@ -38,9 +38,10 @@ const fetchAlbumReleases = async () => {
       timestamp: releaseDate.toSeconds(),
     }
   }).sort((a, b) => a['timestamp'] - b['timestamp'])
-  const upcoming = all.filter(album => (!album['total_plays'] || album['total_plays'] <= 0) && album['release_date'] > today);
+  const upcoming = all.filter(album => (!album['total_plays'] || album['total_plays'] <= 0) && album['release_date'] > today)
+  const current = all.filter(album => album['release_date'] <= today)
 
-  return { all, upcoming }
+  return { all, upcoming, current }
 }
 
 export default async function () {

src/pages/feeds/json/album-releases.liquid

@@ -0,0 +1,15 @@
+---
+layout: null
+eleventyExcludeFromCollections: true
+permalink: "/feeds/album-releases.json"
+---
+{%- assign releases = albumReleases.current | reverse -%}
+{% render "partials/feeds/json.liquid"
+  permalink:"/feeds/album-releases.json"
+  title:"Album releases / Cory Dransfeldt"
+  globals:globals
+  data:releases
+  updated:releases[0].release_date
+  utm_campaign:"album_releases_feed"
+  appVersion:appVersion
+%}

src/pages/feeds/rss/album-releases.liquid

@@ -0,0 +1,15 @@
+---
+layout: null
+eleventyExcludeFromCollections: true
+permalink: "/feeds/album-releases"
+---
+{%- assign releases = albumReleases.current | reverse -%}
+{% render "partials/feeds/rss.liquid"
+  permalink:"/feeds/album-releases"
+  title:"Album releases / Cory Dransfeldt"
+  globals:globals
+  data:releases
+  updated:releases[0].release_date
+  utm_campaign:"album_releases_feed"
+  appVersion:appVersion
+%}