diff --git a/.env b/.env index 04c3f8bb..226168c9 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ API_KEY_LASTFM= API_KEY_TRAKT= API_KEY_WEBMENTIONS_CORYD_DEV= +SECRET_FEED_INSTAPAPER_FAVORITES= \ No newline at end of file diff --git a/src/_data/follow.js b/src/_data/follow.js index 009a88ee..73be7b8b 100644 --- a/src/_data/follow.js +++ b/src/_data/follow.js @@ -2,6 +2,7 @@ module.exports = async function () { const { ActivityFeed } = await import('@11ty/eleventy-activity-feed') const feed = new ActivityFeed() feed.addSource('atom', '📝', 'https://coryd.dev/feed.xml') + // feed.addSource('atom', '🔗', 'https://coryd.dev/links.xml') feed.addSource('rss', '🎥', 'https://letterboxd.com/cdme/rss') feed.addSource('rss', '📖', 'https://oku.club/rss/collection/NvEmF') const entries = feed.getEntries().catch() diff --git a/src/_data/links.js b/src/_data/links.js new file mode 100644 index 00000000..c29b62f5 --- /dev/null +++ b/src/_data/links.js @@ -0,0 +1,24 @@ +const { extract } = require('@extractus/feed-extractor') +const { AssetCache } = require('@11ty/eleventy-fetch') + +module.exports = async function () { + const URL = process.env.SECRET_FEED_INSTAPAPER_LIKES + // noinspection JSCheckFunctionSignatures + const asset = new AssetCache('links_data') + if (asset.isCacheValid('1h')) return await asset.getCachedValue() + const res = await extract(URL, { + getExtraEntryFields: (feedEntry) => { + return { + time: feedEntry['pubDate'] || '', + } + }, + }) + .catch((error) => { + console.log(error.message) + }) + .catch() + const data = res.entries + const links = data.splice(0, 5) + await asset.save(links, 'json') + return links +} diff --git a/src/_includes/feed-links.liquid b/src/_includes/feed-links.liquid new file mode 100644 index 00000000..931a3600 --- /dev/null +++ b/src/_includes/feed-links.liquid @@ -0,0 +1,18 @@ + + + + + {% block title %}Links • Cory Dransfeldt{% endblock %} + + + + + {% block update %}{{ articles[0].date | date: "%Y-%m-%dT%H:%M:%S-08:00" }}{% endblock %} + {{ site.url }} + + {{ site.name }} + {{ site.email }} + + {{ eleventy.generator }} + {% block entries %}{% endblock %} + \ No newline at end of file diff --git a/src/_includes/now.liquid b/src/_includes/now.liquid index 51e2895b..eb023c57 100644 --- a/src/_includes/now.liquid +++ b/src/_includes/now.liquid @@ -3,8 +3,9 @@ layout: main --- {% include "header.liquid" %}
-

- Currently +

+ {% heroicon "solid" "clock" "Currently" "height=28" %} +
Currently

{{ status.emoji }} {{ status.content }}

@@ -26,12 +27,13 @@ layout: main

{{ content }}
-

- Making +

+ {% heroicon "solid" "terminal" "Making" "height=28" %} +
Making

- {% heroicon "solid" "terminal" "Terminal" "width=20 height=20" %} + {% heroicon "solid" "desktop-computer" "Hacking" "width=20 height=20" %} Hacking away on random projects like this page, my blog, and whatever else I can find time for.

@@ -40,8 +42,9 @@ layout: main

{% if artists.size > 0 %} -

- Listening: artists +

+ {% heroicon "solid" "microphone" "Artists" "height=28" %} +
Artists

{% for artist in artists %} @@ -63,8 +66,9 @@ layout: main
{% endif %} {% if albums.size > 0 %} -

- Listening: albums +

+ {% heroicon "solid" "music-note" "Albums" "height=28" %} +
Albums

{% for album in albums %} @@ -86,8 +90,9 @@ layout: main
{% endif %} {% if books.size > 0 %} -

- Reading: books +

+ {% heroicon "solid" "bookmark" "Books" "height=28" %} +
Books

{% for book in books %} @@ -105,9 +110,27 @@ layout: main {% endfor %}
{% endif %} + {% if links.size > 0 %} +

+ {% heroicon "solid" "newspaper" "Links" "height=28" %} +
Links
+

+
+ +
+ {% endif %} {% if movies.size > 0 %} -

- Watching: movies +

+ {% heroicon "solid" "film" "Movies" "height=28" %} +
Movies

{% for movie in movies %} @@ -126,8 +149,9 @@ layout: main
{% endif %} {% if tv.size > 0 %} -

- Watching: tv +

+ {% heroicon "solid" "video-camera" "TV" "height=28" %} +
TV

{% for episode in tv %} diff --git a/src/assets/atom-feed-links.xsl b/src/assets/atom-feed-links.xsl new file mode 100644 index 00000000..8c1442ea --- /dev/null +++ b/src/assets/atom-feed-links.xsl @@ -0,0 +1,80 @@ + + + + + + + + + + <xsl:value-of select="atom:feed/atom:title"/> + + + + + + + + + + +
+
+
+ +

Links • Cory Dransfeldt

+ + + + + + + +
+
+
+

+ + + + Feed preview • links +

+

Recently read and favorited links sourced from the Pinboard API.

+

+
+
    + +
+
+
+
+

This is a web feed, also known as an RSS or Atom feed.

+

Subscribe by copying the URL from the address bar into your newsreader.

+
+ Visit About Feeds to get started with newsreaders and subscribing. It's free. +
+
+
+ + + + +
  • + + + + + + • +
    • +     +     \ No newline at end of file diff --git a/src/feeds.md b/src/feeds.md index b78deed5..aafdab4f 100644 --- a/src/feeds.md +++ b/src/feeds.md @@ -25,4 +25,5 @@ class="m-0 text-xl font-black leading-tight tracking-normal dark:text-gray-200 m - Posts ([RSS](/feed.xml) • [JSON](/feed.json)): a feed of all of my blog posts. +- Links ([RSS](/links.xml) • [JSON](/links.json)): a feed of links I've liked on Instapaper. - Follow ([JSON](/follow.json)): a JSON feed of my web activity comprised of blog posts, links, movies and books (using the same data sources as [my now page](/now)). diff --git a/src/feeds/links.liquid b/src/feeds/links.liquid new file mode 100644 index 00000000..b39f7f94 --- /dev/null +++ b/src/feeds/links.liquid @@ -0,0 +1,19 @@ +--- +layout: null +permalink: /links.xml +--- +{% layout "./_includes/feed-links.liquid" %} +{% block title %}Links • Cory Dransfeldt{% endblock %} +{% block self %}links.xml{% endblock %} +{% block update %}{{ articles[0].time | date: "%Y-%m-%dT%H:%M:%S-08:00" }}{% endblock %} +{% block entries %} +{% for link in links %} + + {{ link.description | escape }} + + {{ link.time | date: "%m.%d.%Y" }} + {{ link.href }} + + +{% endfor %} +{% endblock %} \ No newline at end of file diff --git a/src/follow-feed.11ty.js b/src/follow-feed.11ty.js index d484f9ce..77d34fe5 100644 --- a/src/follow-feed.11ty.js +++ b/src/follow-feed.11ty.js @@ -10,6 +10,7 @@ module.exports = class { const feed = new ActivityFeed() feed.addSource('atom', '📝', 'https://coryd.dev/feed.xml') + // feed.addSource('atom', '🔗', 'https://coryd.dev/links.xml') feed.addSource('rss', '🎥', 'https://letterboxd.com/cdme/rss') feed.addSource('rss', '📖', 'https://oku.club/rss/collection/NvEmF') diff --git a/src/links.11ty.liquid b/src/links.11ty.liquid new file mode 100644 index 00000000..efdc214a --- /dev/null +++ b/src/links.11ty.liquid @@ -0,0 +1,20 @@ +--- +permalink: '/links.json' +--- +{ +"version": "https://jsonfeed.org/version/1", +"title": "Links • Cory Dransfeldt", +"icon": "https://coryd.dev/static/images/avatar.webp", +"home_page_url": "https://coryd.dev", +"feed_url": "https://coryd.dev/links.json", +"items": [{% for link in links %} + { + "id": "{{ link.href }}", + "title": "{{ link.description | escape }}", + "url": "{{ link.href }}", + "content_text": "", + "date_published": "{{ link.time | date: "%Y-%m-%dT%H:%M:%S-08:00" }}" + }{% if not forloop.last %},{% endif %} +{% endfor %} +] +} \ No newline at end of file diff --git a/vercel.json b/vercel.json index 3e89079a..abdaa9ce 100644 --- a/vercel.json +++ b/vercel.json @@ -16,6 +16,19 @@ } ] }, + { + "source": "/links.xml", + "headers": [ + { + "key": "Content-Type", + "value": "application/xml; charset=utf-8 # not application/rss+xml" + }, + { + "key": "x-content-type-options", + "value": "nosniff" + } + ] + }, { "source": "/.well-known/webfinger", "headers": [