From 1bdb4da519d19b039019d3945e268bb23759486f Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Mon, 25 Nov 2024 20:29:01 -0800
Subject: [PATCH] chore: layout for recent activity
---
package-lock.json | 46 ++++++-------
package.json | 2 +-
src/components/home/RecentActivity.astro | 84 ++++++++++++------------
workers/mastodon/wrangler.template.toml | 2 +-
workers/rebuild/wrangler.template.toml | 2 +-
5 files changed, 67 insertions(+), 69 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 5d4c8d0..5a024d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
"@astrojs/sitemap": "3.2.1",
"@cdransf/astro-tabler-icons": "1.0.5",
"@supabase/supabase-js": "^2.46.1",
- "astro": "4.16.14",
+ "astro": "4.16.15",
"astro-embed": "0.9.0",
"date-fns": "4.1.0",
"date-fns-tz": "3.2.0",
@@ -2350,12 +2350,12 @@
}
},
"node_modules/@types/node": {
- "version": "22.9.4",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.4.tgz",
- "integrity": "sha512-d9RWfoR7JC/87vj7n+PVTzGg9hDyuFjir3RxUHbjFSKNd9mpxbxwMEyaCim/ddCmy4IuW7HjTzF3g9p3EtWEOg==",
+ "version": "22.10.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
+ "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
"license": "MIT",
"dependencies": {
- "undici-types": "~6.19.8"
+ "undici-types": "~6.20.0"
}
},
"node_modules/@types/node-forge": {
@@ -2660,9 +2660,9 @@
}
},
"node_modules/astro": {
- "version": "4.16.14",
- "resolved": "https://registry.npmjs.org/astro/-/astro-4.16.14.tgz",
- "integrity": "sha512-2IuLkIp4idyspugq+F52rHZyNqHHi2AdQzuKp3SGytg/YAm50dNeWhP/7l+enjgWZLloLq5xsH5gVQpoDFoyFg==",
+ "version": "4.16.15",
+ "resolved": "https://registry.npmjs.org/astro/-/astro-4.16.15.tgz",
+ "integrity": "sha512-usybZ7nEUiwYKT7r47l4VbkqjKfaE+BgWV/ed4PT3mE3vFRTBWFsXLnkzrN7awfN6+/ekZTAcE+MAkdA551Umw==",
"license": "MIT",
"dependencies": {
"@astrojs/compiler": "^2.10.3",
@@ -4827,9 +4827,9 @@
}
},
"node_modules/magic-string": {
- "version": "0.30.13",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.13.tgz",
- "integrity": "sha512-8rYBO+MsWkgjDSOvLomYnzhdwEG51olQ4zL5KXnNJWV5MNmrb4rTZdrtkhxjnD/QyZUqR/Z/XDsUs/4ej2nx0g==",
+ "version": "0.30.14",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.14.tgz",
+ "integrity": "sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==",
"license": "MIT",
"dependencies": {
"@jridgewell/sourcemap-codec": "^1.5.0"
@@ -5854,9 +5854,9 @@
}
},
"node_modules/nanoid": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
- "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+ "version": "3.3.8",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+ "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
"funding": [
{
"type": "github",
@@ -6292,9 +6292,9 @@
}
},
"node_modules/prettier": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
- "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.1.tgz",
+ "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==",
"license": "MIT",
"optional": true,
"peer": true,
@@ -7470,9 +7470,9 @@
"license": "0BSD"
},
"node_modules/type-fest": {
- "version": "4.28.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.28.0.tgz",
- "integrity": "sha512-jXMwges/FVbFRe5lTMJZVEZCrO9kI9c8k0PA/z7nF3bo0JSCCLysvokFjNPIUK/itEMas10MQM+AiHoHt/T/XA==",
+ "version": "4.28.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.28.1.tgz",
+ "integrity": "sha512-LO/+yb3mf46YqfUC7QkkoAlpa7CTYh//V1Xy9+NQ+pKqDqXIq0NTfPfQRwFfCt+if4Qkwb9gzZfsl6E5TkXZGw==",
"license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=16"
@@ -7550,9 +7550,9 @@
}
},
"node_modules/undici-types": {
- "version": "6.19.8",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
- "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+ "version": "6.20.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+ "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
"license": "MIT"
},
"node_modules/unenv": {
diff --git a/package.json b/package.json
index 2b1a263..e70fda8 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"@astrojs/sitemap": "3.2.1",
"@cdransf/astro-tabler-icons": "1.0.5",
"@supabase/supabase-js": "^2.46.1",
- "astro": "4.16.14",
+ "astro": "4.16.15",
"astro-embed": "0.9.0",
"date-fns": "4.1.0",
"date-fns-tz": "3.2.0",
diff --git a/src/components/home/RecentActivity.astro b/src/components/home/RecentActivity.astro
index 7618690..6247d36 100644
--- a/src/components/home/RecentActivity.astro
+++ b/src/components/home/RecentActivity.astro
@@ -29,49 +29,47 @@ const link = links[0];
<div set:html={IconActivity({ size: 24 })} />
Recent activity
</h2>
- <ul>
- <li>
- <span class="music">Top artist this week:</span>
- <a href={artist.artist_url} data-astro-prefetch>{artist.artist_name}</a>
- </li>
- <li>
- <span class="music">Top track this week:</span>
- <a href={track.artist_url} data-astro-prefetch
- >{track.track_name} by {track.artist_name}</a
- >
- </li>
- <li>
- <span class="tv">Last episode watched:</span>
- <strong class="highlight-text">{show.formatted_episode}</strong> of <a
- href={show.url}
- data-astro-prefetch>{show.title}</a
- >
- </li>
- <li>
- <span class="movies">Last movie watched:</span>
- <a href={movie.url} data-astro-prefetch>{movie.title}</a>{
- movie.rating ? ` (${movie.rating})` : ""
- }
- </li>
- <li>
- <span class="books">Last book finished:</span>
- <a href={book.url} data-astro-prefetch>{book.title}</a> by {book.author}{
- book.rating ? ` (${book.rating})` : ""
- }
- </li>
- <li>
- <span class="link">Last link shared:</span>
- <a href={link.link}>{link.title}</a>
- {
- link.author && (
- <span>
- {" "}
- via <a href={link.author.url}>{link.author.name}</a>
- </span>
- )
- }
- </li>
- </ul>
+ <p>
+ <span class="music">Top artist this week:</span>
+ <a href={artist.artist_url} data-astro-prefetch>{artist.artist_name}</a>
+ </p>
+ <p>
+ <span class="music">Top track this week:</span>
+ <a href={track.artist_url} data-astro-prefetch
+ >{track.track_name} by {track.artist_name}</a
+ >
+ </p>
+ <p>
+ <span class="tv">Last episode watched:</span>
+ <strong class="highlight-text">{show.formatted_episode}</strong> of <a
+ href={show.url}
+ data-astro-prefetch>{show.title}</a
+ >
+ </p>
+ <p>
+ <span class="movies">Last movie watched:</span>
+ <a href={movie.url} data-astro-prefetch>{movie.title}</a>{
+ movie.rating ? ` (${movie.rating})` : ""
+ }
+ </p>
+ <p>
+ <span class="books">Last book finished:</span>
+ <a href={book.url} data-astro-prefetch>{book.title}</a> by {book.author}{
+ book.rating ? ` (${book.rating})` : ""
+ }
+ </p>
+ <p>
+ <span class="link">Last link shared:</span>
+ <a href={link.link}>{link.title}</a>
+ {
+ link.author && (
+ <span>
+ {" "}
+ via <a href={link.author.url}>{link.author.name}</a>
+ </span>
+ )
+ }
+ </p>
<Rss
url="/feeds"
text="Subscribe to my movies, books, links or activity feed(s)"
diff --git a/workers/mastodon/wrangler.template.toml b/workers/mastodon/wrangler.template.toml
index 3ffce7f..6b09f65 100644
--- a/workers/mastodon/wrangler.template.toml
+++ b/workers/mastodon/wrangler.template.toml
@@ -14,7 +14,7 @@ id = "${RSS_TO_MASTODON_KV_NAMESPACE_ID}"
[env.production]
name = "rss-to-mastodon-worker-production"
-triggers = { crons = ["*/15 * * * *"] }
+triggers = { crons = ["0 * * * *"] }
[[env.production.kv_namespaces]]
binding = "RSS_TO_MASTODON_NAMESPACE"
diff --git a/workers/rebuild/wrangler.template.toml b/workers/rebuild/wrangler.template.toml
index 5c1ae2d..aacc39d 100644
--- a/workers/rebuild/wrangler.template.toml
+++ b/workers/rebuild/wrangler.template.toml
@@ -7,4 +7,4 @@ workers_dev = true
[env.production]
name = "scheduled-rebuild-worker-production"
-triggers = {crons = ["0 * * * *"]}
\ No newline at end of file
+triggers = {crons = ["*/15 * * * *"]}
\ No newline at end of file