From 8e93412d7a9a3c8aaa572382b3834f197e1528f0 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt <cory.dransfeldt@gmail.com> Date: Wed, 23 Aug 2023 15:48:44 -0700 Subject: [PATCH] chore: links + grammar --- cache/jsonfeed-to-mastodon-timestamp.json | 2 +- cache/jsonfeed-to-mastodon.json | 11 +++++++++++ src/_data/fathom.js | 24 ----------------------- src/_data/follow.js | 4 +++- src/_includes/base.liquid | 2 +- src/_includes/partials/now-topper.liquid | 9 +++++++-- src/about.md | 2 +- src/feeds/all.liquid | 10 +++++++--- 8 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 src/_data/fathom.js diff --git a/cache/jsonfeed-to-mastodon-timestamp.json b/cache/jsonfeed-to-mastodon-timestamp.json index a68180b6..859cf405 100644 --- a/cache/jsonfeed-to-mastodon-timestamp.json +++ b/cache/jsonfeed-to-mastodon-timestamp.json @@ -1,3 +1,3 @@ { - "timestamp": 1692720189860 + "timestamp": 1692907388701 } \ No newline at end of file diff --git a/cache/jsonfeed-to-mastodon.json b/cache/jsonfeed-to-mastodon.json index b0f736cf..bdc6f972 100644 --- a/cache/jsonfeed-to-mastodon.json +++ b/cache/jsonfeed-to-mastodon.json @@ -5885,5 +5885,16 @@ "https://social.lol/users/cory/statuses/110934110358697654" ], "lastTootTimestamp": 1692720189854 + }, + "https://letterboxd.com/cdme/film/along-came-a-spider/": { + "id": "https://letterboxd.com/cdme/film/along-came-a-spider/", + "title": "🎥: Along Came a Spider, 2001 - ★★", + "url": "https://letterboxd.com/cdme/film/along-came-a-spider/", + "content_text": "🎥: Along Came a Spider, 2001 - ★★ https://letterboxd.com/cdme/film/along-came-a-spider/", + "date_published": "2023-08-24T19:42:06-08:00", + "toots": [ + "https://social.lol/users/cory/statuses/110946378622156067" + ], + "lastTootTimestamp": 1692907388697 } } \ No newline at end of file diff --git a/src/_data/fathom.js b/src/_data/fathom.js deleted file mode 100644 index 28c3cc6d..00000000 --- a/src/_data/fathom.js +++ /dev/null @@ -1,24 +0,0 @@ -const fs = require('fs') -const fetch = require('node-fetch') - -module.exports = async function () { - const sourceUrl = 'https://cdn.usefathom.com/script.js' - - fetch(sourceUrl) - .then((response) => response.text()) - .then((sourceContent) => { - if (!sourceContent.includes('fathomScript.src.indexOf("cdn.usefathom.com")')) - throw new Error('Fathom script changed!') - const modifiedContent = sourceContent.replace( - 'fathomScript.src.indexOf("cdn.usefathom.com")', - 'fathomScript.src.indexOf("coryd.dev")' - ) - const newFilePath = './_site/script.js' - fs.writeFile(newFilePath, modifiedContent, (err) => { - if (err) console.log(err) - }) - }) - .catch((err) => { - console.error('Error downloading the file:', err) - }) -} diff --git a/src/_data/follow.js b/src/_data/follow.js index 8abf9a21..820088ab 100644 --- a/src/_data/follow.js +++ b/src/_data/follow.js @@ -12,7 +12,9 @@ module.exports = async function () { activity.posts.push({ id: entry.url, title: entry.title, - url: entry.url, + url: entry.url.includes('coryd.dev') + ? `${entry.url}?utm_campaign=syndication&utm_source=follow` + : entry.url, content_html: entry.content || '', date_published: entry.published, }) diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index ceed4b7f..c6d1f057 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -56,7 +56,7 @@ {% jsonLd meta, type, tags %} </script> <script - src="{{ site.url }}/script.js?v={% version %}" + src="https://cdn.usefathom.com/script.js" data-site="RBCOWZTA" defer></script> <noscript> diff --git a/src/_includes/partials/now-topper.liquid b/src/_includes/partials/now-topper.liquid index 30015e12..d1f2da6e 100644 --- a/src/_includes/partials/now-topper.liquid +++ b/src/_includes/partials/now-topper.liquid @@ -5,10 +5,15 @@ </a> </h2> <div class="dark:text-white text-gray-800"> - <p>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.</p> + <p>I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 4 rescue dogs, technology, automation, + <a href="https://www.last.fm/user/cdrn_" rel="noopener noreferrer">music</a>, writing, + <a href="https://www.goodreads.com/user/show/168570560-cory-dransfeldt" rel="noopener noreferrer">reading</a>, + <a href="https://trakt.tv/users/cdransf" rel="noopener noreferrer">tv</a> + and + <a href="https://letterboxd.com/cdme" rel="noopener noreferrer">movies</a>.</p> <p class="mb-0 flex flex-row items-start md:items-center"> <span class="pt-1 md:pt-0 mr-1">{{ status.emoji }}</span> <span>{{ status.content }}</span> </p> </div> -</div> +</div> \ No newline at end of file diff --git a/src/about.md b/src/about.md index 3a49ada0..09fc8268 100644 --- a/src/about.md +++ b/src/about.md @@ -25,7 +25,7 @@ meta: </div> <h1 class="text-xxl font-black -leading-tight tracking-normal dark:text-gray-200 md:text-3xl text-center">Hi, I'm Cory</h1> -I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 4 rescue dogs, technology, automation, <a href="https://www.last.fm/user/cdrn_" rel="noopener noreferrer">music</a>, writing, <a href="/now" rel="noopener noreferrer">reading</a> and <a href="https://trakt.tv/users/cdransf" rel="noopener noreferrer">tv</a> and <a href="https://letterboxd.com/cdme" rel="noopener noreferrer">movies</a>. +I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 4 rescue dogs, technology, automation, <a href="https://www.last.fm/user/cdrn_" rel="noopener noreferrer">music</a>, writing, <a href="https://www.goodreads.com/user/show/168570560-cory-dransfeldt" rel="noopener noreferrer">reading</a> and <a href="https://trakt.tv/users/cdransf" rel="noopener noreferrer">tv</a> and <a href="https://letterboxd.com/cdme" rel="noopener noreferrer">movies</a>. I build, maintain and design web applications. I've been coding professionally since 2010 with a focus on frontend technologies. diff --git a/src/feeds/all.liquid b/src/feeds/all.liquid index 6312c3ac..5e936c78 100644 --- a/src/feeds/all.liquid +++ b/src/feeds/all.liquid @@ -5,13 +5,17 @@ permalink: /feed.xml {% layout "./_includes/feeds/feed.liquid" %} {% block title %}All posts • Cory Dransfeldt{% endblock %} {% block self %}feed.xml{% endblock %} -{% block update %}{{ collections.posts[0].date | date: "%Y-%m-%dT%H:%M:%S-08:00" }}{% 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 %} + {% capture entry_link %} + {{ site.url }}{{ post.url }}?utm_campaign=syndication&utm_source=rss + {% endcapture %} <entry> <title>{{ post.data.title }}</title> - <link href="{{ site.url }}{{ post.url }}" /> + <link href="{{ entry_link | encodeAmp }}" /> <updated>{{ post.date | date: "%m.%d.%Y" }}</updated> <id>{{ site.url }}{{ post.url }}</id> <content type="html"> @@ -19,4 +23,4 @@ permalink: /feed.xml </content> </entry> {% endfor %} -{% endblock %} +{% endblock %} \ No newline at end of file