diff --git a/.env b/.env index db14633d..471ea57b 100644 --- a/.env +++ b/.env @@ -2,7 +2,8 @@ ACCESS_KEY_B2= SECRET_KEY_B2= BUCKET_B2= API_KEY_LASTFM= -API_KEY_PLAUSIBLE= +SITE_ID= +API_KEY_NETLIFY= API_KEY_TRAKT= API_KEY_MOVIEDB= API_TOKEN_READWISE= diff --git a/_redirects b/_redirects index 235ca203..de75734f 100644 --- a/_redirects +++ b/_redirects @@ -2,12 +2,6 @@ /.well-known/host-meta* https://social.lol/.well-known/host-meta:splat 301 /.well-known/nodeinfo* https://social.lol/.well-known/nodeinfo:splat 301 -# rewrites -/favicon.ico /assets/img/favicon/favicon.ico 200! -/apple-touch-icon.png /assets/img/favicon/apple-touch-icon.png 200! -/apple-touch-icon-precomposed.png /assets/img/favicon/apple-touch-icon.png 200! -/static/favicons/apple-touch-icon.png /assets/img/favicon/apple-touch-icon.png 200! - # blog posts /blog/fixing-safari-icloud-syncing /posts/2022/fixing-safari-icloud-syncing/ 301! /blog/migrating-to-fastmail /posts/2022/migrating-to-fastmail/ 301! @@ -27,30 +21,22 @@ /posts/2023/webmentions-in-eleventy/null /posts/2023/webmentions-in-eleventy/ 301! /posts/2023/a-safari-specific-guide-to-making-the-modern-web-suck-less/null /posts/2023/a-safari-specific-guide-to-making-the-modern-web-suck-less/ 301! /posts/2023/hacking-together-a-tweeklyfm-replacement/ /posts/2023/hacking-together-a-tweeklyfm-repalcement/ -/tags/.env /tags/env 301! # 404s +/robot.txt /robots.txt 301! /sitemap.txt /sitemap.xml 301! -/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-card.jpg /assets/img/ogi/default.jpg 301! /posts / 301! /blog / 301! /posts/2024 / 301! -/blog/digital-privacy-tools /posts/2021/digital-privacy-tools/ 301! -/assets/img/social-preview/your-site-your-home-your-web- /assets/img/social-preview/your-site-your-home-your-web-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! +/tags/.env /tags/env 301! /tags/chatgpt/ /tags/ai/ 301! /tags/socialmedia /tags/social%20media/ 301! -/robot.txt /robots.txt 301! +/blog/digital-privacy-tools /posts/2021/digital-privacy-tools/ 301! +/assets/img/social-card.jpg /assets/img/ogi/default.jpg 301! +/assets/img/social-preview/your-site-your-home-your-web- /assets/img/social-preview/your-site-your-home-your-web-preview.jpeg 301! +/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! -/static/images/avatar.png /assets/img/avatar.png 301! -/assets/img/logo.webp /assets/img/avatar.webp 301! -/apple-touch-icon-precomposed.png /assets/icons/apple-touch-icon.png 301! -/apple-touch-icon /assets/icons/apple-touch-icon.png 301! -/static/favicons/apple-touch-icon.png /assets/icons/apple-touch-icon.png 301! -/favicon.ico /assets/icons/favicon.ico 301! -/assets/img/cache/avatar-800w.webp /assets/img/cache/avatar-880w.webp 301! -/assets/img/ogi/default.jpg /assets/img/avatar.webp 301! # 400s /wp-* /400/ 400 @@ -70,13 +56,19 @@ //test/ /400/ 400 # assets +/favicon.ico /assets/icons/favicon.ico 200! +/apple-touch-icon.png /assets/icons/apple-touch-icon.png 200! +/apple-touch-icon /assets/icons/apple-touch-icon.png 200! +/apple-touch-icon-precomposed.png /assets/icons/apple-touch-icon.png 200! +/static/favicons/apple-touch-icon.png /assets/icons/apple-touch-icon.png 200! +/static/images/avatar.png /assets/img/avatar.png 301! /static/images/avatar.webp /assets/img/avatar.webp 301! +/assets/img/cache/avatar-800w.webp /assets/img/cache/avatar-880w.webp 301! /assets/img/favicon/apple-touch-icon.png /assets/icons/apple-touch-icon.png 301! -/apple-touch-icon.png /assets/icons/apple-touch-icon.png 301! -/apple-touch-icon-precomposed.png /assets/icons/apple-touch-icon.png 301! -/favicon.ico /assets/icons/favicon.ico 301! /assets/img/favicon/favicon-32x32.png /assets/icons/favicon.ico 301! /assets/img/favicon/favicon-16x16.png /assets/icons/favicon.ico 301! +/assets/img/logo.webp /assets/img/avatar.webp 301! +/assets/img/ogi/default.jpg /assets/img/avatar.webp 301! # general /articles/ / 301! @@ -101,8 +93,4 @@ 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 - -# analytics -/js/script.js https://plausible.io/js/script.outbound-links.tagged-events.js 200 -/api/event https://plausible.io/api/event 200 \ No newline at end of file +/follow.json https://feedpress.me/coryd-follow.json \ No newline at end of file diff --git a/config/filters/index.js b/config/filters/index.js index 4793cd39..6f9bb6a9 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -47,11 +47,11 @@ export default { getPopularPosts: (posts, analytics) => { return posts .filter((post) => { - if (analytics.find((p) => p.page === post.url)) return true + if (analytics.find((p) => p.resource === post.url)) return true }) .sort((a, b) => { - const visitors = (page) => analytics.filter((p) => p.page === page.url).pop().visitors - return visitors(b) - visitors(a) + const count = (page) => analytics.filter((p) => p.resource === page.url).pop().count + return count(b) - count(a) }) }, diff --git a/package.json b/package.json index d19a5010..60e70a5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "8.4.6", + "version": "8.5.0", "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 36109006..18661548 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -1,18 +1,23 @@ import EleventyFetch from '@11ty/eleventy-fetch' export default async function () { - const API_KEY_PLAUSIBLE = process.env.API_KEY_PLAUSIBLE + const API_KEY_NETLIFY = process.env.API_KEY_NETLIFY + const SITE_ID = process.env.SITE_ID + const endDate = new Date(); + const startDate = new Date(new Date().setDate(endDate.getDate() - 30)); + const timezoneOffset = new Date().getTimezoneOffset() / 60; const url = - 'https://plausible.io/api/v1/stats/breakdown?site_id=coryd.dev&period=6mo&property=event:page&limit=30' + `https://analytics.services.netlify.com/v2/${SITE_ID}/ranking/pages?from=${startDate.getTime()}&to=${endDate.getTime()}&timezone=-0${timezoneOffset}00&limit=50` const res = EleventyFetch(url, { duration: '1h', type: 'json', fetchOptions: { headers: { - Authorization: `Bearer ${API_KEY_PLAUSIBLE}`, + Authorization: `Bearer ${API_KEY_NETLIFY}`, }, }, }).catch() - const pages = await res - return pages.results.filter((p) => p.page.includes('posts')) + const responseObject = await res + const pages = responseObject['data'] + return pages.filter((p) => p.resource.includes('posts')) } diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 530a2541..6e1e2ed1 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -6,8 +6,6 @@ {{ pageTitle }} - - {% capture css %} diff --git a/src/assets/scripts/search.js b/src/assets/scripts/search.js index 495c5ecf..247860fb 100644 --- a/src/assets/scripts/search.js +++ b/src/assets/scripts/search.js @@ -29,7 +29,6 @@ const query = $input.value const results = (query.length > 1) ? getSearchResults(query) : [] if (query === '') renderSearchResults([]) - if (results && plausible) plausible(`Search query: ${query}`) renderSearchResults(results) }) diff --git a/src/pages/404.html b/src/pages/404.html index 1a09d94a..5ff261d8 100644 --- a/src/pages/404.html +++ b/src/pages/404.html @@ -17,9 +17,4 @@ image: /assets/img/404.jpg
{% render "partials/tags.liquid", tags:collections.tagsSortedByCount, hasSpace:true %} {% render "partials/addon-links.liquid", posts:collections.posts, analytics:analytics, links:links %} - - + \ No newline at end of file diff --git a/src/pages/blogroll.html b/src/pages/blogroll.html index 8a29e798..6bf9928a 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/referrals.md b/src/pages/referrals.md index 3cfb7275..a8bd712e 100644 --- a/src/pages/referrals.md +++ b/src/pages/referrals.md @@ -8,11 +8,9 @@ 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 +- [NextDNS](https://nextdns.io/?from=m56mt3z6) +- [DNSimple](https://dnsimple.com/r/3a7cbb9e15df8f) +- [Bunny.net](https://bunny.net?ref=revw3mehej) +- [Feedpress](https://feedpress.com/?affid=34370) +- [Proton](https://pr.tn/ref/X775YX40Z50G) +- [DigitalOcean](https://m.do.co/c/3635bf99aee2) \ No newline at end of file diff --git a/src/pages/uses.md b/src/pages/uses.md index 9290fff9..30dccffb 100644 --- a/src/pages/uses.md +++ b/src/pages/uses.md @@ -60,11 +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. -- 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). -- [Plausible](https://plausible.io): powerful, well-designed and privacy-respecting 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. +- [NextDNS](https://nextdns.io/?from=m56mt3z6): 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](https://dnsimple.com/r/3a7cbb9e15df8f): a robust, user-friendly DNS provider and registrar. I moved my domains here after my old provider was acquired. +- [Bunny.net](https://bunny.net?ref=revw3mehej): 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, webhooks and analytics. It's a reliable and feature-rich platform. +- [Feedpress](https://feedpress.com/?affid=34370): 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. - [Todoist](https://todoist.com): the task manager I always return to for it's flexibility and endless integrations. @@ -75,6 +75,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 VPN](https://pr.tn/ref/X775YX40Z50G): 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 8ae3981a..7e0823f8 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.