From 09614b0589de4b95b9b25cf1128cc11280ca8932 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sat, 1 Jun 2024 08:47:33 -0700 Subject: [PATCH] fix: feed + formatting --- config/filters/index.js | 17 +++++++------ .../partials/widgets/mastodon-post.liquid | 2 +- src/_includes/post.liquid | 25 ------------------- src/feeds/all.json.liquid | 2 +- src/feeds/all.liquid | 2 +- src/feeds/books.liquid | 2 +- src/feeds/feed.liquid | 2 +- src/feeds/links.liquid | 2 +- src/feeds/movies.liquid | 2 +- src/meta/ai.liquid | 2 +- src/meta/contribute.liquid | 2 +- src/meta/gpc.liquid | 2 +- src/meta/humans.liquid | 2 +- src/meta/opml.liquid | 2 +- src/meta/robots.liquid | 2 +- src/meta/security.liquid | 2 +- src/meta/sitemap.liquid | 2 +- src/meta/traffic-advice.liquid | 2 +- src/meta/webfinger.liquid | 2 +- src/pages/main/books/book.html | 2 +- src/pages/main/music/artists/artist.html | 2 +- src/pages/main/music/genre.html | 2 +- 22 files changed, 30 insertions(+), 52 deletions(-) delete mode 100644 src/_includes/post.liquid diff --git a/config/filters/index.js b/config/filters/index.js index 6125345b..dce21886 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -1,7 +1,9 @@ import { DateTime } from 'luxon' import { URL } from 'url' import slugify from 'slugify' +import markdownIt from 'markdown-it' import sanitizeHtml from 'sanitize-html'; + import { shuffleArray, sanitizeMediaString } from '../utilities/index.js' const BASE_URL = 'https://coryd.dev' @@ -94,7 +96,7 @@ export default { try { return (new URL(url, BASE_URL)).toString() } catch(e) { - console.log('Error generating absoluteUrl.') + console.error('Error generating absoluteUrl.') } return url; }, @@ -105,6 +107,7 @@ export default { entries.forEach((entry) => { const dateKey = Object.keys(entry).find((key) => key.includes('date')) const date = new Date(entry[dateKey]) + const md = markdownIt({ html: true, linkify: true }) let excerpt = '' let url = '' const feedNote = '

This is a full text feed, but not all content can be rendered perfectly within the feed. If something looks off, feel free to visit my site for the original post.

' @@ -116,20 +119,20 @@ export default { // set the entry excerpt if (entry.description) excerpt = entry.description // general case - if (entry?.data?.description) excerpt = `${entry?.data?.description}

` // links where description is stored in frontmatter if (entry.type === 'book' || entry.type === 'movie') excerpt = `${entry.description}

` // books // send full post content to rss - if (entry.content) excerpt = sanitizeHtml(`${entry.content}${feedNote}`, { - disallowedTagsMode: 'completelyDiscard' - }) + if (entry?.url?.includes('/posts/') && entry.content) excerpt = sanitizeHtml(`${md.render(entry.content)}${feedNote}`, { + disallowedTagsMode: 'completelyDiscard' + }) + // if there's a valid entry return a normalized object if (entry) posts.push({ - title: entry.data?.title || entry.title, + title: entry.title, url, - content: entry?.description || entry?.data?.description, + content: entry.description, date, excerpt, rating: entry?.rating || '' diff --git a/src/_includes/partials/widgets/mastodon-post.liquid b/src/_includes/partials/widgets/mastodon-post.liquid index f6471227..aae7761a 100644 --- a/src/_includes/partials/widgets/mastodon-post.liquid +++ b/src/_includes/partials/widgets/mastodon-post.liquid @@ -1,4 +1,4 @@ -{%- assign shareLink = postUrl | findPost: linkPosts -%} +{%- assign shareLink = postUrl | findPost:linkPosts -%} {%- if shareLink %}