From 7216b848f4a9dd9e65ac7a92e4f690e427c8dada Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Fri, 8 Sep 2023 12:42:44 -0700 Subject: [PATCH] feat: add tags to shared content --- .eleventy.js | 45 ++++++++++++++++++++++++ .github/workflows/scheduled-post.yaml | 2 +- config/filters.js | 3 ++ src/_data/json/tag-aliases.json | 32 +++++++++++++++++ src/_data/links.js | 7 +--- src/_includes/partials/feeds/json.liquid | 2 +- src/feeds/share.follow.json.liquid | 2 +- src/tags.md | 1 - 8 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 src/_data/json/tag-aliases.json diff --git a/.eleventy.js b/.eleventy.js index 9827c096..8cc023aa 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -17,6 +17,7 @@ const feedFilters = require('./config/feedFilters.js') const CleanCSS = require('clean-css') const now = String(Date.now()) const { execSync } = require('child_process') +const tagAliases = require('./src/_data/json/tag-aliases.json') // load .env require('dotenv-flow').config() @@ -79,6 +80,50 @@ module.exports = function (eleventyConfig) { return Array.from(tagsSet).sort() }) + eleventyConfig.addCollection('tagMap', (collection) => { + const tags = {} + collection.getAll().forEach((item) => { + if (item.data.collections.posts) { + item.data.collections.posts.forEach((post) => { + const url = post.url.includes('http') ? post.url : `https://coryd.dev${post.url}` + const tagString = post.data.tags + .map((tag) => { + if ( + typeof tagAliases.tags.find((t) => t.aliases.includes(tag.toLowerCase()))?.[ + 'tag' + ] !== 'undefined' + ) + return `#${ + tagAliases.tags.find((t) => t.aliases.includes(tag.toLowerCase()))?.['tag'] + }` + }) + .join(' ') + .trim() + if (tagString) tags[url] = tagString + }) + } + if (item.data.links) { + item.data.links.forEach((link) => { + const tagString = link.tags + .map((tag) => { + if ( + typeof tagAliases.tags.find((t) => t.aliases.includes(tag.toLowerCase()))?.[ + 'tag' + ] !== 'undefined' + ) + return `#${ + tagAliases.tags.find((t) => t.aliases.includes(tag.toLowerCase()))?.['tag'] + }` + }) + .join(' ') + .trim() + if (tagString) tags[link.url] = tagString + }) + } + }) + return tags + }) + md.use(markdownItAnchor, { level: [1, 2], permalink: markdownItAnchor.permalink.headerLink({ diff --git a/.github/workflows/scheduled-post.yaml b/.github/workflows/scheduled-post.yaml index 091c6f38..cb8c77c1 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/share-follow.json" mastodonInstance: "https://social.lol" mastodonToken: ${{ secrets.MASTODON_TOKEN }} globalDelayToots: 0 diff --git a/config/filters.js b/config/filters.js index eeda2bd9..64dff340 100644 --- a/config/filters.js +++ b/config/filters.js @@ -42,6 +42,9 @@ module.exports = { return visitors(b) - visitors(a) }) }, + tagLookup: (url, tagMap) => { + return tagMap[url] + }, webmentionsByUrl: (webmentions, url) => { const allowedTypes = ['mention-of', 'in-reply-to', 'like-of', 'repost-of'] diff --git a/src/_data/json/tag-aliases.json b/src/_data/json/tag-aliases.json new file mode 100644 index 00000000..73bc6167 --- /dev/null +++ b/src/_data/json/tag-aliases.json @@ -0,0 +1,32 @@ +{ + "tags": [ + { + "tag": "Eleventy", + "aliases": ["11ty", "eleventy"] + }, + { + "tag": "WebDev", + "aliases": [ + "development", + "javascript", + "react", + "nextjs", + "gatsby", + "vue", + "svelte", + "angular", + "webdev", + "web-development", + "web-development" + ] + }, + { + "tag": "Tech", + "aliases": ["technology", "tech"] + }, + { + "tag": "Music", + "aliases": ["music"] + } + ] +} diff --git a/src/_data/links.js b/src/_data/links.js index 49f0debd..48a0c774 100644 --- a/src/_data/links.js +++ b/src/_data/links.js @@ -13,10 +13,6 @@ module.exports = async function () { const articles = feed.feed return articles.reverse().map((article) => { const tags = article['content']['tags'].map((tag) => tag['name']) - const shareTags = tags - .map((tag) => `#${tag}`) - .join(' ') - .trim() return { url: article['content']['url'], title: article['content']['title'], @@ -24,9 +20,8 @@ module.exports = async function () { ? new Date(article['content']['library']['modified_date']) : new Date(article['content']['publication_date']), description: article['content']['excerpt'], - notes: article['content']['my_notes'], + notes: article['content']['my_notes'] || '', tags, - shareTags, id: btoa(article['id']), } }) diff --git a/src/_includes/partials/feeds/json.liquid b/src/_includes/partials/feeds/json.liquid index 843640aa..9880c25c 100644 --- a/src/_includes/partials/feeds/json.liquid +++ b/src/_includes/partials/feeds/json.liquid @@ -8,7 +8,7 @@ "items": [{% for entry in entries limit: 20 -%} { "id": "{{ entry.url | btoa }}", - "title": "{{ entry.title | escape }}{% if share %}{{ entry.shareTags }}{%endif%}", + "title": "{{ entry.title | escape }}{% if tagMap %} {{ entry.url | tagLookup: tagMap }}{% endif %}", "url": "{{ entry.url }}", "content_text": "{{ entry.title }} {{ entry.url }}", "date_published": "{{ entry.date | stringToDate | dateToRfc822 }}" diff --git a/src/feeds/share.follow.json.liquid b/src/feeds/share.follow.json.liquid index 155ccb88..fb839168 100644 --- a/src/feeds/share.follow.json.liquid +++ b/src/feeds/share.follow.json.liquid @@ -8,5 +8,5 @@ permalink: /feeds/share-follow.json data:follow.posts updated:follow.posts[0].date_published site:site - share:true + tagMap:collections.tagMap %} \ No newline at end of file diff --git a/src/tags.md b/src/tags.md index 5f9f92d8..106f8689 100644 --- a/src/tags.md +++ b/src/tags.md @@ -17,7 +17,6 @@ meta: image: src: https://coryd.dev/assets/img/avatar.webp --- - {% for tag in collections.tagList %}