From cce53c2656047c155c56d2d4160e1849a024733c Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 5 May 2024 14:31:07 -0700 Subject: [PATCH] chore: clean up data files --- .eleventy.js | 2 +- config/filters/index.js | 13 +++---- package-lock.json | 4 +- package.json | 2 +- scripts/og-images/index.js | 2 - src/_data/artistCapitalization.js | 5 --- src/_data/blogroll.js | 37 +++++++++++++++++-- src/_data/env.js | 3 -- src/_data/helpers/music.js | 20 +++++----- .../json/artist-capitalization-patches.js | 4 -- src/_data/json/blogroll.js | 34 ----------------- src/_data/json/meta.json | 14 ------- src/_data/json/robots.js | 32 ---------------- src/_data/meta.js | 20 +++++++--- src/_data/robots.js | 35 ++++++++++++++++-- 15 files changed, 98 insertions(+), 129 deletions(-) delete mode 100644 src/_data/artistCapitalization.js delete mode 100644 src/_data/env.js delete mode 100644 src/_data/json/artist-capitalization-patches.js delete mode 100644 src/_data/json/blogroll.js delete mode 100644 src/_data/json/meta.json delete mode 100644 src/_data/json/robots.js diff --git a/.eleventy.js b/.eleventy.js index 6c423318..06f0778e 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -74,7 +74,7 @@ export default async function (eleventyConfig) { }) eleventyConfig.addPassthroughCopy({ 'node_modules/@daviddarnes/mastodon-post/mastodon-post.js': 'assets/scripts/components/mastodon-post.js' - }) + }) // enable merging of tags eleventyConfig.setDataDeepMerge(true) diff --git a/config/filters/index.js b/config/filters/index.js index 6f909971..64cdf708 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -1,13 +1,9 @@ import { DateTime } from 'luxon' import markdownIt from 'markdown-it' import { URL } from 'url' -import { createRequire } from 'module' import sanitizeHtml from 'sanitize-html'; import authors from '../data/author-map.js' -const require = createRequire(import.meta.url) -const metaData = require('../../src/_data/json/meta.json') - const utmPattern = /[?&](utm_[^&=]+=[^&#]*)/gi const BASE_URL = 'https://coryd.dev' @@ -132,11 +128,12 @@ export default { const STATUS_URL = 'https://social.lol/@cory/' return posts[url]?.toots?.[0]?.replace(BASE_URL, STATUS_URL) || null; }, - absoluteUrl: (url, base) => { - if (!base) base = metaData.url + absoluteUrl: (url) => { try { - return (new URL(url, base)).toString() - } catch(e) {} + return (new URL(url, BASE_URL)).toString() + } catch(e) { + console.log('Error generating absoluteUrl.') + } return url; }, diff --git a/package-lock.json b/package-lock.json index dcb0bc87..19633d6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "13.6.13", + "version": "13.6.14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "13.6.13", + "version": "13.6.14", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", diff --git a/package.json b/package.json index 3871c2ab..2dc52c4a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "13.6.13", + "version": "13.6.14", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/scripts/og-images/index.js b/scripts/og-images/index.js index 60c3e64b..b5c83b1a 100644 --- a/scripts/og-images/index.js +++ b/scripts/og-images/index.js @@ -43,8 +43,6 @@ const svgToPNG = async (filePath) => { await fs.mkdir(outputDir, { recursive: true }) await sharp(Buffer.from(svgContent)).png().toFile(outputFile) - - console.log(`Generated png at ${outputFile}`) } catch (error) { console.error('Error processing file:', error) } diff --git a/src/_data/artistCapitalization.js b/src/_data/artistCapitalization.js deleted file mode 100644 index 33db83bb..00000000 --- a/src/_data/artistCapitalization.js +++ /dev/null @@ -1,5 +0,0 @@ -import artistCapitalizationPatches from './json/artist-capitalization-patches.js'; - -export default async function () { - return artistCapitalizationPatches -} diff --git a/src/_data/blogroll.js b/src/_data/blogroll.js index 5a03ea43..4c981018 100644 --- a/src/_data/blogroll.js +++ b/src/_data/blogroll.js @@ -1,5 +1,36 @@ -import blogroll from './json/blogroll.js' - export default async function () { - return blogroll + return [ + { "name": "Adam Newbold", "url": "https://notes.neatnik.net", "feed": "https://notes.neatnik.net" }, + { "name": "Adrianna Tan", "url": "https://popagandhi.com", "feed": "https://popagandhi.com/feed.xml", "newsletter": "https://buttondown.email/skinnylatte" }, + { "name": "Ashur Cabrera", "url": "https://multiline.co/mment", "feed": "https://multiline.co/mment/feed.xml" }, + { "name": "BinaryDigit", "url": "https://binarydigit.cafe", "feed": "https://binarydigit.cafe/feed.xml" }, + { "name": "Chris Burnell", "url": "https://chrisburnell.com", "feed": "https://chrisburnell.com/feed.xml" }, + { "name": "Chris Coyier", "url": "https://chriscoyier.net", "feed": "https://chriscoyier.net/feed/" }, + { "name": "Chris Ferdinandi", "url": "https://gomakethings.com", "feed": "https://gomakethings.com/feed/index.xml", "newsletter": "https://gomakethings.com" }, + { "name": "Chris McLeod", "url": "https://chrismcleod.dev", "feed": "https://chrismcleod.dev/feed.xml" }, + { "name": "Dave Rupert", "url": "https://daverupert.com", "feed": "https://daverupert.com/atom.xml" }, + { "name": "Ethan Marcotte", "url": "https://ethanmarcotte.com/wrote/", "feed": "https://ethanmarcotte.com/wrote/feed.xml" }, + { "name": "fLaMEd", "url": "https://flamedfury.com", "feed": "https://flamedfury.com/feed.xml" }, + { "name": "Jim Nielsen", "url": "https://blog.jim-nielsen.com", "feed": "https://blog.jim-nielsen.com/feed.xml", "json": "https://blog.jim-nielsen.com/feed.json" }, + { "name": "Joe Steel", "url": "https://joe-steel.com", "feed": "https://joe-steel.com/feed.xml" }, + { "name": "Joan Westenberg", "url": "https://joanwestenberg.com", "feed": "https://joanwestenberg.com/blog?format=rss", "newsletter": "https://joanwestenberg.com/subscribe" }, + { "name": "Juha-Matti Santala", "url": "https://hamatti.org", "feed": "https://hamatti.org/feed/feed.xml", "newsletter":"https://www.syntaxerror.tech" }, + { "name": "Keenan", "url": "https://gkeenan.co/avgb", "feed": "https://gkeenan.co/avglb?format=rss" }, + { "name": "Kev Quirk", "url": "https://kevq.uk", "feed": "https://kevq.uk/feed.xml", "newsletter": "https://kevquirk.com/subscribe" }, + { "name": "Łukasz Wójcik", "url": "https://lukaszwojcik.net", "feed": "https://blog.lukaszwojcik.net/full.xml" }, + { "name": "Matt Birchler", "url": "https://birchtree.me", "feed": "https://birchtree.me/rss/" }, + { "name": "Mike Haynes", "url": "https://crashthearcade.com", "feed": "https://crashthearcade.com/feed/rss" }, + { "name": "Nick Heer", "url": "https://pxlnv.com", "feed": "https://feedpress.me/pxlnv", "json": "https://pxlnv.com/feed/json" }, + { "name": "Paris Marx", "url": "https://disconnect.blog", "feed": "https://disconnect.blog/rss/", "newsletter": "https://disconnect.blog/#/portal/signup" }, + { "name": "Paul Anthony Webb", "url": "https://webb.page" }, + { "name": "Raymond Camden", "url": "https://raymondcamden.com", "feed": "https://www.raymondcamden.com/feed.xml", "newsletter": "https://www.raymondcamden.com/subscribe/" }, + { "name": "Robb Knight", "url": "https://rknight.me", "feed": "https://rknight.me/subscribe/posts/rss.xml", "json": "https://rknight.me/subscribe/posts/feed.json" }, + { "name": "Robin Rendle", "url": "https://robinrendle.com", "feed": "https://robinrendle.com/feed.xml", "newsletter": "https://robinrendle.com/the-cascade" }, + { "name": "Ryan Broderick", "url": "https://www.garbageday.email", "feed": "https://rss.beehiiv.com/feeds/99VTTjt0N1.xml", "newsletter": "https://www.garbageday.email/subscribe" }, + { "name": "Sara Joy", "url": "https://sarajoy.dev", "feed": "https://sarajoy.dev/rss.xml" }, + { "name": "Sia Karamalegos", "url": "https://sia.codes", "feed": "https://sia.codes/feed/feed.xml", "newsletter": "https://sia.codes#inform" }, + { "name": "Sophie Koonin", "url": "https://localghost.dev", "feed": "https://localghost.dev/rss" }, + { "name": "Stephanie Eckles", "url": "https://thinkdobecreate.com", "feed": "https://thinkdobecreate.com/feed" }, + { "name": "Zach Leatherman", "url": "https://www.zachleat.com", "feed": "https://www.zachleat.com/web/feed/" } +] } \ No newline at end of file diff --git a/src/_data/env.js b/src/_data/env.js deleted file mode 100644 index 6dab092f..00000000 --- a/src/_data/env.js +++ /dev/null @@ -1,3 +0,0 @@ -export default async function () { - return process.env.NODE_ENV -} diff --git a/src/_data/helpers/music.js b/src/_data/helpers/music.js index f7cd0cb4..18992a98 100644 --- a/src/_data/helpers/music.js +++ b/src/_data/helpers/music.js @@ -1,5 +1,3 @@ -import artistCapitalizationPatches from '../json/artist-capitalization-patches.js'; - export const artistCapitalization = (artist) => artistCapitalizationPatches[artist?.toLowerCase()] || artist const sanitizeMediaString = (string) => string.normalize('NFD').replace(/[\u0300-\u036f\u2010—\.\?\(\)\[\]\{\}]/g, '').replace(/\.{3}/g, '') @@ -18,7 +16,7 @@ export const buildChart = (tracks, artists, albums, nowPlaying = {}) => { const artistKey = artistSanitizedKey(track['artist']) tracksData[track['track']] = { - artist: artistCapitalization(track['artist']), + artist: track['artist'], title: track['track'], plays: 1, type: 'track', @@ -31,11 +29,11 @@ export const buildChart = (tracks, artists, albums, nowPlaying = {}) => { tracksData[track['track']]['plays']++ } - if (!artistsData[artistCapitalization(track['artist'])]) { + if (!artistsData[track['artist']]) { const artistKey = artistSanitizedKey(track['artist']) - artistsData[artistCapitalization(track['artist'])] = { - title: artistCapitalization(track['artist']), + artistsData[track['artist']] = { + title: track['artist'], plays: 1, mbid: artists[artistKey]?.['mbid'] || '', url: (artists[artistKey]?.['mbid'] && artists[artistKey]?.['mbid'] !== '') ? `http://musicbrainz.org/artist/${artists[artistKey]?.['mbid']}` : `https://musicbrainz.org/search?query=${track['artist'].replace( @@ -46,18 +44,18 @@ export const buildChart = (tracks, artists, albums, nowPlaying = {}) => { type: 'artist' } } else { - artistsData[artistCapitalization(track['artist'])]['plays']++ + artistsData[track['artist']]['plays']++ } if (!albumsData[track['album']]) { - const albumKey = albumSanitizedKey(artistCapitalization(track['artist']), track['album']) + const albumKey = albumSanitizedKey(track['artist'], track['album']) albumsData[track['album']] = { title: track['album'], - artist: artistCapitalization(track['artist']), + artist: track['artist'], plays: 1, mbid: albums[albumKey]?.['mbid'] || '', - url: (albums[albumKey]?.['mbid'] && albums[albumSanitizedKey(artistCapitalization(track['artist']), track['artist'], track['album'])]?.['mbid'] !== '') ? `https://musicbrainz.org/release/${albums[albumKey]?.['mbid']}` : `https://musicbrainz.org/taglookup/index?tag-lookup.artist=${track['artist'].replace(/\s+/g, '+')}&tag-lookup.release=${track['album'].replace(/\s+/g, '+')}`, + url: (albums[albumKey]?.['mbid'] && albums[albumSanitizedKey(track['artist'], track['artist'], track['album'])]?.['mbid'] !== '') ? `https://musicbrainz.org/release/${albums[albumKey]?.['mbid']}` : `https://musicbrainz.org/taglookup/index?tag-lookup.artist=${track['artist'].replace(/\s+/g, '+')}&tag-lookup.release=${track['album'].replace(/\s+/g, '+')}`, image: albums[albumKey]?.['image'] || `https://coryd.dev/media/albums/${sanitizeMediaString(track['artist']).replace(/\s+/g, '-').toLowerCase()}-${sanitizeMediaString(track['album'].replace(/[:\/\\,'']+/g , '').replace(/\s+/g, '-').toLowerCase())}.jpg`, type: 'album' @@ -84,7 +82,7 @@ export const buildChart = (tracks, artists, albums, nowPlaying = {}) => { export const buildTracksWithArt = (tracks, artists, albums) => { tracks.forEach(track => { - track['image'] = albums[albumSanitizedKey(artistCapitalization(track['artist']), track['album'])]?.['image'] || `https://coryd.dev/media/albums/${sanitizeMediaString(track['artist']).replace(/\s+/g, '-').toLowerCase()}-${sanitizeMediaString(track['album'].replace(/[:\/\\,'']+/g + track['image'] = albums[albumSanitizedKey(track['artist'], track['album'])]?.['image'] || `https://coryd.dev/media/albums/${sanitizeMediaString(track['artist']).replace(/\s+/g, '-').toLowerCase()}-${sanitizeMediaString(track['album'].replace(/[:\/\\,'']+/g , '').replace(/\s+/g, '-').toLowerCase())}.jpg` track['url'] = (artists[artistSanitizedKey(track['artist'])]?.['mbid'] && artists[artistSanitizedKey(track['artist'])]?.['mbid'] !== '') ? `http://musicbrainz.org/artist/${artists[artistSanitizedKey(track['artist'])]?.['mbid']}` : `https://musicbrainz.org/search?query=${track['artist'].replace( /\s+/g, diff --git a/src/_data/json/artist-capitalization-patches.js b/src/_data/json/artist-capitalization-patches.js deleted file mode 100644 index e8561d5f..00000000 --- a/src/_data/json/artist-capitalization-patches.js +++ /dev/null @@ -1,4 +0,0 @@ -export default { - civerous: 'Civerous', - aset: 'ASET' -} \ No newline at end of file diff --git a/src/_data/json/blogroll.js b/src/_data/json/blogroll.js deleted file mode 100644 index ffcbef20..00000000 --- a/src/_data/json/blogroll.js +++ /dev/null @@ -1,34 +0,0 @@ -export default [ - { "name": "Adam Newbold", "url": "https://notes.neatnik.net", "feed": "https://notes.neatnik.net" }, - { "name": "Adrianna Tan", "url": "https://popagandhi.com", "feed": "https://popagandhi.com/feed.xml", "newsletter": "https://buttondown.email/skinnylatte" }, - { "name": "Ashur Cabrera", "url": "https://multiline.co/mment", "feed": "https://multiline.co/mment/feed.xml" }, - { "name": "BinaryDigit", "url": "https://binarydigit.cafe", "feed": "https://binarydigit.cafe/feed.xml" }, - { "name": "Chris Burnell", "url": "https://chrisburnell.com", "feed": "https://chrisburnell.com/feed.xml" }, - { "name": "Chris Coyier", "url": "https://chriscoyier.net", "feed": "https://chriscoyier.net/feed/" }, - { "name": "Chris Ferdinandi", "url": "https://gomakethings.com", "feed": "https://gomakethings.com/feed/index.xml", "newsletter": "https://gomakethings.com" }, - { "name": "Chris McLeod", "url": "https://chrismcleod.dev", "feed": "https://chrismcleod.dev/feed.xml" }, - { "name": "Dave Rupert", "url": "https://daverupert.com", "feed": "https://daverupert.com/atom.xml" }, - { "name": "Ethan Marcotte", "url": "https://ethanmarcotte.com/wrote/", "feed": "https://ethanmarcotte.com/wrote/feed.xml" }, - { "name": "fLaMEd", "url": "https://flamedfury.com", "feed": "https://flamedfury.com/feed.xml" }, - { "name": "Jim Nielsen", "url": "https://blog.jim-nielsen.com", "feed": "https://blog.jim-nielsen.com/feed.xml", "json": "https://blog.jim-nielsen.com/feed.json" }, - { "name": "Joe Steel", "url": "https://joe-steel.com", "feed": "https://joe-steel.com/feed.xml" }, - { "name": "Joan Westenberg", "url": "https://joanwestenberg.com", "feed": "https://joanwestenberg.com/blog?format=rss", "newsletter": "https://joanwestenberg.com/subscribe" }, - { "name": "Juha-Matti Santala", "url": "https://hamatti.org", "feed": "https://hamatti.org/feed/feed.xml", "newsletter":"https://www.syntaxerror.tech" }, - { "name": "Keenan", "url": "https://gkeenan.co/avgb", "feed": "https://gkeenan.co/avglb?format=rss" }, - { "name": "Kev Quirk", "url": "https://kevq.uk", "feed": "https://kevq.uk/feed.xml", "newsletter": "https://kevquirk.com/subscribe" }, - { "name": "Łukasz Wójcik", "url": "https://lukaszwojcik.net", "feed": "https://blog.lukaszwojcik.net/full.xml" }, - { "name": "Matt Birchler", "url": "https://birchtree.me", "feed": "https://birchtree.me/rss/" }, - { "name": "Mike Haynes", "url": "https://crashthearcade.com", "feed": "https://crashthearcade.com/feed/rss" }, - { "name": "Nick Heer", "url": "https://pxlnv.com", "feed": "https://feedpress.me/pxlnv", "json": "https://pxlnv.com/feed/json" }, - { "name": "Paris Marx", "url": "https://disconnect.blog", "feed": "https://disconnect.blog/rss/", "newsletter": "https://disconnect.blog/#/portal/signup" }, - { "name": "Paul Anthony Webb", "url": "https://webb.page" }, - { "name": "Raymond Camden", "url": "https://raymondcamden.com", "feed": "https://www.raymondcamden.com/feed.xml", "newsletter": "https://www.raymondcamden.com/subscribe/" }, - { "name": "Robb Knight", "url": "https://rknight.me", "feed": "https://rknight.me/subscribe/posts/rss.xml", "json": "https://rknight.me/subscribe/posts/feed.json" }, - { "name": "Robin Rendle", "url": "https://robinrendle.com", "feed": "https://robinrendle.com/feed.xml", "newsletter": "https://robinrendle.com/the-cascade" }, - { "name": "Ryan Broderick", "url": "https://www.garbageday.email", "feed": "https://rss.beehiiv.com/feeds/99VTTjt0N1.xml", "newsletter": "https://www.garbageday.email/subscribe" }, - { "name": "Sara Joy", "url": "https://sarajoy.dev", "feed": "https://sarajoy.dev/rss.xml" }, - { "name": "Sia Karamalegos", "url": "https://sia.codes", "feed": "https://sia.codes/feed/feed.xml", "newsletter": "https://sia.codes#inform" }, - { "name": "Sophie Koonin", "url": "https://localghost.dev", "feed": "https://localghost.dev/rss" }, - { "name": "Stephanie Eckles", "url": "https://thinkdobecreate.com", "feed": "https://thinkdobecreate.com/feed" }, - { "name": "Zach Leatherman", "url": "https://www.zachleat.com", "feed": "https://www.zachleat.com/web/feed/" } -] \ No newline at end of file diff --git a/src/_data/json/meta.json b/src/_data/json/meta.json deleted file mode 100644 index 69cc56e0..00000000 --- a/src/_data/json/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "siteName": "Cory Dransfeldt", - "siteDescription": "I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 3 rescue dogs, technology, automation, music, writing, reading and tv and movies.", - "author": "Cory Dransfeldt", - "email": "hi@coryd.dev", - "url": "https://coryd.dev", - "themeColor": "#3b82f6", - "siteType": "Person", - "locale": "en_US", - "lang": "en", - "meta_data": { - "opengraph_default": "https://coryd.dev/.netlify/images/?url=/assets/img/default.png&w=500&h=500&fm=webp" - } -} \ No newline at end of file diff --git a/src/_data/json/robots.js b/src/_data/json/robots.js deleted file mode 100644 index 4e9c9040..00000000 --- a/src/_data/json/robots.js +++ /dev/null @@ -1,32 +0,0 @@ -export default [ - 'AdsBot-Google', - 'Amazonbot', - 'anthropic-ai', - 'Applebot', - 'AwarioRssBot', - 'AwarioSmartBot', - 'Bytespider', - 'CCBot', - 'ChatGPT-User', - 'ClaudeBot', - 'Claude-Web', - 'cohere-ai', - 'DataForSeoBot', - 'FacebookBot', - 'FriendlyCrawler', - 'Google-Extended', - 'GoogleOther', - 'GPTBot', - 'img2dataset', - 'ImagesiftBot', - 'magpie-crawler', - 'Meltwater', - 'omgili', - 'omgilibot', - 'peer39_crawler', - 'peer39_crawler/1.0', - 'PerplexityBot', - 'PiplBot', - 'Seekr', - 'YouBot', -] diff --git a/src/_data/meta.js b/src/_data/meta.js index 21116b5f..d3c62594 100644 --- a/src/_data/meta.js +++ b/src/_data/meta.js @@ -1,8 +1,16 @@ -import { createRequire } from 'module' - -const require = createRequire(import.meta.url) -const metaData = require('./json/meta.json') - export default async function () { - return metaData + return { + "siteName": "Cory Dransfeldt", + "siteDescription": "I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 3 rescue dogs, technology, automation, music, writing, reading and tv and movies.", + "author": "Cory Dransfeldt", + "email": "hi@coryd.dev", + "url": "https://coryd.dev", + "themeColor": "#3b82f6", + "siteType": "Person", + "locale": "en_US", + "lang": "en", + "meta_data": { + "opengraph_default": "https://coryd.dev/.netlify/images/?url=/assets/img/default.png&w=500&h=500&fm=webp" + } + } } diff --git a/src/_data/robots.js b/src/_data/robots.js index 438f52ee..d7664289 100644 --- a/src/_data/robots.js +++ b/src/_data/robots.js @@ -1,5 +1,34 @@ -import robots from './json/robots.js' - export default async function () { - return robots + return [ + 'AdsBot-Google', + 'Amazonbot', + 'anthropic-ai', + 'Applebot', + 'AwarioRssBot', + 'AwarioSmartBot', + 'Bytespider', + 'CCBot', + 'ChatGPT-User', + 'ClaudeBot', + 'Claude-Web', + 'cohere-ai', + 'DataForSeoBot', + 'FacebookBot', + 'FriendlyCrawler', + 'Google-Extended', + 'GoogleOther', + 'GPTBot', + 'img2dataset', + 'ImagesiftBot', + 'magpie-crawler', + 'Meltwater', + 'omgili', + 'omgilibot', + 'peer39_crawler', + 'peer39_crawler/1.0', + 'PerplexityBot', + 'PiplBot', + 'Seekr', + 'YouBot', + ] }