diff --git a/config/filters/feeds.js b/config/filters/feeds.js index aaa6d99c..1fb82f8f 100644 --- a/config/filters/feeds.js +++ b/config/filters/feeds.js @@ -39,7 +39,7 @@ export default { entryData.forEach((entry) => { const md = mdGenerator() const dateKey = Object.keys(entry).find(key => key.includes('date')) - let { artist, authors, backdrop, content, description, image, link, rating, slug, title, url, tags, type } = entry + let { artist, authors, backdrop, content, description, image, link, rating, review, slug, title, url, tags, type } = entry 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.

' const processedEntry = { title: title.trim(), date: new Date(entry[dateKey]), content: description } @@ -54,10 +54,15 @@ export default { url: authors['url'], mastodon: authors?.['mastodon'] || '', rss: authors?.['rss_feed'] || '' - } + }, + processedEntry['excerpt'] = sanitizeHtml(`${md.render(description)}`) } if (description) processedEntry['excerpt'] = description - if (['book', 'movie', 'link'].includes(type)) processedEntry['excerpt'] = sanitizeHtml(`${md.render(description)}`) + if (['book', 'movie'].includes(type) && review) { + processedEntry['excerpt'] = sanitizeHtml(`${md.render(review)}`) + } else if (['book', 'movie'].includes(type)) { + processedEntry['excerpt'] = sanitizeHtml(`${md.render(description)}`) + } if (slug && content) processedEntry['excerpt'] = sanitizeHtml(`${md.render(content)}${feedNote}`, { disallowedTagsMode: 'completelyDiscard' }) diff --git a/package-lock.json b/package-lock.json index bb934045..19c31410 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "24.7.3", + "version": "24.7.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "24.7.3", + "version": "24.7.4", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.5.0", @@ -1743,9 +1743,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.17", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.17.tgz", - "integrity": "sha512-Q6Q+04tjC2KJ8qsSOSgovvhWcv5t+SmpH6/YfAWmhpE5/r+zw6KQy1/yWVFFNyEBvy68twTTXr2d5eLfCq7QIw==", + "version": "1.5.18", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz", + "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==", "dev": true, "license": "ISC" }, diff --git a/package.json b/package.json index 3468ed7e..f39d8041 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "24.7.3", + "version": "24.7.4", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "scripts": { diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index 24e36f5e..dd6c46e0 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -470,7 +470,6 @@ article { display: block; color: var(--gray-dark); font-size: var(--font-size-sm); - margin-right: var(--spacing-xs); } } @@ -489,6 +488,7 @@ ul, ol { /* images */ .image-banner { border: var(--border-default); + border-radius: var(--border-radius-slight); height: auto; width: 100%; display: block; diff --git a/src/assets/styles/feed.xsl b/src/assets/styles/feed.xsl index bfac7b55..afbaa469 100644 --- a/src/assets/styles/feed.xsl +++ b/src/assets/styles/feed.xsl @@ -7,356 +7,9 @@ <xsl:value-of select="/rss/channel/title"/> - + - +
diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css index d99408bb..e4120c71 100644 --- a/src/assets/styles/index.css +++ b/src/assets/styles/index.css @@ -18,6 +18,7 @@ @import url('./pages/books.css') layer(page); @import url('./pages/blogroll.css') layer(page); @import url('./pages/contact.css') layer(page); +@import url('./pages/feeds.css') layer(page); @import url('./pages/links.css') layer(page); @import url('./pages/music.css') layer(page); @import url('./pages/post.css') layer(page); diff --git a/src/assets/styles/pages/feeds.css b/src/assets/styles/pages/feeds.css new file mode 100644 index 00000000..b31cc7b1 --- /dev/null +++ b/src/assets/styles/pages/feeds.css @@ -0,0 +1,47 @@ +.feed { + & .item { + &:not(:last-of-type) { + border-bottom: var(--border-gray); + margin-bottom: var(--spacing-base); + padding-bottom: var(--spacing-base); + } + + & .date { + display: block; + color: var(--gray-dark); + font-size: var(--font-size-sm); + margin-bottom: 0; + } + + & h3 { + margin-top: 0; + } + + & img { + border: var(--border-default); + border-radius: var(--border-radius-slight); + height: auto; + width: 100%; + display: block; + margin-top: var(--sizing-base); + } + } + + & p { + &:first-of-type { + margin-top: 0; + } + + &:last-of-type { + margin-bottom: 0; + } + } + + & ol > li p { + display: inline; + } + + & footer { + padding-bottom: var(--spacing-3xl); + } +} \ No newline at end of file diff --git a/src/assets/styles/pages/post.css b/src/assets/styles/pages/post.css index 9d2d2d75..c07ab3a1 100644 --- a/src/assets/styles/pages/post.css +++ b/src/assets/styles/pages/post.css @@ -13,7 +13,6 @@ youtube-video + .associated-media { .footnotes { & .footnotes-list { margin-bottom: 0; - padding-left: 0; & li:last-child { margin-bottom: 0; diff --git a/src/assets/styles/plugins/prism.css b/src/assets/styles/plugins/prism.css index eb4399e3..39de8db2 100644 --- a/src/assets/styles/plugins/prism.css +++ b/src/assets/styles/plugins/prism.css @@ -1,5 +1,5 @@ -code[class*="language-"], -pre[class*="language-"] { +code, +pre { color: var(--blue-200); background: none; border-radius: var(--border-radius-slight); @@ -15,7 +15,7 @@ pre[class*="language-"] { hyphens: none; } -pre[class*="language-"] { +pre { padding: var(--spacing-lg); margin: var(--sizing-xl) 0; overflow: auto; @@ -23,7 +23,7 @@ pre[class*="language-"] { border: 1px solid var(--gray-200); } -:not(pre) > code[class*="language-"] { +:not(pre) > code { padding: var(--spacing-xs); white-space: normal; background: var(--gray-1000); diff --git a/src/includes/partials/feeds/rss.liquid b/src/includes/partials/feeds/rss.liquid index feb74d30..ee98da8e 100644 --- a/src/includes/partials/feeds/rss.liquid +++ b/src/includes/partials/feeds/rss.liquid @@ -11,7 +11,7 @@ <![CDATA[{{ title }}]]> {{ permalink | absoluteUrl }} - {{ "https://cdn.coryd.dev/" | append: globals.feed_image | append: "?class=w200&v=" | append: appVersion }} + {{ "https://cdn.coryd.dev/" | append: globals.feed_image | append: "?class=w200" }} 144 144 diff --git a/src/pages/feeds/rss/album-releases.liquid b/src/pages/feeds/rss/album-releases.liquid index 284088e7..a6e8e703 100644 --- a/src/pages/feeds/rss/album-releases.liquid +++ b/src/pages/feeds/rss/album-releases.liquid @@ -10,5 +10,4 @@ permalink: "/feeds/album-releases" globals:globals data:releases updated:releases[0].release_date - appVersion:appVersion %} \ No newline at end of file diff --git a/src/pages/feeds/rss/all.liquid b/src/pages/feeds/rss/all.liquid index 7d2d5a7c..65172ab0 100644 --- a/src/pages/feeds/rss/all.liquid +++ b/src/pages/feeds/rss/all.liquid @@ -9,5 +9,4 @@ permalink: "/feeds/all" globals:globals data:collections.allContent updated:collections.allContent[0].date - appVersion:appVersion %} \ No newline at end of file diff --git a/src/pages/feeds/rss/books.liquid b/src/pages/feeds/rss/books.liquid index e45f3719..2870e31f 100644 --- a/src/pages/feeds/rss/books.liquid +++ b/src/pages/feeds/rss/books.liquid @@ -11,5 +11,4 @@ permalink: "/feeds/books" data:bookData updated:bookData[0].date utm_campaign:"books_feed" - appVersion:appVersion %} \ No newline at end of file diff --git a/src/pages/feeds/rss/links.liquid b/src/pages/feeds/rss/links.liquid index cbb99388..992af611 100644 --- a/src/pages/feeds/rss/links.liquid +++ b/src/pages/feeds/rss/links.liquid @@ -9,5 +9,4 @@ permalink: "/feeds/links" globals:globals data:links updated:links[0].date - appVersion:appVersion %} \ No newline at end of file diff --git a/src/pages/feeds/rss/movies.liquid b/src/pages/feeds/rss/movies.liquid index 1d5d77c1..d243906f 100644 --- a/src/pages/feeds/rss/movies.liquid +++ b/src/pages/feeds/rss/movies.liquid @@ -10,5 +10,4 @@ permalink: "/feeds/movies" data:movies.recentlyWatched updated:movies.recentlyWatched[0].lastWatched utm_campaign:"movies_feed" - appVersion:appVersion %} \ No newline at end of file diff --git a/src/pages/feeds/rss/posts.liquid b/src/pages/feeds/rss/posts.liquid index 8bca875e..eed1b221 100644 --- a/src/pages/feeds/rss/posts.liquid +++ b/src/pages/feeds/rss/posts.liquid @@ -10,5 +10,4 @@ permalink: "/feeds/posts" data:posts updated:posts[0].date utm_campaign:"posts_feed" - appVersion:appVersion %} \ No newline at end of file