From 3075a0499eec60ad09fccf01ac14ee9c110b0e94 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sat, 6 Apr 2024 09:31:01 -0700 Subject: [PATCH] fix: date format --- .env | 3 +- _redirects | 10 ++- api/event.js | 64 ------------------- cache/jsonfeed-to-mastodon-timestamp.json | 2 +- cache/jsonfeed-to-mastodon.json | 11 ++++ config/filters/index.js | 4 +- netlify.toml | 7 +- package.json | 2 +- src/_data/analytics.js | 16 ++--- src/_includes/base.liquid | 8 +-- src/assets/scripts/index.js | 6 -- src/pages/blogroll.html | 2 +- src/pages/contact.md | 2 +- src/pages/referrals.md | 13 ++-- src/pages/search.html | 2 +- src/pages/tag-list.html | 2 +- src/pages/uses.md | 11 ++-- .../apple-centric-digital-privacy-tools.md | 2 +- src/posts/2022/migrating-to-fastmail.md | 2 +- ...ptimizing-for-performance-with-eleventy.md | 2 +- 20 files changed, 53 insertions(+), 118 deletions(-) delete mode 100644 api/event.js delete mode 100644 src/assets/scripts/index.js diff --git a/.env b/.env index 0f78cc71..72358a64 100644 --- a/.env +++ b/.env @@ -2,7 +2,8 @@ ACCESS_KEY_B2= SECRET_KEY_B2= BUCKET_B2= API_KEY_LASTFM= -API_KEY_FATHOM= +SITE_ID_CLICKY= +SITE_KEY_CLICKY= API_KEY_TRAKT= API_KEY_MOVIEDB= API_TOKEN_READWISE= diff --git a/_redirects b/_redirects index 8d5d6488..812d79e6 100644 --- a/_redirects +++ b/_redirects @@ -37,6 +37,9 @@ /assets/img/social-preview/adding-a-light/dark-theme-toggle-preview.jpeg /assets/img/social-preview/adding-a-light-dark-theme-toggle-preview.jpeg 301! /assets/img/social-preview/go-ahead-and-block-ai-web- /assets/img/social-preview/go-ahead-and-block-ai-web-crawlers-preview.jpeg 301! /-want-anything-your-ai-generates/ /posts/2024/i-dont-want-anything-your-ai-generates/ 301! +/4afe62271e477e.js http://static.getclicky.com/js?in=/2842c5ddc46e5 200 +/4dcb93321b2a3b https://in.getclicky.com/in.php 200 +/404ca498061b54 http://in.getclicky.com/101449513ns.gif 200 # 400s /wp-* /400/ 400 @@ -95,4 +98,9 @@ https://cdme.netlify.app https://coryd.dev 301! /links.xml https://feedpress.me/coryd-links /links.json https://feedpress.me/coryd-links.json /follow.xml https://feedpress.me/coryd-follow -/follow.json https://feedpress.me/coryd-follow.json \ No newline at end of file +/follow.json https://feedpress.me/coryd-follow.json + +# analytics +/23af0256fe76a.js http://static.getclicky.com/js?in=/2842c5ddc46e5 200 +/2842c5ddc46e5 https://in.getclicky.com/in.php 200 +/7afb285ad050d http://in.getclicky.com/101449513ns.gif 200 \ No newline at end of file diff --git a/api/event.js b/api/event.js deleted file mode 100644 index e12ed833..00000000 --- a/api/event.js +++ /dev/null @@ -1,64 +0,0 @@ -import crypto from 'node:crypto' -import { getStore } from '@netlify/blobs' - -export default async (request, context) => { - const params = new URL(request['url']).searchParams - const ns = params.get('ns') - const site = params.get('site') - const page = params.get('page') - const ignore = params.get('ignore') - const setUrl = (id, event) => { - let url = `https://cdn.usefathom.com/?h=${encodeURIComponent(site)}&p=${encodeURIComponent(page)}&sid=CWSVCDJC&cid=${id}` - if (event) url = `${url}&name=${encodeURIComponent(event)}` - return url - } - const lang = decodeURIComponent(params.get('lang')) - const nav = decodeURIComponent(params.get('nav')) - const notLang = !lang || lang === 'null' || lang === 'undefined' - const notNav = !nav || nav === 'null' || nav === 'undefined' - const acceptLanguage = notLang ? request['headers'].get('accept-language') : lang - const userAgent = notNav ? request['headers'].get('user-agent') : nav - const headers = { - 'Accept-Language': acceptLanguage, - 'User-Agent': userAgent - } - const id = crypto.createHash('md5').update(`${context['ip']}${context['geo']['city']}${context['geo']['latitude']}${context['geo']['longitude']}${userAgent}`).digest('hex') - let url = setUrl(id) - const ids = getStore('ids') - let userId = await ids.get(id) - - if (ignore) return new Response(JSON.stringify({ - status: 'accepted', - }), - { headers: { "Content-Type": "application/json" } } - ) - - if (!userId) await ids.set(id, id) - userId = await ids.get(id) - - if (ns) { - url = setUrl(userId, `noscript visit: ${page}`) - } else { - url = setUrl(userId, `Blocked visit: ${page}`) - } - - fetch(url, { headers }) - .then((data) => { - console.log(data); - return {} - }) - .catch((err) => { - console.log(err) - return {} - }) - - return new Response(JSON.stringify({ - status: 'success', - }), - { headers: { "Content-Type": "application/json" } } - ) -} - -export const config = { - path: "/api/event", -} \ No newline at end of file diff --git a/cache/jsonfeed-to-mastodon-timestamp.json b/cache/jsonfeed-to-mastodon-timestamp.json index 40b8a95b..76ee57fa 100644 --- a/cache/jsonfeed-to-mastodon-timestamp.json +++ b/cache/jsonfeed-to-mastodon-timestamp.json @@ -1,3 +1,3 @@ { - "timestamp": 1712354595844 + "timestamp": 1712433804875 } \ No newline at end of file diff --git a/cache/jsonfeed-to-mastodon.json b/cache/jsonfeed-to-mastodon.json index 888b7038..9bd707c8 100644 --- a/cache/jsonfeed-to-mastodon.json +++ b/cache/jsonfeed-to-mastodon.json @@ -12160,5 +12160,16 @@ "https://social.lol/users/cory/statuses/112220870787786575" ], "lastTootTimestamp": 1712354595838 + }, + "https://manuelmoreale.com/@/page/rC9gqrAr9ff2v2xk": { + "id": "aHR0cHM6Ly9tYW51ZWxtb3JlYWxlLmNvbS9AL3BhZ2UvckM5Z3FyQXI5ZmYydjJ4aw==", + "title": "🔗: P&B: Matt Stein", + "url": "https://manuelmoreale.com/@/page/rC9gqrAr9ff2v2xk", + "content_text": "🔗: P&B: Matt Stein #Tech #Blogging #WebDev https://manuelmoreale.com/@/page/rC9gqrAr9ff2v2xk", + "date_published": "Fri, 05 Apr 2024 10:58:00 GMT", + "toots": [ + "https://social.lol/users/cory/statuses/112226061832057528" + ], + "lastTootTimestamp": 1712433804869 } } \ No newline at end of file diff --git a/config/filters/index.js b/config/filters/index.js index df429c49..9dc3ec7b 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -47,10 +47,10 @@ export default { getPopularPosts: (posts, analytics) => { return posts .filter((post) => { - if (analytics.find((p) => p.pathname === post.url)) return true + if (analytics.find((p) => p.url.includes(post.url))) return true }) .sort((a, b) => { - const visitors = (page) => analytics.filter((p) => p.pathname === page.url).pop().visitors + const visitors = (page) => analytics.filter((p) => p.url.includes(page.url)).pop().value return visitors(b) - visitors(a) }) }, diff --git a/netlify.toml b/netlify.toml index e2ae1662..41673e1f 100644 --- a/netlify.toml +++ b/netlify.toml @@ -72,11 +72,6 @@ for = "/api/search" [headers.values] Content-Type = "application/json" -[[headers]] -for = "/api/event" - [headers.values] - Content-Type = "application/json" - [[headers]] for = "/blogroll.opml" [headers.values] @@ -88,5 +83,5 @@ for = "/blogroll.opml" Content-Security-Policy = "upgrade-insecure-requests; block-all-mixed-content;" X-Frame-Options = "DENY" X-XSS-Protection = "1; mode=block" - Referrer-Policy = "strict-origin-when-cross-origin" + Referrer-Policy = "strict-origin-when-cross-origin, no-referrer-when-downgrade" Permissions-Policy = "autoplay=(), camera=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), publickey-credentials-get=()" \ No newline at end of file diff --git a/package.json b/package.json index 490ca919..29144887 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "9.6.3", + "version": "9.6.4", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/analytics.js b/src/_data/analytics.js index 322cb3fa..8f12397d 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -1,18 +1,14 @@ import EleventyFetch from '@11ty/eleventy-fetch' export default async function () { - const API_KEY_FATHOM = process.env.API_KEY_FATHOM - const url = - 'https://api.usefathom.com/v1/aggregations?entity=pageview&entity_id=CWSVCDJC&aggregates=pageviews&field_grouping=pathname&sort_by=pageviews:desc&limit=10' + const SITE_ID_CLICKY = process.env.SITE_ID_CLICKY + const SITE_KEY_CLICKY = process.env.SITE_KEY_CLICKY + const url = `https://api.clicky.com/api/stats/4?site_id=${SITE_ID_CLICKY}&sitekey=${SITE_KEY_CLICKY}&type=pages&output=json` const res = EleventyFetch(url, { duration: '1h', type: 'json', - fetchOptions: { - headers: { - Authorization: `Bearer ${API_KEY_FATHOM}`, - }, - }, }).catch() - const pages = await res - return pages.filter((p) => p.pathname.includes('posts')) + const data = await res + const pages = data[0].dates[0].items + return pages.filter((p) => p.url.includes('posts')) } \ No newline at end of file diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 4a52b76e..08d832d0 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -15,11 +15,7 @@ {% render "../assets/styles/index.css" %} {% endcapture %} - {% capture js %} - {% render "../assets/scripts/index.js" %} - {% endcapture %} - - + @@ -91,7 +87,7 @@ {% endif %} diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js deleted file mode 100644 index 42b1bf00..00000000 --- a/src/assets/scripts/index.js +++ /dev/null @@ -1,6 +0,0 @@ -let ignore = window?.localStorage?.getItem('ignore') -let urlBase = 'https://coryd.dev/api/event/' -let params = `site=${encodeURIComponent(window.location.origin)}&page=${encodeURIComponent(window.location.pathname)}&lang=${encodeURIComponent(navigator.language)}&nav=${encodeURIComponent(navigator.userAgent)}` -let url = `${urlBase}?${params}`; -if (ignore) url = `${urlBase}?ignore=${ignore}&${params}` -if (!window.fathom) fetch(url).then(() => {}).catch(() => {}); \ No newline at end of file diff --git a/src/pages/blogroll.html b/src/pages/blogroll.html index 1098c407..72cf264c 100644 --- a/src/pages/blogroll.html +++ b/src/pages/blogroll.html @@ -9,7 +9,7 @@ description: 'These are awesome blogs that I enjoy and you may enjoy too.' {% endcapture %}

{{ title }}

-

You can download an OPML file containing all of these feeds and import them into your RSS reader.

+

You can download an OPML file containing all of these feeds and import them into your RSS reader.

{% for blog in blogroll %}
diff --git a/src/pages/contact.md b/src/pages/contact.md index c524e1fd..f7848a36 100644 --- a/src/pages/contact.md +++ b/src/pages/contact.md @@ -21,7 +21,7 @@ description: 'How to contact me.'
  • File an issue on the appropriate repo over at GitHub
    • -
    + diff --git a/src/pages/referrals.md b/src/pages/referrals.md index a97ab0d0..e8ea3e8c 100644 --- a/src/pages/referrals.md +++ b/src/pages/referrals.md @@ -9,11 +9,10 @@ description: 'Referral links for services that I use.' Referral links for services I use. I save some money, and you do as well if you choose to use them. \ No newline at end of file diff --git a/src/pages/search.html b/src/pages/search.html index 0672c825..6bae31c0 100644 --- a/src/pages/search.html +++ b/src/pages/search.html @@ -36,7 +36,7 @@ permalink: /search.html const query = $input.value const results = (query.length > 1) ? getSearchResults(query) : [] if (query === '') renderSearchResults([]) - if (results && window.fathom) fathom?.trackEvent(`Search query: ${query}`) + if (results && window.clicky) clicky.log('/search', query, 'click') renderSearchResults(results) }) diff --git a/src/pages/tag-list.html b/src/pages/tag-list.html index b10329c1..614e2726 100644 --- a/src/pages/tag-list.html +++ b/src/pages/tag-list.html @@ -12,7 +12,7 @@ eleventyComputed: {% for post in posts %}

    {{ post.data.title }}

    diff --git a/src/pages/uses.md b/src/pages/uses.md index f06b1556..a7c97273 100644 --- a/src/pages/uses.md +++ b/src/pages/uses.md @@ -60,12 +60,11 @@ Software and services that I use for work and my own enjoyment.

    Services

    - [HEY](https://hey.com): it's the email service that works best for me and I quite enjoy their calendar. --     Fathom Analytics: privacy-friendly, lightweight and nicely designed analytics. -- NextDNS: a privacy-focused, set it and forget it DNS service. I use their security features on my home network and a profile with strict ad-blocking rules on all of my devices. -- DNSimple: a robust, user-friendly DNS provider and registrar. I moved my domains here after my old provider was acquired. -- Bunny.net: a powerful and affordable CDN. I use it to serve assets on my personal site (most notable my now page — raw assets are fetched by Eleventy and then optimized to webp). +- NextDNS: a privacy-focused, set it and forget it DNS service. I use their security features on my home network and a profile with strict ad-blocking rules on all of my devices. +- DNSimple: a robust, user-friendly DNS provider and registrar. I moved my domains here after my old provider was acquired. +- Bunny.net: a powerful and affordable CDN. I use it to serve assets on my personal site (most notable my now page — raw assets are fetched by Eleventy and then optimized to webp). - [Netlify](https://netlify.com): I use their hosting, forms and webhooks. It's a reliable and feature-rich platform. -- Feedpress: they've been around for a while now and don't change much (nor do they need to), but look no further for reliable, helpful feed analytics. +- Feedpress: they've been around for a while now and don't change much (nor do they need to), but look no further for reliable, helpful feed analytics. - [Kagi](https://kagi.com): the only search engine at this point (or so it seems) that's interested in surfacing quality results. - [Readwise Reader](https://readwise.io/read): an impressive RSS reader that handles all the functionality you'd expect from a read it later app beautifully. It's as powerful as it is flexible. - [forwardemail.net](https://forwardemail.net): a simple and reliable service for forwarding and routing emails from a few of the domains I own. @@ -75,6 +74,6 @@ Software and services that I use for work and my own enjoyment. - [Slack](http://slack.com): I have a family Slack set up to avoid group text messages and am in a few other community Slacks. - [Discord](http://discord.com): I don't _like_ Discord but, for better or worse, it's where some communities I frequent are. - [Backblaze](https://backblaze.com): It backs up my MacBook Air and attached storage drive and I don't have to think about it. -- Proton VPN: a reliable, trustworthy VPN with all of the features you'd expect from such a service. +- Proton: a reliable, trustworthy VPN with all of the features you'd expect from such a service. Check out [uses.tech](https://uses.tech) for more lists like this one. diff --git a/src/posts/2022/apple-centric-digital-privacy-tools.md b/src/posts/2022/apple-centric-digital-privacy-tools.md index 472c8671..a5883ef9 100644 --- a/src/posts/2022/apple-centric-digital-privacy-tools.md +++ b/src/posts/2022/apple-centric-digital-privacy-tools.md @@ -11,7 +11,7 @@ A rundown of privacy tools that work well with Apple's technology ecosystem.