From 6a85167ade0d6c186b470e0363bf9511850900cf Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Thu, 16 Nov 2023 12:28:57 -0800 Subject: [PATCH] fix: resolve conflict --- .env | 3 +- _redirects | 5 ++-- config/filters.js | 4 +-- src/404.html | 7 ++++- src/_data/analytics.js | 33 +++++++-------------- src/_includes/base.liquid | 4 +-- src/_includes/partials/popular-posts.liquid | 4 +-- src/referrals.md | 11 ++++--- src/uses.md | 12 ++++---- 9 files changed, 36 insertions(+), 47 deletions(-) diff --git a/.env b/.env index 6931b148..e112bb86 100644 --- a/.env +++ b/.env @@ -1,9 +1,8 @@ API_KEY_LASTFM= +API_KEY_PLAUSIBLE= API_KEY_TRAKT= API_KEY_MOVIEDB= API_KEY_WEBMENTIONS_CORYD_DEV= API_TOKEN_PINBOARD= -SITE_ID_CLICKY= -SITE_KEY_CLICKY= SECRET_FEED_ALBUM_RELEASES= COOKIE_STORYGRAPH= \ No newline at end of file diff --git a/_redirects b/_redirects index 626a2bf9..6d78d58a 100644 --- a/_redirects +++ b/_redirects @@ -58,6 +58,5 @@ https://cdme.netlify.app https://coryd.dev 301! /follow.json https://feedpress.me/coryd-follow.json # analytics -/4afe62271e477e.js https://static.getclicky.com/js?in=%2F4dcb93321b2a3b 200 -/4dcb93321b2a3b https://in.getclicky.com/in.php 200 -/404ca498061b54 https://in.getclicky.com/101424044ns.gif 200 \ No newline at end of file +/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 diff --git a/config/filters.js b/config/filters.js index e180f50f..d05f08be 100644 --- a/config/filters.js +++ b/config/filters.js @@ -35,10 +35,10 @@ module.exports = { getPopularPosts: (posts, analytics) => { return posts .filter((post) => { - if (analytics.find((p) => p.url.includes(post.url))) return true + if (analytics.find((p) => p.page === post.url)) return true }) .sort((a, b) => { - const visitors = (page) => analytics.filter((p) => p.url.includes(page.url)).pop().rank + const visitors = (page) => analytics.filter((p) => p.page === page.url).pop().visitors return visitors(b) - visitors(a) }) }, diff --git a/src/404.html b/src/404.html index 48122610..96e95eec 100644 --- a/src/404.html +++ b/src/404.html @@ -26,4 +26,9 @@ permalink: 404.html
-{% render "partials/popular-posts.liquid", posts: collections.posts, analytics: analytics %} \ No newline at end of file +{% render "partials/popular-posts.liquid", posts: collections.posts, analytics: analytics %} + \ No newline at end of file diff --git a/src/_data/analytics.js b/src/_data/analytics.js index 13616c3b..200e3da1 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -1,31 +1,18 @@ const EleventyFetch = require('@11ty/eleventy-fetch') module.exports = async function () { - 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&date=last-90-days&output=json` + const API_KEY_PLAUSIBLE = process.env.API_KEY_PLAUSIBLE + const url = + 'https://plausible.io/api/v1/stats/breakdown?site_id=coryd.dev&period=6mo&property=event:page&limit=30' const res = EleventyFetch(url, { duration: '1h', type: 'json', + fetchOptions: { + headers: { + Authorization: `Bearer ${API_KEY_PLAUSIBLE}`, + }, + }, }).catch() - const data = await res - const pages = data[0].dates[0].items - .filter((p) => p.url.includes('posts')) - .filter((p) => !p.url.includes('/null')) - .map((page) => { - return { - title: page.title, - rank: parseInt(page.value), - url: page.url.split('?')[0], - } - }) - const postsObj = {} - pages.forEach((page) => { - if (postsObj[page.url]) { - postsObj[page.url].rank += postsObj[page.url].rank - } else { - postsObj[page.url] = page - } - }) - return Object.values(postsObj) + const pages = await res + return pages.results.filter((p) => p.page.includes('posts')).splice(0, 5) } diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 20549e23..be53706c 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -58,8 +58,8 @@ - - + +