From f0579623095c7fc602b3f876ca71ba27ff6727fd Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Mon, 3 Jun 2024 17:11:18 -0700 Subject: [PATCH] feat: speed up builds; minimize things a bit --- config/filters/index.js | 15 +------- package-lock.json | 17 +++------ package.json | 3 +- src/_data/music.js | 36 ------------------- .../partials/widgets/mastodon-post.liquid | 24 ------------- src/assets/styles/base/index.css | 5 ++- src/feeds/all.json.liquid | 2 +- src/feeds/all.liquid | 2 +- src/pages/main/music/albums/all-time.html | 18 ---------- src/pages/main/music/artists/all-time.html | 18 ---------- src/pages/main/music/index.html | 18 ++-------- src/pages/main/music/tracks/all-time.html | 18 ---------- src/pages/main/posts/post.html | 5 +-- 13 files changed, 17 insertions(+), 164 deletions(-) delete mode 100644 src/_includes/partials/widgets/mastodon-post.liquid delete mode 100644 src/pages/main/music/albums/all-time.html delete mode 100644 src/pages/main/music/artists/all-time.html delete mode 100644 src/pages/main/music/tracks/all-time.html diff --git a/config/filters/index.js b/config/filters/index.js index e9cdf921..139ad0b6 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -91,20 +91,7 @@ export default { }, // links - findPost: (url, posts) => { - if (!url || !posts || !posts[url]?.toots?.[0]?.includes('https')) return null; - const BASE_URL = 'https://social.lol/users/cory/statuses/' - const STATUS_URL = 'https://social.lol/@cory/' - return posts[url]?.toots?.[0]?.replace(BASE_URL, STATUS_URL) || null; - }, - absoluteUrl: (url) => { - try { - return (new URL(url, BASE_URL)).toString() - } catch(e) { - console.error('Error generating absoluteUrl.') - } - return url; - }, + absoluteUrl: (url) => (new URL(url, BASE_URL)).toString(), // feeds normalizeEntries: (entries) => { diff --git a/package-lock.json b/package-lock.json index 665dfa00..67352f77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,17 @@ { "name": "coryd.dev", - "version": "18.8.9", + "version": "18.8.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "18.8.9", + "version": "18.8.10", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", "@cdransf/select-pagination": "^1.3.1", "@cdransf/theme-toggle": "^1.3.2", - "@daviddarnes/mastodon-post": "^1.3.0", "minisearch": "^6.3.0", "youtube-video-element": "^1.1.5" }, @@ -288,12 +287,6 @@ "integrity": "sha512-xjsqvMT9Ee2+IDGeLSG31I0yh2Ebd4QqRfPEVn/VLk7BPB44ONj5f600z2Lor7WHfOmRg7L/bWvwWpPmgUAZ4w==", "license": "MIT" }, - "node_modules/@daviddarnes/mastodon-post": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@daviddarnes/mastodon-post/-/mastodon-post-1.3.0.tgz", - "integrity": "sha512-6AMQ/tl6uI3wXknv8exYJguym/bPHxIW5XOYg7aWCQtMbP4XUDAsWp2pv4o9wtesIF8K7CssNPR93qFOh7D8lw==", - "license": "MIT" - }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", @@ -539,9 +532,9 @@ "peer": true }, "node_modules/@types/node": { - "version": "20.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz", - "integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==", + "version": "20.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz", + "integrity": "sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index e2a1f5b9..bc31c761 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "18.8.10", + "version": "18.9.10", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { @@ -22,7 +22,6 @@ "@cdransf/api-text": "^1.4.0", "@cdransf/select-pagination": "^1.3.1", "@cdransf/theme-toggle": "^1.3.2", - "@daviddarnes/mastodon-post": "^1.3.0", "minisearch": "^6.3.0", "youtube-video-element": "^1.1.5" }, diff --git a/src/_data/music.js b/src/_data/music.js index ae7176ae..092126f8 100644 --- a/src/_data/music.js +++ b/src/_data/music.js @@ -33,32 +33,6 @@ const fetchDataForPeriod = async (startPeriod, fields, table) => { return rows } -const fetchAllTimeData = async (fields, table) => { - const PAGE_SIZE = 1000 - let rows = [] - let rangeStart = 0 - - while (true) { - const { data, error } = await supabase - .from(table) - .select(fields) - .order('listened_at', { ascending: false }) - .range(rangeStart, rangeStart + PAGE_SIZE - 1) - - if (error) { - console.error(error) - break - } - - rows = rows.concat(data) - - if (data.length < PAGE_SIZE) break - rangeStart += PAGE_SIZE - } - - return rows -} - const fetchGenreMapping = async () => { const { data, error } = await supabase .from('genres') @@ -162,16 +136,6 @@ export default async function() { } } - // Fetch and aggregate all-time data - const allTimeData = await fetchAllTimeData(selectFields, 'listens') - results['allTime'] = { - artists: aggregateData(allTimeData, 'artist_name', 'artists'), - albums: aggregateData(allTimeData, 'album_name', 'albums'), - tracks: aggregateData(allTimeData, 'track_name', 'track'), - genres: aggregateGenres(allTimeData), - totalTracks: allTimeData?.length?.toLocaleString('en-US') - } - const recentData = await fetchDataForPeriod(DateTime.now().minus({ days: 7 }), selectFields, 'listens') results['recent'] = { diff --git a/src/_includes/partials/widgets/mastodon-post.liquid b/src/_includes/partials/widgets/mastodon-post.liquid deleted file mode 100644 index aae7761a..00000000 --- a/src/_includes/partials/widgets/mastodon-post.liquid +++ /dev/null @@ -1,24 +0,0 @@ -{%- assign shareLink = postUrl | findPost:linkPosts -%} -{%- if shareLink %} - - - - - - Discuss on Mastodon - - - -{% endif -%} \ No newline at end of file diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index f789ce3b..45e09cb3 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -379,10 +379,13 @@ main { .home-status, article { - border-bottom: 1px solid var(--gray-light); margin-bottom: var(--sizing-base); } +.home-status { + border-bottom: 1px solid var(--gray-light); +} + .home-status p:first-child { margin-top: 0; } diff --git a/src/feeds/all.json.liquid b/src/feeds/all.json.liquid index 6a0f12ee..5e4f4b42 100644 --- a/src/feeds/all.json.liquid +++ b/src/feeds/all.json.liquid @@ -5,7 +5,7 @@ permalink: "/feeds/all.json" --- {% render "partials/feeds/json.liquid" permalink:'/feeds/all.json' - title:'Follow • Cory Dransfeldt' + title:'All activity • Cory Dransfeldt' data:collections.allContent updated:collections.allContent[0].date site:site diff --git a/src/feeds/all.liquid b/src/feeds/all.liquid index 7408c4f7..864821ff 100644 --- a/src/feeds/all.liquid +++ b/src/feeds/all.liquid @@ -5,7 +5,7 @@ permalink: "/feeds/all" --- {% render "partials/feeds/rss.liquid" permalink:"/feeds/all" - title:"Follow • Cory Dransfeldt" + title:"All activity • Cory Dransfeldt" description:"All of the posts and activity from my site." data:collections.allContent updated:collections.allContent[0].date diff --git a/src/pages/main/music/albums/all-time.html b/src/pages/main/music/albums/all-time.html deleted file mode 100644 index ce23a3a6..00000000 --- a/src/pages/main/music/albums/all-time.html +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: Albums • all time -description: All of the albums I've listened to. -layout: default -pagination: - data: music.allTime.albums - size: 24 -permalink: "/music/albums/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -schema: music ---- -{% tablericon "arrow-left" "Go back" %} Go back -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.allTime.albums.size }} albums and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my artists or tracks for this period.

-
-{% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file diff --git a/src/pages/main/music/artists/all-time.html b/src/pages/main/music/artists/all-time.html deleted file mode 100644 index 7dd33c1e..00000000 --- a/src/pages/main/music/artists/all-time.html +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: Artists • all time -description: All of the artists I've listened to. -layout: default -pagination: - data: music.allTime.artists - size: 24 -permalink: "/music/artists/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -schema: music ---- -{% tablericon "arrow-left" "Go back" %} Go back -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.allTime.artists.size }} artists and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my albums or tracks for this period.

-
-{% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html index 75a4221e..42c8f81f 100644 --- a/src/pages/main/music/index.html +++ b/src/pages/main/music/index.html @@ -24,7 +24,6 @@ schema: music-index -
@@ -36,10 +35,7 @@ schema: music-index - -

More: This week • This month • 3 months • All time

+

More: This week • This month • 3 months

{% tablericon "vinyl" "Albums" %} @@ -49,7 +45,6 @@ schema: music-index -

@@ -61,10 +56,7 @@ schema: music-index - -

More: This week • This month • 3 months • All time

+

More: This week • This month • 3 months

{% tablericon "playlist" "Tracks" %} @@ -75,7 +67,6 @@ schema: music-index -

@@ -90,8 +81,5 @@ schema: music-index - -

More: This week • This month • 3 months • All time

+

More: This week • This month • 3 months

{% render "partials/media/music/releases.liquid", albumReleases:albumReleases %} \ No newline at end of file diff --git a/src/pages/main/music/tracks/all-time.html b/src/pages/main/music/tracks/all-time.html deleted file mode 100644 index 47e3b667..00000000 --- a/src/pages/main/music/tracks/all-time.html +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: Artists • all time -description: All of the tracks I've listened to. -layout: default -pagination: - data: music.allTime.tracks - size: 50 -permalink: "/music/tracks/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -schema: music ---- -{% tablericon "arrow-left" "Go back" %} Go back -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.allTime.totalTracks }} tracks and most of what I've listened to has been {{ music.allTime.genres | listToString: "genre", 5 }}.

-

See my artists or albums for this period.

-
-{% endif %} -{% render "partials/media/music/chart.liquid" data:pagination, playTotal: music.allTime.tracks[0].plays %} \ No newline at end of file diff --git a/src/pages/main/posts/post.html b/src/pages/main/posts/post.html index 7b7c5feb..21023da2 100644 --- a/src/pages/main/posts/post.html +++ b/src/pages/main/posts/post.html @@ -7,7 +7,6 @@ pagination: permalink: "{{ post.slug }}/index.html" schema: blog --- -{%- capture postUrl %}{{ meta.url }}{{ post.slug }}/{% endcapture -%}
{% tablericon "calendar-month" "Date" %} @@ -23,6 +22,4 @@ schema: blog {{ post.content | markdown }} {% render "partials/posts/blocks.liquid", blocks:post.blocks %}
-
-{% render "partials/widgets/mastodon-post.liquid", postUrl:postUrl, linkPosts:linkPosts %} -{% render "partials/widgets/addon-links.liquid", posts:posts, analytics:analytics, links:links %} \ No newline at end of file + \ No newline at end of file