fix: feed + formatting

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 = '<hr/><p>This is a full text feed, but not all content can be rendered perfectly within the feed. If something looks off, feel free to <a href="https://coryd.dev">visit my site</a> for the original post.</p>'
@@ -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}<br/><br/>` // links where description is stored in frontmatter
       if (entry.type === 'book' || entry.type === 'movie') excerpt = `${entry.description}<br/><br/>` // books
 
       // send full post content to rss
-      if (entry.content) excerpt = sanitizeHtml(`${entry.content}${feedNote}`, {
+      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 || ''

src/_includes/partials/widgets/mastodon-post.liquid

@@ -1,4 +1,4 @@
-{%- assign shareLink = postUrl | findPost: linkPosts -%}
+{%- assign shareLink = postUrl | findPost:linkPosts -%}
 {%- if shareLink %}
 <script type="module" src="/assets/scripts/components/mastodon-post.js"></script>
 <template id="mastodon-post-template">

src/_includes/post.liquid

@@ -1,25 +0,0 @@
----
-layout: main
-schema: blog
----
-{% render "partials/header.liquid", meta: meta, page: page, nav: nav %}
-{%- capture postUrl %}{{ meta.url }}{{ page.url }}{% endcapture -%}
-<div class="default-wrapper">
-  <article class="h-entry">
-    <div class="flex-centered gap-xs icon-small icon-light">
-      {% tablericon "calendar-month" "Date" %}
-      <time class="dt-published" datetime="{{ date }}">
-        {{ date | date: "%B %e, %Y" }}
-      </time>
-    </div>
-    <h2 class="p-name">{{ title }}</h2>
-    <span class="p-author h-card hidden">{{ meta.author }}</span>
-    <div class="p-summary hidden">{{ post.description }}</div>
-    <div class="e-content">
-      {% render "partials/banners/old-post.liquid", date:post.date %}
-      {{ content }}
-    </div>
-  </article>
-</div>
-{% render "partials/widgets/mastodon-post.liquid", postUrl:postUrl, linkPosts:linkPosts %}
-{% render "partials/widgets/addon-links.liquid", posts:posts, analytics:analytics, links:collections.links %}

src/feeds/all.json.liquid

@@ -1,7 +1,7 @@
 ---
 layout: null
 eleventyExcludeFromCollections: true
-permalink: /feeds/all.json
+permalink: "/feeds/all.json"
 ---
 {% render "partials/feeds/json.liquid"
   permalink:'/feeds/all.json'

src/feeds/all.liquid

@@ -1,7 +1,7 @@
 ---
 layout: null
 eleventyExcludeFromCollections: true
-permalink: /feeds/all
+permalink: "/feeds/all"
 ---
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/all"

src/feeds/books.liquid

@@ -1,7 +1,7 @@
 ---
 layout: null
 eleventyExcludeFromCollections: true
-permalink: /feeds/books
+permalink: "/feeds/books"
 ---
 {%- assign bookData = books | bookStatus: 'finished' | bookSortDescending -%}
 {% render "partials/feeds/rss.liquid"

src/feeds/feed.liquid

@@ -1,7 +1,7 @@
 ---
 layout: null
 eleventyExcludeFromCollections: true
-permalink: /feeds/posts
+permalink: "/feeds/posts"
 ---
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/posts"

src/feeds/links.liquid

@@ -1,7 +1,7 @@
 ---
 layout: null
 eleventyExcludeFromCollections: true
-permalink: /feeds/links
+permalink: "/feeds/links"
 ---
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/links"

src/feeds/movies.liquid

@@ -1,7 +1,7 @@
 ---
 layout: null
 eleventyExcludeFromCollections: true
-permalink: /feeds/movies
+permalink: "/feeds/movies"
 ---
 {% render "partials/feeds/rss.liquid"
   permalink:"/feeds/movies"

src/meta/ai.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '/ai.txt'
+permalink: "/ai.txt"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/meta/contribute.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '/contribute.json'
+permalink: "/contribute.json"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/meta/gpc.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '.meta/gpc.json'
+permalink: ".meta/gpc.json"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/meta/humans.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '/humans.txt'
+permalink: "/humans.txt"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/meta/opml.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: /blogroll.opml
+permalink: "/blogroll.opml"
 layout: null
 eleventyExcludeFromCollections: true
 ---

src/meta/robots.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '/robots.txt'
+permalink: "/robots.txt"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/meta/security.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '.well-known/security.txt'
+permalink: ".well-known/security.txt"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/meta/sitemap.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: /sitemap.xml
+permalink: "/sitemap.xml"
 eleventyExcludeFromCollections: true
 ---
 <?xml version="1.0" encoding="utf-8"?>

src/meta/traffic-advice.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '.well-known/traffic-advice'
+permalink: ".well-known/traffic-advice"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/meta/webfinger.liquid

@@ -1,5 +1,5 @@
 ---
-permalink: '.well-known/webfinger'
+permalink: ".well-known/webfinger"
 eleventyExcludeFromCollections: true
 dynamicPermalink: false
 ---

src/pages/main/books/book.html

@@ -4,7 +4,7 @@ pagination:
   data: books
   size: 1
   alias: book
-permalink: /books/{{ book.isbn }}/index.html
+permalink: "/books/{{ book.isbn }}/index.html"
 isbn: {{ book.isbn }}
 schema: book
 ---

src/pages/main/music/artists/artist.html

@@ -4,7 +4,7 @@ pagination:
   data: artists
   size: 1
   alias: artist
-permalink: /music/artists/{{ artist.name_string | slugify | downcase }}-{{ artist.country | slugify | downcase}}/index.html
+permalink: "/music/artists/{{ artist.name_string | slugify | downcase }}-{{ artist.country | slugify | downcase}}/index.html"
 updated: "now"
 schema: artist
 ---

src/pages/main/music/genre.html

@@ -4,7 +4,7 @@ pagination:
   data: genres
   size: 1
   alias: genre
-permalink: /music/genres/{{ genre.name | slugify | downcase }}/index.html
+permalink: "/music/genres/{{ genre.name | slugify | downcase }}/index.html"
 updated: "now"
 schema: genre
 ---