diff --git a/cache/jsonfeed-to-mastodon.json b/cache/jsonfeed-to-mastodon.json index a77c21f0..d38a46f0 100644 --- a/cache/jsonfeed-to-mastodon.json +++ b/cache/jsonfeed-to-mastodon.json @@ -12477,11 +12477,11 @@ ], "lastTootTimestamp": 1713031404184 }, - "https://www.themoviedb.org/movie/9411": { + "https://coryd.dev/movies/9411": { "id": "aHR0cHM6Ly90cmFrdC50di9tb3ZpZXMvZmFsbGVuLTE5OTg=", "title": "🎥: Fallen", - "url": "https://www.themoviedb.org/movie/9411", - "content_text": "🎥: Fallen #Movies #Watching #Trakt https://www.themoviedb.org/movie/9411", + "url": "https://coryd.dev/movies/9411", + "content_text": "🎥: Fallen #Movies #Watching #Trakt https://coryd.dev/movies/9411", "date_published": "Sat, 13 Apr 2024 23:43:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112267248945790971" @@ -12510,11 +12510,11 @@ ], "lastTootTimestamp": 1713143465132 }, - "https://www.themoviedb.org/movie/359410": { + "https://coryd.dev/movies/359410": { "id": "aHR0cHM6Ly90cmFrdC50di9tb3ZpZXMvcm9hZC1ob3VzZS0yMDI0", "title": "🎥: Road House", - "url": "https://www.themoviedb.org/movie/359410", - "content_text": "🎥: Road House #Movies #Watching #Trakt https://www.themoviedb.org/movie/359410", + "url": "https://coryd.dev/movies/359410", + "content_text": "🎥: Road House #Movies #Watching #Trakt https://coryd.dev/movies/359410", "date_published": "Sun, 14 Apr 2024 17:06:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112271865248733450" @@ -12653,11 +12653,11 @@ ], "lastTootTimestamp": 1713645991312 }, - "https://www.themoviedb.org/movie/693134": { + "https://coryd.dev/movies/693134": { "id": "aHR0cHM6Ly90cmFrdC50di9tb3ZpZXMvZHVuZS1wYXJ0LXR3by0yMDI0", "title": "🎥: Dune: Part Two", - "url": "https://www.themoviedb.org/movie/693134", - "content_text": "🎥: Dune: Part Two #Movies #Watching #SciFi #Adventure https://www.themoviedb.org/movie/693134", + "url": "https://coryd.dev/movies/693134", + "content_text": "🎥: Dune: Part Two #Movies #Watching #SciFi #Adventure https://coryd.dev/movies/693134", "date_published": "Fri, 19 Apr 2024 14:00:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112305063432909748" @@ -12829,11 +12829,11 @@ ], "lastTootTimestamp": 1713981835960 }, - "https://www.themoviedb.org/movie/560016": { + "https://coryd.dev/movies/560016": { "id": "aHR0cHM6Ly90cmFrdC50di9tb3ZpZXMvbW9ua2V5LW1hbi0yMDI0", "title": "🎥: Monkey Man", - "url": "https://www.themoviedb.org/movie/560016", - "content_text": "🎥: Monkey Man #Movies #Watching #Thriller #Action https://www.themoviedb.org/movie/560016", + "url": "https://coryd.dev/movies/560016", + "content_text": "🎥: Monkey Man #Movies #Watching #Thriller #Action https://coryd.dev/movies/560016", "date_published": "Wed, 24 Apr 2024 18:14:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112328455422041088" @@ -12884,11 +12884,11 @@ ], "lastTootTimestamp": 1714233838679 }, - "https://www.themoviedb.org/movie/938614": { + "https://coryd.dev/movies/938614": { "id": "aHR0cHM6Ly90cmFrdC50di9tb3ZpZXMvbGF0ZS1uaWdodC13aXRoLXRoZS1kZXZpbC0yMDI0", "title": "🎥: Late Night with the Devil", - "url": "https://www.themoviedb.org/movie/938614", - "content_text": "🎥: Late Night with the Devil #Movies #Watching #Horror https://www.themoviedb.org/movie/938614", + "url": "https://coryd.dev/movies/938614", + "content_text": "🎥: Late Night with the Devil #Movies #Watching #Horror https://coryd.dev/movies/938614", "date_published": "Sat, 27 Apr 2024 18:07:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112345809656993382" @@ -12983,11 +12983,11 @@ ], "lastTootTimestamp": 1714449885234 }, - "https://www.themoviedb.org/movie/520594": { + "https://coryd.dev/movies/520594": { "id": "aHR0cHM6Ly90cmFrdC50di9tb3ZpZXMvam9obi1tdWxhbmV5LWtpZC1nb3JnZW91cy1hdC1yYWRpby1jaXR5LTIwMTg=", "title": "🎥: John Mulaney: Kid Gorgeous at Radio City", - "url": "https://www.themoviedb.org/movie/520594", - "content_text": "🎥: John Mulaney: Kid Gorgeous at Radio City #Movies #Watching undefined https://www.themoviedb.org/movie/520594", + "url": "https://coryd.dev/movies/520594", + "content_text": "🎥: John Mulaney: Kid Gorgeous at Radio City #Movies #Watching undefined https://coryd.dev/movies/520594", "date_published": "Wed, 01 May 2024 05:36:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112364796498005793" @@ -13368,11 +13368,11 @@ ], "lastTootTimestamp": 1715875416427 }, - "https://www.themoviedb.org/movie/1051896": { + "https://coryd.dev/movies/1051896": { "id": "aHR0cHM6Ly93d3cudGhlbW92aWVkYi5vcmcvbW92aWUvMTA1MTg5Ng==", "title": "🎥: Arcadian (⭐️⭐️⭐️)", - "url": "https://www.themoviedb.org/movie/1051896", - "content_text": "🎥: Arcadian (⭐️⭐️⭐️) #Movies #Watching https://www.themoviedb.org/movie/1051896", + "url": "https://coryd.dev/movies/1051896", + "content_text": "🎥: Arcadian (⭐️⭐️⭐️) #Movies #Watching https://coryd.dev/movies/1051896", "date_published": "Fri, 17 May 2024 16:00:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112457275817717857" @@ -13423,11 +13423,11 @@ ], "lastTootTimestamp": 1716064039940 }, - "https://www.themoviedb.org/movie/1148027": { + "https://coryd.dev/movies/1148027": { "id": "aHR0cHM6Ly93d3cudGhlbW92aWVkYi5vcmcvbW92aWUvMTE0ODAyNw==", "title": "🎥: New Life (⭐️⭐️⭐️⭐️)", - "url": "https://www.themoviedb.org/movie/1148027", - "content_text": "🎥: New Life (⭐️⭐️⭐️⭐️) #Movies #Watching https://www.themoviedb.org/movie/1148027", + "url": "https://coryd.dev/movies/1148027", + "content_text": "🎥: New Life (⭐️⭐️⭐️⭐️) #Movies #Watching https://coryd.dev/movies/1148027", "date_published": "Sat, 18 May 2024 20:13:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112464524447203970" @@ -13478,11 +13478,11 @@ ], "lastTootTimestamp": 1716171323109 }, - "https://www.themoviedb.org/movie/29427": { + "https://coryd.dev/movies/29427": { "id": "aHR0cHM6Ly93d3cudGhlbW92aWVkYi5vcmcvbW92aWUvMjk0Mjc=", "title": "🎥: The Crazies (⭐️⭐️⭐️)", - "url": "https://www.themoviedb.org/movie/29427", - "content_text": "🎥: The Crazies (⭐️⭐️⭐️) #Movies #Watching https://www.themoviedb.org/movie/29427", + "url": "https://coryd.dev/movies/29427", + "content_text": "🎥: The Crazies (⭐️⭐️⭐️) #Movies #Watching https://coryd.dev/movies/29427", "date_published": "Mon, 20 May 2024 15:15:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112474735239294133" @@ -13522,11 +13522,11 @@ ], "lastTootTimestamp": 1716307431247 }, - "https://www.themoviedb.org/movie/384018": { + "https://coryd.dev/movies/384018": { "id": "aHR0cHM6Ly93d3cudGhlbW92aWVkYi5vcmcvbW92aWUvMzg0MDE4", "title": "🎥: Fast & Furious Presents: Hobbs & Shaw (⭐️⭐️⭐️)", - "url": "https://www.themoviedb.org/movie/384018", - "content_text": "🎥: Fast & Furious Presents: Hobbs & Shaw (⭐️⭐️⭐️) #Movies #Watching https://www.themoviedb.org/movie/384018", + "url": "https://coryd.dev/movies/384018", + "content_text": "🎥: Fast & Furious Presents: Hobbs & Shaw (⭐️⭐️⭐️) #Movies #Watching https://coryd.dev/movies/384018", "date_published": "Tue, 21 May 2024 15:49:00 GMT", "toots": [ "https://social.lol/users/cory/statuses/112480396568749721" diff --git a/config/filters/index.js b/config/filters/index.js index 4990316e..f3ab9f2a 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -248,6 +248,7 @@ export default { return '' }).length }, + getLastWatched: (show) => show?.['episodes'][show['episodes']?.length - 1]?.['last_watched_at'], // tags filterTags: (tags) => { diff --git a/package-lock.json b/package-lock.json index 2cca5a49..6d3ce5f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "16.7.1", + "version": "16.8.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "16.7.1", + "version": "16.8.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", @@ -22,9 +22,9 @@ "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", - "@aws-sdk/client-s3": "^3.577.0", + "@aws-sdk/client-s3": "^3.582.0", "@cdransf/eleventy-plugin-tabler-icons": "^1.4.0", - "@supabase/supabase-js": "^2.43.2", + "@supabase/supabase-js": "^2.43.3", "dotenv-flow": "^4.1.0", "gray-matter": "^4.0.3", "html-minifier-terser": "^7.2.0", @@ -398,18 +398,18 @@ "dev": true }, "node_modules/@aws-sdk/client-s3": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.577.0.tgz", - "integrity": "sha512-mQYXwn6E4Rwggn6teF6EIWJtK8jsKcxnPj2QVETkSmD8QaFLm4g/DgLPdamDE97UI8k1k0cmWqXcTOLIaZ7wQg==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.582.0.tgz", + "integrity": "sha512-yp3oIN48sQSJ01JF707KcOLAb7+UxcU6uYH0J48AG61z18tJ0SdE7KG2QPEFbK1RRyYXdHd8VLkbTVP+iwCLmw==", "dev": true, "dependencies": { "@aws-crypto/sha1-browser": "3.0.0", "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/client-sso-oidc": "3.582.0", + "@aws-sdk/client-sts": "3.582.0", + "@aws-sdk/core": "3.582.0", + "@aws-sdk/credential-provider-node": "3.582.0", "@aws-sdk/middleware-bucket-endpoint": "3.577.0", "@aws-sdk/middleware-expect-continue": "3.577.0", "@aws-sdk/middleware-flexible-checksums": "3.577.0", @@ -417,23 +417,23 @@ "@aws-sdk/middleware-location-constraint": "3.577.0", "@aws-sdk/middleware-logger": "3.577.0", "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-sdk-s3": "3.577.0", + "@aws-sdk/middleware-sdk-s3": "3.582.0", "@aws-sdk/middleware-signing": "3.577.0", "@aws-sdk/middleware-ssec": "3.577.0", "@aws-sdk/middleware-user-agent": "3.577.0", "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/signature-v4-multi-region": "3.577.0", + "@aws-sdk/signature-v4-multi-region": "3.582.0", "@aws-sdk/types": "3.577.0", "@aws-sdk/util-endpoints": "3.577.0", "@aws-sdk/util-user-agent-browser": "3.577.0", "@aws-sdk/util-user-agent-node": "3.577.0", "@aws-sdk/xml-builder": "3.575.0", "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", + "@smithy/core": "^2.0.1", "@smithy/eventstream-serde-browser": "^3.0.0", "@smithy/eventstream-serde-config-resolver": "^3.0.0", "@smithy/eventstream-serde-node": "^3.0.0", - "@smithy/fetch-http-handler": "^3.0.0", + "@smithy/fetch-http-handler": "^3.0.1", "@smithy/hash-blob-browser": "^3.0.0", "@smithy/hash-node": "^3.0.0", "@smithy/hash-stream-node": "^3.0.0", @@ -441,23 +441,23 @@ "@smithy/md5-js": "^3.0.0", "@smithy/middleware-content-length": "^3.0.0", "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", + "@smithy/middleware-retry": "^3.0.1", "@smithy/middleware-serde": "^3.0.0", "@smithy/middleware-stack": "^3.0.0", "@smithy/node-config-provider": "^3.0.0", "@smithy/node-http-handler": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", + "@smithy/smithy-client": "^3.0.1", "@smithy/types": "^3.0.0", "@smithy/url-parser": "^3.0.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.1", + "@smithy/util-defaults-mode-node": "^3.0.1", "@smithy/util-endpoints": "^2.0.0", "@smithy/util-retry": "^3.0.0", - "@smithy/util-stream": "^3.0.0", + "@smithy/util-stream": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "@smithy/util-waiter": "^3.0.0", "tslib": "^2.6.2" @@ -467,14 +467,14 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.577.0.tgz", - "integrity": "sha512-BwujdXrydlk6UEyPmewm5GqG4nkQ6OVyRhS/SyZP/6UKSFv2/sf391Cmz0hN0itUTH1rR4XeLln8XCOtarkrzg==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.582.0.tgz", + "integrity": "sha512-C6G2vNREANe5uUCYrTs8vvGhIrrS1GRoTjr0f5qmkZDuAtuBsQNoTF6Rt+0mDwXXBYW3FcNhZntaNCGVhXlugA==", "dev": true, "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.576.0", + "@aws-sdk/core": "3.582.0", "@aws-sdk/middleware-host-header": "3.577.0", "@aws-sdk/middleware-logger": "3.577.0", "@aws-sdk/middleware-recursion-detection": "3.577.0", @@ -485,26 +485,26 @@ "@aws-sdk/util-user-agent-browser": "3.577.0", "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", + "@smithy/core": "^2.0.1", + "@smithy/fetch-http-handler": "^3.0.1", "@smithy/hash-node": "^3.0.0", "@smithy/invalid-dependency": "^3.0.0", "@smithy/middleware-content-length": "^3.0.0", "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", + "@smithy/middleware-retry": "^3.0.1", "@smithy/middleware-serde": "^3.0.0", "@smithy/middleware-stack": "^3.0.0", "@smithy/node-config-provider": "^3.0.0", "@smithy/node-http-handler": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", + "@smithy/smithy-client": "^3.0.1", "@smithy/types": "^3.0.0", "@smithy/url-parser": "^3.0.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.1", + "@smithy/util-defaults-mode-node": "^3.0.1", "@smithy/util-endpoints": "^2.0.0", "@smithy/util-middleware": "^3.0.0", "@smithy/util-retry": "^3.0.0", @@ -516,16 +516,16 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.577.0.tgz", - "integrity": "sha512-njmKSPDWueWWYVFpFcZ2P3fI6/pdQVDa0FgCyYZhOnJLgEHZIcBBg1AsnkVWacBuLopp9XVt2m+7hO6ugY1/1g==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.582.0.tgz", + "integrity": "sha512-g4uiD4GUR03CqY6LwdocJxO+fHSBk/KNXBGJv1ENCcPmK3jpEI8xBggIQOQl3NWjDeP07bpIb8+UhgSoYAYtkg==", "dev": true, "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/client-sts": "3.582.0", + "@aws-sdk/core": "3.582.0", + "@aws-sdk/credential-provider-node": "3.582.0", "@aws-sdk/middleware-host-header": "3.577.0", "@aws-sdk/middleware-logger": "3.577.0", "@aws-sdk/middleware-recursion-detection": "3.577.0", @@ -536,26 +536,26 @@ "@aws-sdk/util-user-agent-browser": "3.577.0", "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", + "@smithy/core": "^2.0.1", + "@smithy/fetch-http-handler": "^3.0.1", "@smithy/hash-node": "^3.0.0", "@smithy/invalid-dependency": "^3.0.0", "@smithy/middleware-content-length": "^3.0.0", "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", + "@smithy/middleware-retry": "^3.0.1", "@smithy/middleware-serde": "^3.0.0", "@smithy/middleware-stack": "^3.0.0", "@smithy/node-config-provider": "^3.0.0", "@smithy/node-http-handler": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", + "@smithy/smithy-client": "^3.0.1", "@smithy/types": "^3.0.0", "@smithy/url-parser": "^3.0.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.1", + "@smithy/util-defaults-mode-node": "^3.0.1", "@smithy/util-endpoints": "^2.0.0", "@smithy/util-middleware": "^3.0.0", "@smithy/util-retry": "^3.0.0", @@ -567,16 +567,16 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.577.0.tgz", - "integrity": "sha512-509Kklimva1XVlhGbpTpeX3kOP6ORpm44twJxDHpa9TURbmoaxj7veWlnLCbDorxDTrbsDghvYZshvcLsojVpg==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.582.0.tgz", + "integrity": "sha512-3gaYyQkt8iTSStnjv6kJoPGDJUaPbhcgBOrXhUNbWUgAlgw7Y1aI1MYt3JqvVN4jtiCLwjuiAQATU/8elbqPdQ==", "dev": true, "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/client-sso-oidc": "3.582.0", + "@aws-sdk/core": "3.582.0", + "@aws-sdk/credential-provider-node": "3.582.0", "@aws-sdk/middleware-host-header": "3.577.0", "@aws-sdk/middleware-logger": "3.577.0", "@aws-sdk/middleware-recursion-detection": "3.577.0", @@ -587,26 +587,26 @@ "@aws-sdk/util-user-agent-browser": "3.577.0", "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", + "@smithy/core": "^2.0.1", + "@smithy/fetch-http-handler": "^3.0.1", "@smithy/hash-node": "^3.0.0", "@smithy/invalid-dependency": "^3.0.0", "@smithy/middleware-content-length": "^3.0.0", "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", + "@smithy/middleware-retry": "^3.0.1", "@smithy/middleware-serde": "^3.0.0", "@smithy/middleware-stack": "^3.0.0", "@smithy/node-config-provider": "^3.0.0", "@smithy/node-http-handler": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", + "@smithy/smithy-client": "^3.0.1", "@smithy/types": "^3.0.0", "@smithy/url-parser": "^3.0.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.1", + "@smithy/util-defaults-mode-node": "^3.0.1", "@smithy/util-endpoints": "^2.0.0", "@smithy/util-middleware": "^3.0.0", "@smithy/util-retry": "^3.0.0", @@ -618,15 +618,15 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.576.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.576.0.tgz", - "integrity": "sha512-KDvDlbeipSTIf+ffKtTg1m419TK7s9mZSWC8bvuZ9qx6/sjQFOXIKOVqyuli6DnfxGbvRcwoRuY99OcCH1N/0w==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.582.0.tgz", + "integrity": "sha512-ofmD96IQc9g1dbyqlCyxu5fCG7kIl9p1NoN5+vGBUyLdbmPCV3Pdg99nRHYEJuv2MgGx5AUFGDPMHcqbJpnZIw==", "dev": true, "dependencies": { - "@smithy/core": "^2.0.0", + "@smithy/core": "^2.0.1", "@smithy/protocol-http": "^4.0.0", "@smithy/signature-v4": "^3.0.0", - "@smithy/smithy-client": "^3.0.0", + "@smithy/smithy-client": "^3.0.1", "@smithy/types": "^3.0.0", "fast-xml-parser": "4.2.5", "tslib": "^2.6.2" @@ -651,19 +651,19 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.577.0.tgz", - "integrity": "sha512-n++yhCp67b9+ZRGEdY1jhamB5E/O+QsIDOPSuRmdaSGMCOd82oUEKPgIVEU1bkqxDsBxgiEWuvtfhK6sNiDS0A==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.582.0.tgz", + "integrity": "sha512-kGOUKw5ryPkDIYB69PjK3SicVLTbWB06ouFN2W1EvqUJpkQGPAUGzYcomKtt3mJaCTf/1kfoaHwARAl6KKSP8Q==", "dev": true, "dependencies": { "@aws-sdk/types": "3.577.0", - "@smithy/fetch-http-handler": "^3.0.0", + "@smithy/fetch-http-handler": "^3.0.1", "@smithy/node-http-handler": "^3.0.0", "@smithy/property-provider": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", + "@smithy/smithy-client": "^3.0.1", "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.0", + "@smithy/util-stream": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -671,14 +671,14 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.577.0.tgz", - "integrity": "sha512-q7lHPtv6BjRvChUE3m0tIaEZKxPTaZ1B3lKxGYsFl3VLAu5N8yGCUKwuA1izf4ucT+LyKscVGqK6VDZx1ev3nw==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.582.0.tgz", + "integrity": "sha512-GWcjHx6ErcZAi5GZ7kItX7E6ygYmklm9tD9dbCWdsnis7IiWfYZNMXFQEwKCubUmhT61zjGZGDUiRcqVeZu1Aw==", "dev": true, "dependencies": { "@aws-sdk/credential-provider-env": "3.577.0", "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", + "@aws-sdk/credential-provider-sso": "3.582.0", "@aws-sdk/credential-provider-web-identity": "3.577.0", "@aws-sdk/types": "3.577.0", "@smithy/credential-provider-imds": "^3.0.0", @@ -691,20 +691,20 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.577.0" + "@aws-sdk/client-sts": "^3.582.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.577.0.tgz", - "integrity": "sha512-epZ1HOMsrXBNczc0HQpv0VMjqAEpc09DUA7Rg3gUJfn8umhML7A7bXnUyqPA+S54q397UYg1leQKdSn23OiwQQ==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.582.0.tgz", + "integrity": "sha512-T8OLA/2xayRMT8z2eIZgo8tBAamTsBn7HWc8mL1a9yzv5OCPYvucNmbO915DY8u4cNbMl2dcB9frfVxIrahCXw==", "dev": true, "dependencies": { "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-http": "3.577.0", - "@aws-sdk/credential-provider-ini": "3.577.0", + "@aws-sdk/credential-provider-http": "3.582.0", + "@aws-sdk/credential-provider-ini": "3.582.0", "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", + "@aws-sdk/credential-provider-sso": "3.582.0", "@aws-sdk/credential-provider-web-identity": "3.577.0", "@aws-sdk/types": "3.577.0", "@smithy/credential-provider-imds": "^3.0.0", @@ -734,12 +734,12 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.577.0.tgz", - "integrity": "sha512-iVm5SQvS7EgZTJsRaqUOmDQpBQPPPat42SCbWFvFQOLrl8qewq8OP94hFS5w2mP62zngeYzqhJnDel79HXbxew==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.582.0.tgz", + "integrity": "sha512-PSiBX6YvJaodGSVg6dReWfeYgK5Tl4fUi0GMuD9WXo/ckfxAPdDFtIfVR6VkSPUrkZj26uw1Pwqeefp2H5phag==", "dev": true, "dependencies": { - "@aws-sdk/client-sso": "3.577.0", + "@aws-sdk/client-sso": "3.582.0", "@aws-sdk/token-providers": "3.577.0", "@aws-sdk/types": "3.577.0", "@smithy/property-provider": "^3.0.0", @@ -880,9 +880,9 @@ } }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.577.0.tgz", - "integrity": "sha512-/t8Shvy6lGIRdTEKG6hA8xy+oon/CDF5H8Ksms/cd/uvIy/MYbNjOJ/Arwk8H5W6LB4DP/1O+tOzOpGx1MCufA==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.582.0.tgz", + "integrity": "sha512-PJqQpLoLaZPRI4L/XZUeHkd9UVK8VAr9R38wv0osGeMTvzD9iwzzk0I2TtBqFda/5xEB1YgVYZwyqvmStXmttg==", "dev": true, "dependencies": { "@aws-sdk/types": "3.577.0", @@ -890,7 +890,7 @@ "@smithy/node-config-provider": "^3.0.0", "@smithy/protocol-http": "^4.0.0", "@smithy/signature-v4": "^3.0.0", - "@smithy/smithy-client": "^3.0.0", + "@smithy/smithy-client": "^3.0.1", "@smithy/types": "^3.0.0", "@smithy/util-config-provider": "^3.0.0", "tslib": "^2.6.2" @@ -965,12 +965,12 @@ } }, "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.577.0.tgz", - "integrity": "sha512-mMykGRFBYmlDcMhdbhNM0z1JFUaYYZ8r9WV7Dd0T2PWELv2brSAjDAOBHdJLHObDMYRnM6H0/Y974qTl3icEcQ==", + "version": "3.582.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.582.0.tgz", + "integrity": "sha512-aFCOjjNqEX2l+V8QjOWy5F7CtHIC/RlYdBuv3No6yxn+pMvVUUe6zdMk2yHWcudVpHWsyvcZzAUBliAPeFLPsQ==", "dev": true, "dependencies": { - "@aws-sdk/middleware-sdk-s3": "3.577.0", + "@aws-sdk/middleware-sdk-s3": "3.582.0", "@aws-sdk/types": "3.577.0", "@smithy/protocol-http": "^4.0.0", "@smithy/signature-v4": "^3.0.0", @@ -3346,9 +3346,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.777", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.777.tgz", - "integrity": "sha512-n02NCwLJ3wexLfK/yQeqfywCblZqLcXphzmid5e8yVPdtEcida7li0A5WQKghHNG0FeOMCzeFOzEbtAh5riXFw==", + "version": "1.4.778", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.778.tgz", + "integrity": "sha512-C6q/xcUJf/2yODRxAVCfIk4j3y3LMsD0ehiE2RQNV2cxc8XU62gR6vvYh3+etSUzlgTfil+qDHI1vubpdf0TOA==", "dev": true }, "node_modules/encodeurl": { diff --git a/package.json b/package.json index 5e368006..96b995f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "16.7.1", + "version": "16.8.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { @@ -34,9 +34,9 @@ "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", - "@aws-sdk/client-s3": "^3.577.0", + "@aws-sdk/client-s3": "^3.582.0", "@cdransf/eleventy-plugin-tabler-icons": "^1.4.0", - "@supabase/supabase-js": "^2.43.2", + "@supabase/supabase-js": "^2.43.3", "dotenv-flow": "^4.1.0", "gray-matter": "^4.0.3", "html-minifier-terser": "^7.2.0", diff --git a/src/_data/movies.js b/src/_data/movies.js index c98f57a7..74ab6c03 100644 --- a/src/_data/movies.js +++ b/src/_data/movies.js @@ -22,7 +22,8 @@ const fetchAllMovies = async () => { collected, plays, favorite, - rating + rating, + description `) .order('last_watched', { ascending: false }) .range(rangeStart, rangeStart + PAGE_SIZE - 1) @@ -49,7 +50,7 @@ export default async function () { lastWatched: item['last_watched'], dateAdded: item['last_watched'], year: item['year'], - url: `https://www.themoviedb.org/movie/${item['tmdb_id']}`, + url: `https://coryd.dev/movies/${item['tmdb_id']}`, description: `${item['title']} (${item['year']})
Watched at: ${DateTime.fromISO(item['last_watched'], { zone: 'utc' }).setZone('America/Los_Angeles').toFormat('MMMM d, yyyy, h:mma')}`, image: `https://coryd.dev/media/movies/poster-${item['tmdb_id']}.jpg`, backdrop: `https://coryd.dev/media/movies/backdrops/backdrop-${item['tmdb_id']}.jpg`, @@ -57,6 +58,8 @@ export default async function () { collected: item['collected'], favorite: item['favorite'], rating: item['rating'], + description: item['description'], + id: item['tmdb_id'], type: 'movie' } return movie diff --git a/src/_data/tv.js b/src/_data/tv.js index 8f08276e..083a4d5c 100644 --- a/src/_data/tv.js +++ b/src/_data/tv.js @@ -18,6 +18,7 @@ const fetchAllShows = async () => { collected, favorite, year, + description, episodes ( episode_number, season_number, @@ -88,7 +89,7 @@ export default async function () { showEpisodesMap[showTmdbId].episodes.push({ name: showTitle, - url: `https://www.themoviedb.org/tv/${showTmdbId}/season/${seasonNumber}/episode/${episodeNumber}`, + url: `https://coryd.dev/shows/${showTmdbId}`, subtext: `${showTitle} • S${seasonNumber}E${episodeNumber}`, episode: episodeNumber, season: seasonNumber, @@ -112,7 +113,7 @@ export default async function () { if (show.episodes.length > 1) { episodeData.push({ name: show.title, - url: `https://www.themoviedb.org/tv/${show['tmdbId']}`, + url: `https://coryd.dev/shows/${show['tmdbId']}`, subtext: `S${startingSeason}E${startingEpisode} - S${endingSeason}E${endingEpisode}`, startingEpisode, startingSeason, @@ -138,7 +139,7 @@ export default async function () { const favoriteShows = shows.filter(show => show['favorite']) const collectedShows = shows.filter(show => show['collected']) - const toWatch = shows.map(show => ({...show, url: `https://www.themoviedb.org/tv/${show['tmdb_id']}`})).filter(show => !show.episodes.some(episode => episode.last_watched_at)).sort((a, b) => a['title'].localeCompare(b['title'])) + const toWatch = shows.map(show => ({...show, url: `https://coryd.dev/shows/${show['tmdb_id']}`})).filter(show => !show.episodes.some(episode => episode.last_watched_at)).sort((a, b) => a['title'].localeCompare(b['title'])) return { shows, diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 00466d58..61e6e675 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -6,6 +6,10 @@ {{ title }} • {{ meta.siteName }} {% elsif book.title %} Books • {{ book.title }} • {{ meta.siteName }} + {% elsif movie.title %} + Movies • {{ movie.title }} • {{ meta.siteName }} + {% elsif movie.title %} + Shows • {{ show.title }} • {{ meta.siteName }} {% else %} {{ meta.siteName }} {%- endif -%} @@ -15,6 +19,10 @@ {{ post_excerpt | markdown | strip_html }} {% elsif book.description %} {{ book.description }} + {% elsif movie.description %} + {{ movie.description }} + {% elsif show.description %} + {{ show.description }} {% elsif description %} {{ description }} {% else %} @@ -34,6 +42,10 @@ {{ featuredBook.image }} {%- elsif schema == 'book' -%} {{ book.image }} + {%- elsif schema == 'movie' -%} + {{ movie.backdrop }} + {%- elsif schema == 'show' -%} + {{ meta.url }}/media/shows/backdrops/backdrop-{{ show.tmdb_id }}.jpg {%- else -%} {{ meta.meta_data.opengraph_default }} {%- endif -%} diff --git a/src/assets/styles/pages/watching.css b/src/assets/styles/pages/watching.css index 70ce6a5e..9b8727a5 100644 --- a/src/assets/styles/pages/watching.css +++ b/src/assets/styles/pages/watching.css @@ -118,6 +118,34 @@ } } +.watching-focus { + border-bottom: 0; + + & .watching-meta { + display: flex; + flex-direction: column; + gap: var(--sizing-xs); + margin-top: var(--sizing-base); + + & p { + &.title { + font-size: var(--font-size-xl); + } + + &.sub-meta { + font-size: var(--font-size-xs); + line-height: var(--line-height-xs); + } + + &.title, + &.rating, + &.sub-meta { + margin: 0; + } + } + } +} + @media screen and (min-width: 768px) { .watching.grid { grid-template-columns: repeat(3,minmax(0,1fr)) diff --git a/src/pages/main/books/book.html b/src/pages/main/books/book.html index 5147298c..d301c2c0 100644 --- a/src/pages/main/books/book.html +++ b/src/pages/main/books/book.html @@ -8,6 +8,9 @@ permalink: /books/{{ book.isbn }}/ isbn: {{ book.isbn }} schema: book --- +{%- capture alt -%} + {{ book.title }}{% if book.authors %}By {{ book.authors }}{% endif %} +{%- endcapture -%} {% tablericon "arrow-left" "Go back" %} Go back
diff --git a/src/pages/main/watching/movie.html b/src/pages/main/watching/movie.html new file mode 100644 index 00000000..75934ebc --- /dev/null +++ b/src/pages/main/watching/movie.html @@ -0,0 +1,23 @@ +--- +layout: default +pagination: + data: movies.movies + size: 1 + alias: movie +permalink: /movies/{{ movie.id }}/ +schema: movie +--- +{%- capture alt -%} + {{ movie.title }} • {{ movie.year }}{% if move.rating %} ({{ movie.rating }}){% endif %} +{%- endcapture -%} +{% tablericon "arrow-left" "Go back" %} Go back +
+ {{ alt }} +
+

{{ movie.title }}

+ {% if movie.rating %}

{{ movie.rating }}

{% endif %} + {% if movie.lastWatched %}

Last watched on: {{ movie.lastWatched | date: "%B %e, %Y" }}

{% endif %} +

View on TMDB

+
+ {% if movie.description %}

{{ movie.description }}

{% endif %} +
\ No newline at end of file diff --git a/src/pages/main/watching/show.html b/src/pages/main/watching/show.html new file mode 100644 index 00000000..7f7d84c4 --- /dev/null +++ b/src/pages/main/watching/show.html @@ -0,0 +1,23 @@ +--- +layout: default +pagination: + data: tv.shows + size: 1 + alias: show +permalink: /shows/{{ show.tmdb_id }}/ +schema: show +--- +{%- capture alt -%} + {{ show.title }} • {{ show.year }} +{%- endcapture -%} +{% assign lastWatched = show | getLastWatched %} +{% tablericon "arrow-left" "Go back" %} Go back +
+ {{ alt }} +
+

{{ show.title }}

+ {% if lastWatched %}

Last watched on: {{ lastWatched | date: "%B %e, %Y" }}

{% endif %} +

View on TMDB

+
+ {% if show.description %}

{{ show.description }}

{% endif %} +
\ No newline at end of file