cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: myriad feed fixes

Browse source
This commit is contained in:
Cory Dransfeldt 2024-08-10 16:15:22 -07:00
parent 189c5b90d5
commit 7e55338697
No known key found for this signature in database
20 changed files with 82 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
config/filters/index.js
View file

@ -120,6 +120,7 @@ export default {
const md = mdGenerator()
let excerpt = ''
let url = ''
let author
let title = entry.title
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>'
@ -128,7 +129,13 @@ export default {
if (entry?.slug) url = new URL(entry.slug, BASE_URL).toString()
if (entry?.link) {
title = `${entry.title} via ${entry.authors.name}`
url = entry.link
url = entry.link,
author = {
name: entry.authors.name,
url: entry.authors.url,
mastodon: entry.authors?.mastodon || '',
rss: entry.authors?.rss_feed || ''
}
}
if (entry.description) excerpt = entry.description
if (entry.type === 'book' || entry.type === 'movie' || entry.type === 'link') excerpt = `${entry.description}`
@ -142,7 +149,9 @@ export default {
content: entry.description,
date,
excerpt,
rating: entry?.rating || ''
rating: entry?.rating || '',
tags: entry?.tags || '',
author
})
})
return posts

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "coryd.dev",
"version": "21.9.4",
"version": "21.10.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "coryd.dev",
"version": "21.9.4",
"version": "21.10.0",
"license": "MIT",
"dependencies": {
"@cdransf/api-text": "^1.4.0",

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "coryd.dev",
"version": "21.9.4",
"version": "21.10.0",
"description": "The source for my personal site. Built using 11ty (and other tools).",
"type": "module",
"scripts": {

2
src/assets/styles/feed.xsl
View file

@ -303,7 +303,7 @@
<p><a href="/feeds">View more of the feeds from my site.</a> <strong class="highlight-text">Or subscribe by adding the URL below to your feed reader of choice.</strong></p>
<p>
<pre class="small">
<code><xsl:value-of select="/rss/channel/feedUrl"/></code>
<code><xsl:value-of select="rss/channel/atom:link/@href"/></code>
</pre>
</p>
<hr />

11
src/includes/base.liquid
View file

@ -102,12 +102,11 @@
<link href="https://cdn.coryd.dev/{{ globals.apple_touch_icon }}?class=w200&v={% appVersion %}" rel="apple-touch-icon">
<link rel="webmention" href="https://webmention.io/coryd.dev/webmention" />
<link rel="pingback" href="https://webmention.io/coryd.dev/xmlrpc" />
<link type="application/atom+xml" rel="alternate" title="{{ globals.site_name }}" href="https://feedpress.me/coryd">
<link rel="alternate" type="application/json" title="{{ globals.site_name }}" href="https://feedpress.me/coryd.json" />
<link rel="alternate" href="https://feedpress.me/coryd-links" title="{{ globals.site_name }}'s links feed" type="application/rss+xml">
<link rel="alternate" href="https://feedpress.me/coryd-movies" title="{{ globals.site_name }}'s movies feed" type="application/rss+xml">
<link rel="alternate" href="https://feedpress.me/coryd-books" title="{{ globals.site_name }}'s books feed" type="application/rss+xml">
<link rel="alternate" href="https://feedpress.me/coryd-all" title="{{ globals.site_name }}'s activity feed" type="application/rss+xml">
<link type="application/atom+xml" rel="alternate" title="Posts / {{ globals.site_name }}" href="https://coryd.dev/feeds/posts">
<link rel="alternate" href="https://coryd.dev/feeds/links" title="Links / {{ globals.site_name }}" type="application/rss+xml">
<link rel="alternate" href="https://coryd.dev/feeds/movies" title="Movies / {{ globals.site_name }}'s movies feed" type="application/rss+xml">
<link rel="alternate" href="https://coryd.dev/feeds/books" title="Books / {{ globals.site_name }}" type="application/rss+xml">
<link rel="alternate" href="https://coryd.dev/feeds/all" title="All activity / {{ globals.site_name }}" type="application/rss+xml">
<script defer data-domain="coryd.dev" src="/js/script.js"></script>
<script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
<script type="application/ld+json">

44
src/includes/partials/feeds/json.liquid
View file

@ -1,21 +1,47 @@
{
"version": "https://jsonfeed.org/version/1",
"version": "https://jsonfeed.org/version/1.1",
"title": "{{ title | escape }}",
"home_page_url": "{{ permalink | absoluteUrl: globals.url | escape }}",
"feed_url": "{{ permalink | absoluteUrl: globals.url | escape }}.json",
"description": "{{ description | escape }}",
"home_page_url": "{{ permalink | absoluteUrl | escape }}",
"feed_url": "{{ permalink | absoluteUrl | escape }}.json",
"description": "{{ globals.site_description | escape }}",
"icon": "https://cdn.coryd.dev/{{ globals.feed_image | escape }}?class=w200&v={% appVersion %}",
"favicon": "https://cdn.coryd.dev/{{ globals.favicon_ico | escape }}?class=w50&v={% appVersion %}",
"authors": [
{
"name": "{{ globals.site_name }}",
"url": "{{ globals.url | escape }}",
"avatar": "https://cdn.coryd.dev/{{ globals.avatar | escape }}?class=w200&v={% appVersion %}"
}
],
"items": [
{%- assign entries = data | normalizeEntries: 20 -%}
{%- for entry in entries -%}
{%- assign summary = entry.content | strip_html | normalize_whitespace | escape -%}
{
"id": "{{ entry.url | encodeAmp | escape }}",
"title": "{{ entry.title | escape }}{% if entry.authors %} via {{ entry.authors.name | escape }}{% endif %}{% if entry.rating %} ({{ entry.rating | escape }}){% endif %}",
"url": "{{ entry.url | encodeAmp | escape }}",
"title": "{{ entry.title | escape }}{%- if entry.authors %} via {{ entry.authors.name | escape }}{%- endif %}{%- if entry.rating %} ({{ entry.rating | escape }}){%- endif %}",
"content_text": "{{ entry.excerpt | escape | replace: '\"', '\\"' }}",
"date_published": "{{ entry.date | stringToRFC822Date }}"
}{% if forloop.last == false %},{% endif %}
{%- endfor %}
"content_html": "{{ summary }}",
"summary": "{{ summary }}",
{%- if entry.author -%}
"external_url": "{{ entry.url | encodeAmp | escape }}",
"authors": [
{
"name": "{{ entry.author.name | escape }}",
"url": "{{ entry.author.url | escape }}",
"mastodon": "{{ entry.author.mastodon | escape }}",
"rss": "{{ entry.author.feed | escape }}"
}
],
{%- endif %}
"date_published": "{{ entry.date | stringToRFC822Date }}"{%- if entry.tags -%},
"tags": [
{%- for tag in entry.tags -%}
"{{ tag | escape }}"{%- unless forloop.last -%}, {% endunless -%}
{%- endfor -%}
]
{%- endif -%}
}{%- if forloop.last == false -%},{%- endif -%}
{%- endfor -%}
]
}

9
src/includes/partials/feeds/rss.liquid
View file

@ -2,16 +2,15 @@
<?xml-stylesheet href="/assets/styles/feed.xsl" type="text/xsl" ?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<atom:link href="{{ permalink | absoluteUrl: globals.url }}" rel="self" type="application/rss+xml" />
<feedUrl>{{ permalink | absoluteUrl: globals.url }}</feedUrl>
<atom:link href="{{ permalink | absoluteUrl }}" rel="self" type="application/rss+xml" />
{%- assign entries = data | normalizeEntries: 20 -%}
<title><![CDATA[{{ title }}]]></title>
<description><![CDATA[{{ description }}]]></description>
<link>{{ permalink | absoluteUrl: globals.url }}</link>
<description><![CDATA[{{ globals.site_description }}]]></description>
<link>{{ permalink | absoluteUrl }}</link>
<lastBuildDate>{{ updated | stringToRFC822Date }}</lastBuildDate>
<image>
<title><![CDATA[{{ title }}]]></title>
<link>{{ permalink | absoluteUrl: globals.url }}</link>
<link>{{ permalink | absoluteUrl }}</link>
<url>{{ "https://cdn.coryd.dev/" | append: globals.feed_image | append: "?class=w200&amp;v=" | append: appVersion }}</url>
<width>144</width>
<height>144</height>

2
src/pages/dynamic/books/index.html
View file

@ -11,7 +11,7 @@ schema: books
<h2 class="page-header">Currently reading</h2>
<p>Here's what I'm reading at the moment. I've finished <strong class="highlight-text">{{ currentBookCount }} books</strong> this year.</p>
<p>{{ books.years | bookYearLinks }}</p>
{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-books", text: "Subscribe to my books feed or follow along on this page" %}
{% render "partials/blocks/banners/rss.liquid", url: "https://coryd.dev/feeds/books", text: "Subscribe to my books feed or follow along on this page" %}
<hr />
{% for book in bookData %}
{% capture alt %}{{ book.title }} by {{ book.authors }}{% endcapture %}

2
src/pages/dynamic/links.html
View file

@ -10,7 +10,7 @@ permalink: "/links/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}
{% if pagination.pageNumber == 0 %}
<h2 class="page-header">Links</h2>
<p>These are links I've liked or otherwise found interesting. They're all added manually, after having been read and, I suppose, properly considered.</p>
{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-links", text: "Subscribe to my links feed or follow along on this page" %}
{% render "partials/blocks/banners/rss.liquid", url: "https://coryd.dev/feeds/links", text: "Subscribe to my links feed or follow along on this page" %}
<hr />
{% endif %}
<div class="link-grid">

2
src/pages/dynamic/watching/index.html
View file

@ -10,7 +10,7 @@ schema: watching
<h2 class="watching page-header">{{ title }}</h2>
{% render "partials/media/watching/hero.liquid" movie:featuredMovie %}
<p>Here's all of the TV and movies I've been watching presented in what is (hopefully) an organized fashion.</p>
{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-movies", text: "Subscribe to my movies feed or follow along on this page" %}
{% render "partials/blocks/banners/rss.liquid", url: "https://coryd.dev/feeds/movies", text: "Subscribe to my movies feed or follow along on this page" %}
<hr />
<h3 id="movies" class="section-header no-top-margin">
<a class="link-icon" href="/watching/recent/movies">

3
src/pages/feeds/json/all.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/all.json"
{% render "partials/feeds/json.liquid"
permalink:"/feeds/all"
title:"All activity / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:collections.allContent
updated:collections.allContent[0].date
site:site
%}

3
src/pages/feeds/json/books.liquid
View file

@ -7,8 +7,7 @@ permalink: "/feeds/books.json"
{% render "partials/feeds/json.liquid"
permalink:"/feeds/books"
title:"Books / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:bookData
updated:bookData[0].date
site:site
%}

3
src/pages/feeds/json/links.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/links.json"
{% render "partials/feeds/json.liquid"
permalink:"/feeds/links"
title:"Links / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:links
updated:links[0].date
site:site
%}

3
src/pages/feeds/json/movies.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/movies.json"
{% render "partials/feeds/json.liquid"
permalink:"/feeds/movies"
title:"Movies / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:movies.recentlyWatched
updated:movies.recentlyWatched[0].lastWatched
site:site
%}

3
src/pages/feeds/json/feed.liquid → src/pages/feeds/json/posts.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/posts.json"
{% render "partials/feeds/json.liquid"
permalink:"/feeds/posts"
title:"Posts / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:posts
updated:posts[0].date
site:site
%}

3
src/pages/feeds/rss/all.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/all"
{% render "partials/feeds/rss.liquid"
permalink:"/feeds/all"
title:"All activity / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:collections.allContent
updated:collections.allContent[0].date
site:site
%}

3
src/pages/feeds/rss/books.liquid
View file

@ -7,8 +7,7 @@ permalink: "/feeds/books"
{% render "partials/feeds/rss.liquid"
permalink:"/feeds/books"
title:"Books / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:bookData
updated:bookData[0].date
site:site
%}

3
src/pages/feeds/rss/links.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/links"
{% render "partials/feeds/rss.liquid"
permalink:"/feeds/links"
title:"Links / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:links
updated:links[0].date
site:site
%}

3
src/pages/feeds/rss/movies.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/movies"
{% render "partials/feeds/rss.liquid"
permalink:"/feeds/movies"
title:"Movies / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:movies.recentlyWatched
updated:movies.recentlyWatched[0].lastWatched
site:site
%}

3
src/pages/feeds/rss/feed.liquid → src/pages/feeds/rss/posts.liquid
View file

@ -6,8 +6,7 @@ permalink: "/feeds/posts"
{% render "partials/feeds/rss.liquid"
permalink:"/feeds/posts"
title:"Posts / Cory Dransfeldt"
description:globals.site_description
globals:globals
data:posts
updated:posts[0].date
site:site
%}