From 3fbefc55cdb57867d175f60dcf864288de5ca507 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Tue, 9 May 2023 12:30:25 -0700
Subject: [PATCH] fix: feed data
---
.eleventy.js | 2 --
config/rssLastUpdated.js | 4 ----
src/_data/site.json | 1 +
src/_includes/feed-links.liquid | 9 +++------
src/_includes/feed.liquid | 7 ++-----
src/feeds/all.liquid | 5 ++---
src/feeds/links.liquid | 5 ++---
7 files changed, 10 insertions(+), 23 deletions(-)
delete mode 100644 config/rssLastUpdated.js
diff --git a/.eleventy.js b/.eleventy.js
index 10099f02..95a777b0 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -23,8 +23,6 @@ module.exports = function (eleventyConfig) {
eleventyConfig.addPlugin(activityPubPlugin, {
username: 'hi',
domain: 'coryd.dev',
- outbox: true,
- outboxCollection: 'posts',
alias: {
username: 'cory',
domain: 'social.lol',
diff --git a/config/rssLastUpdated.js b/config/rssLastUpdated.js
deleted file mode 100644
index 2cde1a6d..00000000
--- a/config/rssLastUpdated.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = (collection) => {
- if (!collection || !collection.length) return ''
- return collection[0]['publishedAt']
-}
diff --git a/src/_data/site.json b/src/_data/site.json
index 7037dd9a..8cccd0f3 100644
--- a/src/_data/site.json
+++ b/src/_data/site.json
@@ -1,5 +1,6 @@
{
"name": "Cory Dransfeldt",
+ "email": "hi@coryd.dev",
"url": "https://coryd.dev",
"title": "Cory Dransfeldt",
"description": "I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 4 rescue dogs, technology, automation, music, writing, reading and tv and movies.",
diff --git a/src/_includes/feed-links.liquid b/src/_includes/feed-links.liquid
index 1bb327fe..a8993c29 100644
--- a/src/_includes/feed-links.liquid
+++ b/src/_includes/feed-links.liquid
@@ -5,15 +5,12 @@
{% block title %}Links • Cory Dransfeldt{% endblock %}
</title>
<link href="{{ pkg.homepage }}/links.xml" rel="self" />
- <link href="{{ pkg.homepage }}" />
+ <link href="{{ pkg.homepage }}/" />
<link rel="hub" href="https://pubsubhubbub.superfeedr.com/" />
- <updated>
- {% block update %}
- {{ collections.entries | rssLastUpdatedDate }}{% endblock %}
- </updated>
+ <updated>{% block update %}{{ articles[0].content.library.last_favorited_date | date: "%Y-%m-%dT%H:%M:%S-08:00" }}{% endblock %}</updated>
<id>{{ site.url }}</id>
<author>
- <name>{{ site.author }}</name>
+ <name>{{ site.name }}</name>
<email>{{ site.email }}</email>
</author>
<generator uri="https://11ty.dev" version="{{ eleventy.version }}">{{ eleventy.generator }}</generator>
diff --git a/src/_includes/feed.liquid b/src/_includes/feed.liquid
index d7904408..b220c0a1 100644
--- a/src/_includes/feed.liquid
+++ b/src/_includes/feed.liquid
@@ -7,13 +7,10 @@
<link href="{{ pkg.homepage }}/feed.xml" rel="self" />
<link href="{{ pkg.homepage }}/" />
<link rel="hub" href="https://pubsubhubbub.superfeedr.com/" />
- <updated>
- {% block update %}
- {{ collections.entries | rssLastUpdatedDate }}{% endblock %}
- </updated>
+ <updated>{% block update %}{{ collections.posts[0].date | date: "%Y-%m-%dT%H:%M:%S-08:00" }}{% endblock %}</updated>
<id>{{ site.url }}/</id>
<author>
- <name>{{ site.author }}</name>
+ <name>{{ site.name }}</name>
<email>{{ site.email }}</email>
</author>
<generator uri="https://11ty.dev" version="{{ eleventy.version }}">{{ eleventy.generator }}</generator>
diff --git a/src/feeds/all.liquid b/src/feeds/all.liquid
index 7ba73c43..ca4cc5d1 100644
--- a/src/feeds/all.liquid
+++ b/src/feeds/all.liquid
@@ -5,8 +5,7 @@ permalink: /feed.xml
{% layout "./_includes/feed.liquid" %}
{% block title %}All posts • Cory Dransfeldt{% endblock %}
{% block self %}all.xml{% endblock %}
-{% block update %}
- {{ collections.posts | rssLastUpdatedDate }}{% endblock %}
+{% block update %}{{ collections.posts[0].date | date: "%Y-%m-%dT%H:%M:%S-08:00" }}{% endblock %}
{% block entries %}
{% assign posts = collections.posts | reverse %}
{% for post in posts limit: 15 %}
@@ -20,4 +19,4 @@ permalink: /feed.xml
</content>
</entry>
{% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/feeds/links.liquid b/src/feeds/links.liquid
index 51b5a71a..8d33181a 100644
--- a/src/feeds/links.liquid
+++ b/src/feeds/links.liquid
@@ -5,8 +5,7 @@ permalink: /links.xml
{% layout "./_includes/feed-links.liquid" %}
{% block title %}Links • Cory Dransfeldt{% endblock %}
{% block self %}links.xml{% endblock %}
-{% block update %}
- {{ articles | rssLastUpdatedDate }}{% endblock %}
+{% block update %}{{ articles[0].content.library.last_favorited_date | date: "%Y-%m-%dT%H:%M:%S-08:00" }}{% endblock %}
{% block entries %}
{% assign links = articles | reverse %}
{% for link in links %}
@@ -20,4 +19,4 @@ permalink: /links.xml
</content>
</entry>
{% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}