feat: resolve timing with producing follow feed

.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 { searchIndex, tagList, tagsSortedByCount, links, tagMap, booksToRead } from './config/collections/index.js'
+import { followContent, searchIndex, tagList, tagsSortedByCount, links, tagMap, booksToRead } from './config/collections/index.js'
 import { DateTime } from 'luxon'
 
 // load .env
@@ -74,6 +74,7 @@ export default async function (eleventyConfig) {
   })
 
   // collections
+  eleventyConfig.addCollection('followContent', followContent)
   eleventyConfig.addCollection('searchIndex', searchIndex)
   eleventyConfig.addCollection('tagList', tagList)
   eleventyConfig.addCollection('tagsSortedByCount', tagsSortedByCount)

.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/share-follow.json"
+          feedUrl: "https://coryd.dev/feeds/follow.json"
           mastodonInstance: "https://social.lol"
           mastodonToken: ${{ secrets.MASTODON_TOKEN }}
           globalDelayToots: 0

config/collections/index.js

@@ -1,37 +1,79 @@
 import tagAliases from '../data/tag-aliases.js'
+import { DateTime } from 'luxon'
 
 export const searchIndex = (collection) => {
   const searchIndex = []
   let id = 0
   const collectionData = collection.getAll()[0]
-  const posts = collectionData.data.collections.posts
+  const { data } = collectionData
-  const links = collectionData.data.links
+  const { collections: { posts, links } } = data
-  if (posts) {
+  const addItemToIndex = (items, icon, getUrl, getTitle, getTags) => {
-    posts.forEach((post) => {
+    if (items) {
-      const url = post.url.includes('http') ? post.url : `https://coryd.dev${post.url}`
+      items.forEach((item) => {
         searchIndex.push({
           id,
-        url,
+          url: getUrl(item),
-        title: `📝: ${post.data.title}`,
+          title: `${icon}: ${getTitle(item)}`,
-        tags: post.data.tags.filter((tag) => tag !== 'posts'),
+          tags: getTags(item),
         })
-      id++;
+        id++
       })
     }
-  if (links) {
-    links.forEach((link) => {
-      searchIndex.push({
-        id,
-        url: link.url,
-        title: `🔗: ${link.title}`,
-        tags: link.tags,
-      })
-      id++;
-    })
   }
+
+  addItemToIndex(posts, '📝', item => item.url.includes('http') ? item.url : `https://coryd.dev${item.url}`, item => item.data.title, item => item.data.tags.filter(tag => tag !== 'posts'))
+  addItemToIndex(links, '🔗', item => item.data.link, item => item.data.title, item => item.data.tags)
+
   return searchIndex
 }
 
+export const followContent = (collection) => {
+  const aggregateContent = []
+  const collectionData = collection.getAll()[0]
+  const { data } = collectionData
+  const {
+    collections: { posts, links },
+    books,
+    movies: { movies },
+    weeklyArtistChart
+  } = data
+  const parseDate = (date) => {
+    if (!date) return null
+    let parsedDate = DateTime.fromISO(date)
+    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'yyyy-MM-dd')
+    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'MM/dd/yyyy')
+    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'dd-MM-yyyy')
+    return parsedDate.isValid ? parsedDate.toISO() : null
+  }
+
+  const addContent = (items, icon, getTitle, getDate) => {
+    if (items) {
+      items.forEach(item => {
+        const content = {
+          url: item.url.includes('http') ? item.url : `https://coryd.dev${item.url}`,
+          title: `${icon}: ${getTitle(item)}`
+        }
+        if (item.data?.link) content.url = item.data?.link
+        const date = getDate ? parseDate(getDate(item)) : null
+        if (date) content.date = date
+        aggregateContent.push(content)
+      })
+    }
+  }
+
+  addContent(posts, '📝', item => item.data.title, item => item.data.date)
+  addContent(links, '🔗', item => item.data.title, item => item.data.date)
+  addContent(books.filter(book => book.status === 'started'), '📖', item => item.title, item => item.date)
+  addContent(movies, '🎥', item => item.title, item => item.lastWatched)
+  addContent(weeklyArtistChart, '🎧', item => item.title, item => item.date)
+
+  return aggregateContent.sort((a, b) => {
+    const dateA = a.date ? DateTime.fromISO(a.date) : DateTime.fromMillis(0)
+    const dateB = b.date ? DateTime.fromISO(b.date) : DateTime.fromMillis(0)
+    return dateB - dateA
+  })
+}
+
 export const tagList = (collection) => {
   const tagsSet = new Set()
   collection.getAll().forEach((item) => {
@@ -46,48 +88,40 @@ export const tagList = (collection) => {
 export const tagMap = (collection) => {
   const tags = {}
   const collectionData = collection.getAll()[0]
-  const posts = collectionData.data.collections.posts
+  const { data } = collectionData
-  const links = collectionData.data.collections.links
+  const { collections: { posts, links }, books } = data
-  const books = collectionData.data.books
+  const processItems = (items, getUrl, getTags) => {
-
+    if (items) {
-  if (posts) posts.forEach((post) => {
+      items.forEach((item) => {
-    const url = post.url.includes('http') ? post.url : `https://coryd.dev${post.url}`
+        const url = getUrl(item)
-    const tagString = [...new Set(post.data.tags?.map((tag) => tagAliases[tag.toLowerCase()]))]
+        const tagString = [...new Set(getTags(item).map(tag => tagAliases[tag.toLowerCase()]))]
           .join(' ')
           .trim()
-    if (tagString) tags[url] = tagString.replace(/\s+/g,' ')
+          .replace(/\s+/g, ' ')
+        if (tagString) tags[url] = tagString
       })
+    }
+  }
 
-  if (links) links.forEach((link) => {
+  processItems(posts, item => item.url.includes('http') ? item.url : `https://coryd.dev${item.url}`, item => item.data.tags || [])
-    const url = link.data.link
+  processItems(links, item => item.data.link, item => item.data.tags || [])
-    const tagString = [...new Set(link.data.tags?.map((tag) => tagAliases[tag.toLowerCase()]))]
+  processItems(books, item => item.tags || [], item => item.tags || [])
-      .join(' ')
-      .trim()
-    if (tagString) tags[url] = tagString.replace(/\s+/g,' ')
-  })
-
-  if (books) books.forEach((book) => {
-    const tagString = book['tags']?.map((tag) => tagAliases[tag.toLowerCase()])
-      .join(' ')
-      .trim()
-    if (tagString) tags[book.url] = tagString.replace(/\s+/g,' ')
-  })
 
   return tags
 }
 
 export const tagsSortedByCount = (collection) => {
-  const tagStats = {};
+  const tagStats = {}
   collection.getFilteredByGlob('src/posts/**/*.*').forEach((item) => {
-    if (!item.data.tags) return;
+    if (!item.data.tags) return
     item.data.tags
       .filter((tag) => !['posts', 'all', 'politics', 'net neutrality'].includes(tag))
       .forEach((tag) => {
-      if (!tagStats[tag]) tagStats[tag] = 1;
+      if (!tagStats[tag]) tagStats[tag] = 1
-      if (tagStats[tag]) tagStats[tag] = tagStats[tag] + 1;
+      if (tagStats[tag]) tagStats[tag] = tagStats[tag] + 1
-    });
+    })
-  });
+  })
-  return Object.entries(tagStats).sort((a, b) => b[1] - a[1]).map(([key, value]) => `${key}`);
+  return Object.entries(tagStats).sort((a, b) => b[1] - a[1]).map(([key, value]) => `${key}`)
 }
 
 export const links = (collection) => collection.getFilteredByGlob('src/links/**/*.*').reverse()

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "15.1.9",
+  "version": "15.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "15.1.9",
+      "version": "15.3.0",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.2.2",
@@ -16,11 +16,10 @@
         "@daviddarnes/mastodon-post": "^1.3.0",
         "@zachleat/webcare-webshare": "^1.0.3",
         "minisearch": "^6.3.0",
-        "youtube-video-element": "^1.1.1"
+        "youtube-video-element": "^1.1.2"
       },
       "devDependencies": {
         "@11ty/eleventy": "3.0.0-alpha.10",
-        "@11ty/eleventy-activity-feed": "^1.0.9",
         "@11ty/eleventy-fetch": "^4.0.1",
         "@11ty/eleventy-plugin-rss": "^1.2.0",
         "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
@@ -34,7 +33,7 @@
         "liquidjs": "^10.13.0",
         "luxon": "^3.4.4",
         "markdown-it": "^14.1.0",
-        "markdown-it-anchor": "^8.6.7",
+        "markdown-it-anchor": "^9.0.1",
         "markdown-it-footnote": "^4.0.0",
         "netlify-plugin-webmentions": "^1.1.1",
         "sanitize-html": "^2.13.0",
@@ -125,41 +124,6 @@
         "url": "https://opencollective.com/11ty"
       }
     },
-    "node_modules/@11ty/eleventy-activity-feed": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@11ty/eleventy-activity-feed/-/eleventy-activity-feed-1.0.9.tgz",
-      "integrity": "sha512-iKRPzoXAuA+vOWVC6Plk4s1jYyT57korx/23DwnVWeQNDsm2QY0phFjYEVjoIn/PFTgf/iWM6SG5cEOcE5CuDw==",
-      "dev": true,
-      "dependencies": {
-        "@11ty/eleventy-fetch": "^3.0.0",
-        "@11ty/eleventy-plugin-rss": "^1.2.0",
-        "dotenv": "^16.0.3",
-        "fast-xml-parser": "^4.0.14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/11ty"
-      }
-    },
-    "node_modules/@11ty/eleventy-activity-feed/node_modules/@11ty/eleventy-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@11ty/eleventy-fetch/-/eleventy-fetch-3.0.0.tgz",
-      "integrity": "sha512-qJvfb331rYQAmlCS71Ygg0/XHUdB4/qXBOLsG0DJ1m61WL5JNha52OtKVeQq34u2J2Nfzim+X4TIL/+QyesB7Q==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.3",
-        "flat-cache": "^3.0.4",
-        "node-fetch": "^2.6.7",
-        "p-queue": "^6.6.2"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/11ty"
-      }
-    },
     "node_modules/@11ty/eleventy-dev-server": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@11ty/eleventy-dev-server/-/eleventy-dev-server-2.0.0.tgz",
@@ -688,28 +652,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/@aws-sdk/core/node_modules/fast-xml-parser": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
-      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/naturalintelligence"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "dependencies": {
-        "strnum": "^1.0.5"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
     "node_modules/@aws-sdk/credential-provider-env": {
       "version": "3.577.0",
       "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.577.0.tgz",
@@ -3432,9 +3374,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.772",
+      "version": "1.4.774",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.772.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz",
-      "integrity": "sha512-jFfEbxR/abTTJA3ci+2ok1NTuOBBtB4jH+UT6PUmRN+DY3WSD4FFRsgoVQ+QNIJ0T7wrXwzsWCI2WKC46b++2A==",
+      "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==",
       "dev": true
     },
     "node_modules/encodeurl": {
@@ -3770,18 +3712,18 @@
       }
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.3.6",
+      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
-      "integrity": "sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==",
+      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
       "dev": true,
       "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        },
         {
           "type": "paypal",
           "url": "https://paypal.me/naturalintelligence"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
         }
       ],
       "dependencies": {
@@ -4712,9 +4654,9 @@
       }
     },
     "node_modules/markdown-it-anchor": {
-      "version": "8.6.7",
+      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.0.1.tgz",
-      "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+      "integrity": "sha512-cBt7aAzmkfX8X7FqAe8EBryiKmToXgMQEEMqkXzWCm0toDtfDYIGboKeTKd8cpNJArJtutrf+977wFJTsvNGmQ==",
       "dev": true,
       "peerDependencies": {
         "@types/markdown-it": "*",
@@ -6463,9 +6405,9 @@
       }
     },
     "node_modules/youtube-video-element": {
-      "version": "1.1.1",
+      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/youtube-video-element/-/youtube-video-element-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/youtube-video-element/-/youtube-video-element-1.1.2.tgz",
-      "integrity": "sha512-Iq057tenaW9EP4QhVLoexYgrirnCm4eMT5pKNa//6zzcpj57vZUDz759v8iNM3Hdyr7qhrhBl3l780WCHobh+Q=="
+      "integrity": "sha512-/u5iMnDOuh4uLXXYqZ+l7CAJTIacx1ojuWW39PD0VB/LzKCzSyeQdwHSSTOlyccWZ3Jseccvg7BDCugMmytbGQ=="
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "15.1.9",
+  "version": "15.3.0",
   "description": "The source for my personal site. Built using 11ty.",
   "type": "module",
   "scripts": {
@@ -28,11 +28,10 @@
     "@daviddarnes/mastodon-post": "^1.3.0",
     "@zachleat/webcare-webshare": "^1.0.3",
     "minisearch": "^6.3.0",
-    "youtube-video-element": "^1.1.1"
+    "youtube-video-element": "^1.1.2"
   },
   "devDependencies": {
     "@11ty/eleventy": "3.0.0-alpha.10",
-    "@11ty/eleventy-activity-feed": "^1.0.9",
     "@11ty/eleventy-fetch": "^4.0.1",
     "@11ty/eleventy-plugin-rss": "^1.2.0",
     "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
@@ -46,7 +45,7 @@
     "liquidjs": "^10.13.0",
     "luxon": "^3.4.4",
     "markdown-it": "^14.1.0",
-    "markdown-it-anchor": "^8.6.7",
+    "markdown-it-anchor": "^9.0.1",
     "markdown-it-footnote": "^4.0.0",
     "netlify-plugin-webmentions": "^1.1.1",
     "sanitize-html": "^2.13.0",

src/_data/follow.js

@@ -1,26 +0,0 @@
-export default async function () {
-  const { ActivityFeed } = await import('@11ty/eleventy-activity-feed')
-  const feed = new ActivityFeed()
-
-  feed.addSource('rss', '📝', 'https://coryd.dev/feeds/posts')
-  feed.addSource('rss', '🎥', 'https://coryd.dev/feeds/movies')
-  feed.addSource('rss', '📖', 'https://coryd.dev/feeds/books')
-  feed.addSource('rss', '🔗', 'https://coryd.dev/feeds/links')
-  feed.addSource('rss', '🎧', 'https://coryd.dev/feeds/weekly-artist-chart')
-
-  const entries = feed.getEntries().catch()
-  const res = await entries
-  const activity = { posts: [] }
-  res.forEach((entry) => {
-    activity.posts.push({
-      id: entry.url,
-      title: entry.title,
-      url: entry.url,
-      description: entry.content,
-      content_html: entry.content,
-      date_published: entry.published,
-    })
-  })
-
-  return activity
-}

src/_data/json/read.json

@@ -736,29 +736,6 @@
     "language": "en",
     "link": "https://books.google.com/books/about/Chasm_City.html?hl=&id=w19z8-u1dl0C"
   },
-  {
-    "isbn": "9780316462693",
-    "dateAdded": "2024-04-21",
-    "status": "want to read",
-    "rating": "unrated",
-    "tags": [
-      "scifi"
-    ],
-    "title": "Pushing Ice",
-    "authors": [
-      "Alastair Reynolds"
-    ],
-    "publishedDate": "2020-04-21",
-    "description": "Pushing Ice is the brilliant tale of extraordinary aliens, glittering technologies, and sweeping space opera from award-winning science fiction author Alastair Reynolds. 2057. Humanity has raised exploiting the solar system to an art form. Bella Lind and the crew of her nuclear-powered ship, the Rockhopper, push ice. They mine comets. And they're good at it. The Rockhopper is nearing the end of its current mission cycle, and everyone is desperate for some much-needed R & R, when startling news arrives from Saturn: Janus, one of Saturn's ice moons, has inexplicably left its natural orbit and is now heading out of the solar system at high speed. As layers of camouflage fall away, it becomes clear that Janus was never a moon in the first place. It's some kind of machine -- and it is now headed toward a fuzzily glimpsed artifact 260 light-years away. The Rockhopper is the only ship anywhere near Janus, and Bella Lind is ordered to shadow it for the few vital days before it falls forever out of reach. In accepting this mission, she sets her ship and her crew on a collision course with destiny -- for Janus has more surprises in store, and not all of them are welcome.",
-    "pageCount": 602,
-    "printType": "BOOK",
-    "categories": [
-      "Fiction"
-    ],
-    "thumbnail": "https://coryd.dev/media/books/9780316462693-pushing-ice.jpg",
-    "language": "en",
-    "link": "https://play.google.com/store/books/details?id=9oy9DwAAQBAJ"
-  },
   {
     "isbn": "9781662602351",
     "dateAdded": "2024-04-21",

src/_data/movies.js

@@ -65,7 +65,7 @@ export default async function () {
   const recentlyWatchedMovies = movies.filter(movie => movie['last_watched']).sort((a, b) => new Date(b['last_watched']) - new Date(a['last_watched'])).slice(0, 6)
 
   return {
-    movies,
+    movies: [...formatMovieData(movies), ...formatMovieData(movies, false)],
     watchHistory: formatMovieData(movies),
     recentlyWatched: formatMovieData(recentlyWatchedMovies),
     favorites: formatMovieData(favoriteMovies).sort((a, b) => a['title'].localeCompare(b['title'])),

src/feeds/follow.json.liquid

@@ -1,13 +1,13 @@
 ---
 layout: null
 eleventyExcludeFromCollections: true
-permalink: /feeds/share-follow.json
+permalink: /feeds/follow.json
 ---
 {% render "partials/feeds/json.liquid"
-  permalink:'/feeds/share-follow.json'
+  permalink:'/feeds/follow.json'
   title:'Follow • Cory Dransfeldt'
-  data:follow.posts
+  data:collections.followContent
-  updated:follow.posts[0].date_published
+  updated:collections.followContent[0].date
   site:site
   tagMap:collections.tagMap
 %}

src/feeds/follow.liquid

@@ -0,0 +1,13 @@
+---
+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
+%}