From 532772fc5556a082183d6bbba5e2b111eaa30c05 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Fri, 17 May 2024 13:22:24 -0700 Subject: [PATCH] chore: organization --- .eleventy.js | 4 ++-- .github/workflows/scheduled-post.yaml | 2 +- config/collections/index.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/feeds/{follow.json.liquid => all.json.liquid} | 8 ++++---- src/feeds/all.liquid | 13 +++++++++++++ src/feeds/follow.liquid | 13 ------------- src/pages/main/feeds.md | 3 ++- 9 files changed, 26 insertions(+), 25 deletions(-) rename src/feeds/{follow.json.liquid => all.json.liquid} (55%) create mode 100644 src/feeds/all.liquid delete mode 100644 src/feeds/follow.liquid diff --git a/.eleventy.js b/.eleventy.js index c8815b5f..3e15bbe5 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -9,7 +9,7 @@ import htmlmin from 'html-minifier-terser' import filters from './config/filters/index.js' import { minifyJsComponents } from './config/events/index.js' -import { followContent, searchIndex, tagList, tagsSortedByCount, links, tagMap, booksToRead } from './config/collections/index.js' +import { allContent, searchIndex, tagList, tagsSortedByCount, links, tagMap, booksToRead } from './config/collections/index.js' import { DateTime } from 'luxon' // load .env @@ -74,7 +74,7 @@ export default async function (eleventyConfig) { }) // collections - eleventyConfig.addCollection('followContent', followContent) + eleventyConfig.addCollection('allContent', allContent) eleventyConfig.addCollection('searchIndex', searchIndex) eleventyConfig.addCollection('tagList', tagList) eleventyConfig.addCollection('tagsSortedByCount', tagsSortedByCount) diff --git a/.github/workflows/scheduled-post.yaml b/.github/workflows/scheduled-post.yaml index 091c6f38..a6aabf41 100644 --- a/.github/workflows/scheduled-post.yaml +++ b/.github/workflows/scheduled-post.yaml @@ -12,7 +12,7 @@ jobs: - name: Feed to Mastodon uses: nhoizey/github-action-feed-to-mastodon@v2 with: - feedUrl: "https://coryd.dev/feeds/follow.json" + feedUrl: "https://coryd.dev/feeds/all.json" mastodonInstance: "https://social.lol" mastodonToken: ${{ secrets.MASTODON_TOKEN }} globalDelayToots: 0 diff --git a/config/collections/index.js b/config/collections/index.js index 19fe992c..5057c049 100644 --- a/config/collections/index.js +++ b/config/collections/index.js @@ -27,7 +27,7 @@ export const searchIndex = (collection) => { return searchIndex } -export const followContent = (collection) => { +export const allContent = (collection) => { const aggregateContent = [] const collectionData = collection.getAll()[0] const { data } = collectionData diff --git a/package-lock.json b/package-lock.json index ec586623..da35d694 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "15.4.1", + "version": "15.4.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "15.4.1", + "version": "15.4.2", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", diff --git a/package.json b/package.json index 74f54826..2ab61a6b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "15.4.1", + "version": "15.4.2", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/feeds/follow.json.liquid b/src/feeds/all.json.liquid similarity index 55% rename from src/feeds/follow.json.liquid rename to src/feeds/all.json.liquid index 58a35f59..929fff7e 100644 --- a/src/feeds/follow.json.liquid +++ b/src/feeds/all.json.liquid @@ -1,13 +1,13 @@ --- layout: null eleventyExcludeFromCollections: true -permalink: /feeds/follow.json +permalink: /feeds/all.json --- {% render "partials/feeds/json.liquid" - permalink:'/feeds/follow.json' + permalink:'/feeds/all.json' title:'Follow • Cory Dransfeldt' - data:collections.followContent - updated:collections.followContent[0].date + data:collections.allContent + updated:collections.allContent[0].date site:site tagMap:collections.tagMap %} \ No newline at end of file diff --git a/src/feeds/all.liquid b/src/feeds/all.liquid new file mode 100644 index 00000000..3040b5b7 --- /dev/null +++ b/src/feeds/all.liquid @@ -0,0 +1,13 @@ +--- +layout: null +eleventyExcludeFromCollections: true +permalink: /feeds/all +--- +{% render "partials/feeds/rss.liquid" + permalink:"/feeds/all" + title:"Follow • Cory Dransfeldt" + description:"All of the posts and activity from my site." + data:collections.allContent + updated:collections.allContent[0].date + site:site +%} \ No newline at end of file diff --git a/src/feeds/follow.liquid b/src/feeds/follow.liquid deleted file mode 100644 index 1a94caf2..00000000 --- a/src/feeds/follow.liquid +++ /dev/null @@ -1,13 +0,0 @@ ---- -layout: null -eleventyExcludeFromCollections: true -permalink: /feeds/follow ---- -{% render "partials/feeds/rss.liquid" - permalink:"/feeds/follow" - title:"Follow • Cory Dransfeldt" - description:"My activity from around the web (ok, mainly this site)." - data:collections.followContent - updated:collections.followContent[0].date - site:site -%} \ No newline at end of file diff --git a/src/pages/main/feeds.md b/src/pages/main/feeds.md index 61a9a6b7..f84c9bfa 100644 --- a/src/pages/main/feeds.md +++ b/src/pages/main/feeds.md @@ -13,4 +13,5 @@ These are web feeds, also known as [RSS](https://en.wikipedia.org/wiki/RSS) or [ - Links ([RSS](https://feedpress.me/coryd-links) • [JSON](https://feedpress.me/coryd-links.json)): links I've liked. - Books ([RSS](https://feedpress.me/coryd-books) • [JSON](https://feedpress.me/coryd-books.json)): books I'm currently reading. - Movies ([RSS](https://feedpress.me/coryd-movies) • [JSON](https://feedpress.me/coryd-books.json)): movies I've watched recently. -- Artist charts ([RSS](https://feedpress.me/coryd-artist-charts) • [JSON](https://feedpress.me/coryd-artist-charts.json)): charts of the artists I've listened to each week. \ No newline at end of file +- Artist charts ([RSS](https://feedpress.me/coryd-artist-charts) • [JSON](https://feedpress.me/coryd-artist-charts.json)): charts of the artists I've listened to each week. +- All ([RSS](https://feedpress.me/coryd-all) • [JSON](https://feedpress.me/coryd-all.json)): all of the posts and activity from my site. \ No newline at end of file