cdransf/coryd.dev
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(*): add image grids for album and associated media displays

Browse source
This commit is contained in:
Cory Dransfeldt 2025-05-24 17:19:30 -07:00
parent 9b4baad5fb
commit 35260962a5
No known key found for this signature in database
44 changed files with 933 additions and 644 deletions
Download patch file Download diff file Expand all files Collapse all files

22
api/Classes/GlobalsFetcher.php
View file

@ -1,22 +0,0 @@
<?php
namespace App\Classes;
class GlobalsFetcher extends PageFetcher
{
public function fetch(): ?array
{
$cacheKey = "globals";
$cached = $this->cacheGet($cacheKey);
if ($cached) return $cached;
$globals = $this->fetchFromApi("optimized_globals");
if (empty($globals)) return null;
$this->cacheSet($cacheKey, $globals[0]);
return $globals[0];
}
}

5
config/filters/general.js
View file

@ -9,7 +9,10 @@ export default {
return string.replace(pattern, replacement); return string.replace(pattern, replacement);
}, },
replaceQuotes: (string) => string.replace(/"/g, "&quot;"), replaceQuotes: (string) => {
if (!string) return '';
return string.replace(/"/g, "&quot;");
},
htmlTruncate: (content, limit = 50) => truncateHtml(content, limit, { htmlTruncate: (content, limit = 50) => truncateHtml(content, limit, {
byWords: true, byWords: true,
ellipsis: "...", ellipsis: "...",

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "coryd.dev", "name": "coryd.dev",
"version": "6.2.0", "version": "7.0.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "coryd.dev", "name": "coryd.dev",
"version": "6.2.0", "version": "7.0.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"minisearch": "^7.1.2", "minisearch": "^7.1.2",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "coryd.dev", "name": "coryd.dev",
"version": "6.2.0", "version": "7.0.0",
"description": "The source for my personal site. Built using 11ty (and other tools).", "description": "The source for my personal site. Built using 11ty (and other tools).",
"type": "module", "type": "module",
"engines": { "engines": {

260
queries/views/content/posts.sql
View file

@ -7,123 +7,149 @@ SELECT
p.content, p.content,
p.featured, p.featured,
p.slug AS url, p.slug AS url,
CASE WHEN df.filename_disk IS NOT NULL CASE
AND df.filename_disk != '' WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN
AND df.filename_disk != '/' THEN CONCAT(globals.cdn_url, '/', df.filename_disk)
CONCAT('/', df.filename_disk) ELSE NULL
ELSE
NULL
END AS image, END AS image,
p.image_alt, p.image_alt,
CASE WHEN EXTRACT(YEAR FROM AGE(CURRENT_DATE, p.date)) > 3 THEN CASE WHEN EXTRACT(YEAR FROM AGE(CURRENT_DATE, p.date)) > 3 THEN TRUE ELSE FALSE END AS old_post,
TRUE (
ELSE SELECT json_agg(CASE
FALSE WHEN pb.collection = 'youtube_player' THEN json_build_object('type', pb.collection, 'url', yp.url)
END AS old_post, WHEN pb.collection = 'forgejo_banner' THEN json_build_object('type', pb.collection, 'url', fb.url)
( WHEN pb.collection = 'github_banner' THEN json_build_object('type', pb.collection, 'url', gb.url)
SELECT WHEN pb.collection = 'npm_banner' THEN json_build_object('type', pb.collection, 'url', nb.url, 'command', nb.command)
json_agg( WHEN pb.collection = 'rss_banner' THEN json_build_object('type', pb.collection, 'url', rb.url, 'text', rb.text)
CASE WHEN pb.collection = 'youtube_player' THEN WHEN pb.collection = 'calendar_banner' THEN json_build_object('type', pb.collection, 'url', cb.url, 'text', cb.text)
json_build_object('type', pb.collection, 'url', yp.url) WHEN pb.collection = 'hero' THEN json_build_object('type', pb.collection, 'image', CONCAT('/', df_hero.filename_disk), 'alt_text', h.alt_text)
WHEN pb.collection = 'forgejo_banner' THEN WHEN pb.collection = 'markdown' THEN json_build_object('type', pb.collection, 'text', md.text)
json_build_object('type', pb.collection, 'url', fb.url) ELSE json_build_object('type', pb.collection)
WHEN pb.collection = 'github_banner' THEN END)
json_build_object('type', pb.collection, 'url', gb.url) FROM posts_blocks pb
WHEN pb.collection = 'npm_banner' THEN LEFT JOIN youtube_player yp ON pb.collection = 'youtube_player' AND yp.id = pb.item::integer
json_build_object('type', pb.collection, 'url', nb.url, 'command', nb.command) LEFT JOIN forgejo_banner fb ON pb.collection = 'forgejo_banner' AND fb.id = pb.item::integer
WHEN pb.collection = 'rss_banner' THEN LEFT JOIN github_banner gb ON pb.collection = 'github_banner' AND gb.id = pb.item::integer
json_build_object('type', pb.collection, 'url', rb.url, 'text', rb.text) LEFT JOIN npm_banner nb ON pb.collection = 'npm_banner' AND nb.id = pb.item::integer
WHEN pb.collection = 'calendar_banner' THEN LEFT JOIN rss_banner rb ON pb.collection = 'rss_banner' AND rb.id = pb.item::integer
json_build_object('type', pb.collection, 'url', cb.url, 'text', cb.text) LEFT JOIN calendar_banner cb ON pb.collection = 'calendar_banner' AND cb.id = pb.item::integer
WHEN pb.collection = 'hero' THEN LEFT JOIN hero h ON pb.collection = 'hero' AND h.id = pb.item::integer
json_build_object('type', pb.collection, 'image', CONCAT('/', df_hero.filename_disk), 'alt_text', h.alt_text) LEFT JOIN directus_files df_hero ON h.image = df_hero.id
WHEN pb.collection = 'markdown' THEN LEFT JOIN markdown md ON pb.collection = 'markdown' AND md.id = pb.item::integer
json_build_object('type', pb.collection, 'text', md.text) WHERE pb.posts_id = p.id
ELSE ) AS blocks,
json_build_object('type', pb.collection) (
END) SELECT array_agg(t.name)
FROM FROM posts_tags pt
posts_blocks pb LEFT JOIN tags t ON pt.tags_id = t.id
LEFT JOIN youtube_player yp ON pb.collection = 'youtube_player' WHERE pt.posts_id = p.id
AND yp.id = pb.item::integer ) AS tags,
LEFT JOIN forgejo_banner fb ON pb.collection = 'forgejo_banner' (
AND fb.id = pb.item::integer SELECT json_agg(json_build_object('name', g.name, 'url', g.slug) ORDER BY g.name ASC)
LEFT JOIN github_banner gb ON pb.collection = 'github_banner' FROM posts_genres gp
AND gb.id = pb.item::integer LEFT JOIN genres g ON gp.genres_id = g.id
LEFT JOIN npm_banner nb ON pb.collection = 'npm_banner' WHERE gp.posts_id = p.id
AND nb.id = pb.item::integer ) AS genres,
LEFT JOIN rss_banner rb ON pb.collection = 'rss_banner' (
AND rb.id = pb.item::integer SELECT json_agg(json_build_object(
LEFT JOIN calendar_banner cb ON pb.collection = 'calendar_banner' 'name', a.name_string,
AND cb.id = pb.item::integer 'url', a.slug,
LEFT JOIN hero h ON pb.collection = 'hero' 'country', a.country,
AND h.id = pb.item::integer 'total_plays', a.total_plays,
LEFT JOIN directus_files df_hero ON h.image = df_hero.id 'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
LEFT JOIN markdown md ON pb.collection = 'markdown' 'grid', json_build_object(
AND md.id = pb.item::integer 'title', a.name_string,
WHERE 'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
pb.posts_id = p.id) AS blocks, 'alt', CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name_string),
( 'subtext', CASE WHEN a.total_plays > 0 THEN CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays') ELSE NULL END,
SELECT 'url', a.slug
array_agg(t.name) ),
FROM 'type', 'music'
posts_tags pt ) ORDER BY a.name_string ASC)
LEFT JOIN tags t ON pt.tags_id = t.id FROM posts_artists pa
WHERE LEFT JOIN artists a ON pa.artists_id = a.id
pt.posts_id = p.id) AS tags, LEFT JOIN directus_files df_artist ON a.art = df_artist.id
( WHERE pa.posts_id = p.id
SELECT ) AS artists,
json_agg(json_build_object('name', g.name, 'url', g.slug) ORDER BY g.name ASC)
FROM
posts_genres gp
LEFT JOIN genres g ON gp.genres_id = g.id
WHERE
gp.posts_id = p.id) AS genres,
(
SELECT
json_agg(json_build_object('name', a.name_string, 'url', a.slug, 'country', a.country, 'total_plays', a.total_plays) ORDER BY a.name_string ASC)
FROM
posts_artists pa
LEFT JOIN artists a ON pa.artists_id = a.id
WHERE
pa.posts_id = p.id) AS artists,
(
SELECT
json_agg(json_build_object('title', b.title, 'author', b.author, 'url', b.slug)
ORDER BY b.title ASC)
FROM
posts_books pbk
LEFT JOIN books b ON pbk.books_id = b.id
WHERE
pbk.posts_id = p.id) AS books,
(
SELECT
json_agg(json_build_object('title', m.title, 'year', m.year, 'url', m.slug)
ORDER BY m.year DESC)
FROM
posts_movies pm
LEFT JOIN movies m ON pm.movies_id = m.id
WHERE
pm.posts_id = p.id) AS movies,
(
SELECT
json_agg(json_build_object('title', s.title, 'year', s.year, 'url', s.slug) ORDER BY s.year DESC)
FROM
posts_shows ps
LEFT JOIN shows s ON ps.shows_id = s.id
WHERE
ps.posts_id = p.id) AS shows,
json_build_object('title', p.title, 'url', p.slug, 'description', p.description, 'content', p.content, 'date', p.date, 'image', CASE WHEN df.filename_disk IS NOT NULL
AND df.filename_disk != ''
AND df.filename_disk != '/' THEN
CONCAT('/', df.filename_disk)
ELSE
NULL
END) AS feed
FROM
posts p
LEFT JOIN directus_files df ON p.image = df.id
GROUP BY
p.id,
df.filename_disk;
(
SELECT json_agg(json_build_object(
'title', b.title,
'author', b.author,
'url', b.slug,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'grid', json_build_object(
'title', b.title,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'alt', CONCAT('Cover for ', b.title, ' by ', b.author),
'subtext', b.author,
'url', b.slug
),
'type', 'books'
) ORDER BY b.title ASC)
FROM posts_books pbk
LEFT JOIN books b ON pbk.books_id = b.id
LEFT JOIN directus_files df_book ON b.art = df_book.id
WHERE pbk.posts_id = p.id
) AS books,
(
SELECT json_agg(json_build_object(
'title', m.title,
'year', m.year,
'url', m.slug,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'grid', json_build_object(
'title', m.title,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'alt', CONCAT('Poster for ', m.title),
'subtext', m.year,
'url', m.slug
),
'type', 'movies'
) ORDER BY m.year DESC)
FROM posts_movies pm
LEFT JOIN movies m ON pm.movies_id = m.id
LEFT JOIN directus_files df_movie ON m.art = df_movie.id
WHERE pm.posts_id = p.id
) AS movies,
(
SELECT json_agg(json_build_object(
'title', s.title,
'year', s.year,
'url', s.slug,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'grid', json_build_object(
'title', s.title,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'alt', CONCAT('Artwork for ', s.title),
'subtext', s.year,
'url', s.slug
),
'type', 'tv'
) ORDER BY s.year DESC)
FROM posts_shows ps
LEFT JOIN shows s ON ps.shows_id = s.id
LEFT JOIN directus_files df_show ON s.art = df_show.id
WHERE ps.posts_id = p.id
) AS shows,
json_build_object(
'title', p.title,
'url', p.slug,
'description', p.description,
'content', p.content,
'date', p.date,
'image', CASE
WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN CONCAT(globals.cdn_url, '/', df.filename_disk)
ELSE NULL
END
) AS feed,
json_build_object(
'open_graph_image', CASE
WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN CONCAT('/', df.filename_disk)
ELSE NULL
END
) AS metadata
FROM posts p
LEFT JOIN directus_files df ON p.image = df.id
CROSS JOIN optimized_globals globals
GROUP BY p.id, df.filename_disk, globals.cdn_url;

6
queries/views/feeds/all_activity.sql
View file

@ -10,9 +10,7 @@ WITH feed_data AS (
'content', p.content 'content', p.content
) AS feed ) AS feed
FROM optimized_posts p FROM optimized_posts p
UNION ALL UNION ALL
SELECT json_build_object( SELECT json_build_object(
'title', CONCAT(l.title, ' via ', l.author->>'name'), 'title', CONCAT(l.title, ' via ', l.author->>'name'),
'url', l.link, 'url', l.link,
@ -23,9 +21,7 @@ WITH feed_data AS (
'author', l.author 'author', l.author
) AS feed ) AS feed
FROM optimized_links l FROM optimized_links l
UNION ALL UNION ALL
SELECT CASE SELECT CASE
WHEN LOWER(b.status) = 'finished' THEN WHEN LOWER(b.status) = 'finished' THEN
json_build_object( json_build_object(
@ -43,9 +39,7 @@ WITH feed_data AS (
ELSE NULL ELSE NULL
END AS feed END AS feed
FROM optimized_books b FROM optimized_books b
UNION ALL UNION ALL
SELECT CASE SELECT CASE
WHEN m.last_watched IS NOT NULL THEN WHEN m.last_watched IS NOT NULL THEN
json_build_object( json_build_object(

52
queries/views/globals/index.sql
View file

@ -1,25 +1,35 @@
CREATE OR REPLACE VIEW optimized_globals AS CREATE OR REPLACE VIEW optimized_globals AS
SELECT SELECT *
g.site_name, FROM (
g.site_description, SELECT
g.intro, g.site_name,
g.author, g.site_description,
g.email, g.intro,
g.mastodon, g.author,
g.url, g.email,
g.cdn_url, g.mastodon,
g.sitemap_uri, g.url,
g.theme_color, g.cdn_url,
g.site_type, g.sitemap_uri,
g.locale, g.theme_color,
g.lang, g.site_type,
g.webfinger_username, g.locale,
g.webfinger_hostname, g.lang,
CONCAT('/', df.filename_disk) AS avatar, g.webfinger_username,
CONCAT('/', df2.filename_disk) AS avatar_transparent, g.webfinger_hostname,
CONCAT('/', df3.filename_disk) AS avatar_header CONCAT(g.cdn_url, '/', df.filename_disk) AS avatar,
FROM CONCAT(g.cdn_url, '/', df2.filename_disk) AS avatar_transparent,
globals g CONCAT(g.cdn_url, '/', df3.filename_disk) AS avatar_header,
json_build_object(
'open_graph_image', CASE
WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN
CONCAT('/', df.filename_disk)
ELSE NULL
END
) AS metadata
FROM globals g
LEFT JOIN directus_files df ON g.avatar = df.id LEFT JOIN directus_files df ON g.avatar = df.id
LEFT JOIN directus_files df2 ON g.avatar_transparent = df2.id LEFT JOIN directus_files df2 ON g.avatar_transparent = df2.id
LEFT JOIN directus_files df3 ON g.avatar_header = df3.id LEFT JOIN directus_files df3 ON g.avatar_header = df3.id
LIMIT 1
) sub;

13
queries/views/globals/pages.sql
View file

@ -4,7 +4,13 @@ SELECT
p.title, p.title,
p.permalink, p.permalink,
p.description, p.description,
CONCAT('/', df.filename_disk) AS open_graph_image, json_build_object(
'open_graph_image', CASE
WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN
CONCAT('/', df.filename_disk)
ELSE NULL
END
) AS metadata,
p.updated, p.updated,
( (
SELECT SELECT
@ -52,7 +58,8 @@ WHERE
FROM FROM
pages p pages p
LEFT JOIN directus_files df ON p.open_graph_image = df.id LEFT JOIN directus_files df ON p.open_graph_image = df.id
CROSS JOIN optimized_globals globals
GROUP BY GROUP BY
p.id, p.id,
df.filename_disk; df.filename_disk,
globals.cdn_url;

245
queries/views/media/books.sql
View file

@ -10,98 +10,161 @@ SELECT
b.star_rating AS rating, b.star_rating AS rating,
b.review, b.review,
b.slug AS url, b.slug AS url,
CONCAT('/', df.filename_disk) AS image, CONCAT(globals.cdn_url, '/', df.filename_disk) AS image,
b.favorite, b.favorite,
b.tattoo, b.tattoo,
( (
SELECT SELECT array_agg(t.name)
array_agg(t.name) FROM books_tags bt
FROM
books_tags bt
LEFT JOIN tags t ON bt.tags_id = t.id LEFT JOIN tags t ON bt.tags_id = t.id
WHERE WHERE bt.books_id = b.id
bt.books_id = b.id) AS tags, ) AS tags,
( (
SELECT SELECT json_agg(
json_agg(json_build_object('name', a.name_string, 'url', a.slug, 'country', a.country, 'total_plays', a.total_plays) json_build_object(
ORDER BY a.name_string ASC) 'name', a.name_string,
FROM 'url', a.slug,
books_artists ba 'country', a.country,
LEFT JOIN artists a ON ba.artists_id = a.id 'total_plays', a.total_plays,
WHERE 'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
ba.books_id = b.id) AS artists, 'grid', json_build_object(
( 'title', a.name_string,
SELECT 'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
json_agg(json_build_object('title', m.title, 'year', m.year, 'url', m.slug) 'alt', CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name_string),
ORDER BY m.year DESC) 'subtext', CASE
FROM WHEN a.total_plays > 0 THEN CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays')
movies_books mb ELSE NULL
LEFT JOIN movies m ON mb.movies_id = m.id END,
WHERE 'url', a.slug
mb.books_id = b.id) AS movies, ),
( 'type', 'music'
SELECT )
json_agg(json_build_object('name', g.name, 'url', g.slug) ORDER BY a.name_string ASC
ORDER BY g.name ASC)
FROM
genres_books gb
LEFT JOIN genres g ON gb.genres_id = g.id
WHERE
gb.books_id = b.id) AS genres,
(
SELECT
json_agg(json_build_object('title', s.title, 'year', s.year, 'url', s.slug)
ORDER BY s.year DESC)
FROM
shows_books sb
LEFT JOIN shows s ON sb.shows_id = s.id
WHERE
sb.books_id = b.id) AS shows,
(
SELECT
json_agg(json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
ORDER BY p.date DESC)
FROM
posts_books pb
LEFT JOIN posts p ON pb.posts_id = p.id
WHERE
pb.books_id = b.id) AS posts,
(
SELECT
json_agg(json_build_object('title', rb.title, 'author', rb.author, 'url', rb.slug)
ORDER BY rb.title ASC)
FROM
related_books rbk
LEFT JOIN books rb ON rbk.related_books_id = rb.id
WHERE
rbk.books_id = b.id) AS related_books,
json_build_object(
'title', NULL,
'image', CONCAT('/', df.filename_disk),
'url', b.slug,
'alt', CONCAT('Book cover from ', b.title, ' by ', b.author),
'subtext', CASE
WHEN b.star_rating IS NOT NULL THEN b.star_rating::text
ELSE NULL
END
) AS grid,
CASE
WHEN LOWER(b.read_status) = 'finished' AND b.star_rating IS NOT NULL THEN
json_build_object(
'title', CONCAT(b.title, ' by ', b.author, ' (', b.star_rating, ')'),
'url', b.slug,
'date', b.date_finished,
'description', COALESCE(b.review, b.description),
'image', CONCAT('/', df.filename_disk),
'rating', b.star_rating
) )
ELSE FROM books_artists ba
NULL LEFT JOIN artists a ON ba.artists_id = a.id
END AS feed, LEFT JOIN directus_files df_artist ON a.art = df_artist.id
(SELECT TO_CHAR(days_read, 'FM999G999G999') FROM reading_streak LIMIT 1) AS days_read WHERE ba.books_id = b.id
FROM ) AS artists,
books b (
LEFT JOIN directus_files df ON b.art = df.id SELECT json_agg(
GROUP BY json_build_object(
b.id, 'title', m.title,
df.filename_disk; 'year', m.year,
'url', m.slug,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'grid', json_build_object(
'title', m.title,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'alt', CONCAT('Poster for ', m.title),
'subtext', m.year,
'url', m.slug
),
'type', 'movies'
)
ORDER BY m.year DESC
)
FROM movies_books mb
LEFT JOIN movies m ON mb.movies_id = m.id
LEFT JOIN directus_files df_movie ON m.art = df_movie.id
WHERE mb.books_id = b.id
) AS movies,
(
SELECT json_agg(
json_build_object('name', g.name, 'url', g.slug)
ORDER BY g.name ASC
)
FROM genres_books gb
LEFT JOIN genres g ON gb.genres_id = g.id
WHERE gb.books_id = b.id
) AS genres,
(
SELECT json_agg(
json_build_object(
'title', s.title,
'year', s.year,
'url', s.slug,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'grid', json_build_object(
'title', s.title,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'alt', CONCAT('Artwork for ', s.title),
'subtext', s.year,
'url', s.slug
),
'type', 'tv'
)
ORDER BY s.year DESC
)
FROM shows_books sb
LEFT JOIN shows s ON sb.shows_id = s.id
LEFT JOIN directus_files df_show ON s.art = df_show.id
WHERE sb.books_id = b.id
) AS shows,
(
SELECT json_agg(
json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
ORDER BY p.date DESC
)
FROM posts_books pb
LEFT JOIN posts p ON pb.posts_id = p.id
WHERE pb.books_id = b.id
) AS posts,
(
SELECT json_agg(
json_build_object(
'title', rb.title,
'author', rb.author,
'url', rb.slug,
'image', CONCAT(globals.cdn_url, '/', df_rb.filename_disk),
'grid', json_build_object(
'title', rb.title,
'image', CONCAT(globals.cdn_url, '/', df_rb.filename_disk),
'alt', CONCAT('Cover for ', rb.title, ' by ', rb.author),
'subtext', rb.author,
'url', rb.slug
),
'type', 'books'
)
ORDER BY rb.title ASC
)
FROM related_books rbk
LEFT JOIN books rb ON rbk.related_books_id = rb.id
LEFT JOIN directus_files df_rb ON rb.art = df_rb.id
WHERE rbk.books_id = b.id
) AS related_books,
json_build_object(
'title', b.title,
'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'url', b.slug,
'alt', CONCAT('Book cover from ', b.title, ' by ', b.author),
'subtext', CASE
WHEN b.star_rating IS NOT NULL THEN b.star_rating::text
ELSE NULL
END,
'type', 'books'
) AS grid,
CASE
WHEN LOWER(b.read_status) = 'finished' AND b.star_rating IS NOT NULL THEN
json_build_object(
'title', CONCAT(b.title, ' by ', b.author, ' (', b.star_rating, ')'),
'url', b.slug,
'date', b.date_finished,
'description', COALESCE(b.review, b.description),
'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'rating', b.star_rating
)
ELSE NULL
END AS feed,
(SELECT TO_CHAR(days_read, 'FM999G999G999') FROM reading_streak LIMIT 1) AS days_read,
json_build_object(
'open_graph_image', CASE
WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN
CONCAT('/', df.filename_disk)
ELSE NULL
END
) AS metadata
FROM books b
LEFT JOIN directus_files df ON b.art = df.id
CROSS JOIN optimized_globals globals
GROUP BY b.id, df.filename_disk, globals.cdn_url;

241
queries/views/media/movies.sql
View file

@ -12,108 +12,157 @@ SELECT
m.description, m.description,
m.review, m.review,
m.slug AS url, m.slug AS url,
CONCAT('/', df.filename_disk) AS image, CONCAT(globals.cdn_url, '/', df.filename_disk) AS image,
CONCAT('/', df2.filename_disk) AS backdrop, CONCAT(globals.cdn_url, '/', df2.filename_disk) AS backdrop,
json_build_object( json_build_object(
'title', NULL, 'title', m.title,
'url', m.slug, 'url', m.slug,
'image', CONCAT('/', df.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'backdrop', CONCAT('/', df2.filename_disk), 'backdrop', CONCAT(globals.cdn_url, '/', df2.filename_disk),
'alt', CONCAT('Poster from ', m.title), 'alt', CONCAT('Poster from ', m.title),
'subtext', CASE 'subtext', CASE
WHEN m.last_watched >= NOW() - INTERVAL '90 days' THEN WHEN m.last_watched >= NOW() - INTERVAL '90 days' THEN m.star_rating::text
m.star_rating::text ELSE m.year::text
ELSE END,
m.year::text 'type', 'movies'
END
) AS grid, ) AS grid,
( (
SELECT SELECT array_agg(t.name)
array_agg(t.name) FROM movies_tags mt
FROM
movies_tags mt
LEFT JOIN tags t ON mt.tags_id = t.id LEFT JOIN tags t ON mt.tags_id = t.id
WHERE WHERE mt.movies_id = m.id
mt.movies_id = m.id) AS tags, ) AS tags,
( (
SELECT SELECT json_agg(json_build_object('name', g.name, 'url', g.slug)
json_agg(json_build_object('name', g.name, 'url', g.slug)
ORDER BY g.name ASC) ORDER BY g.name ASC)
FROM FROM genres_movies gm
genres_movies gm LEFT JOIN genres g ON gm.genres_id = g.id
LEFT JOIN genres g ON gm.genres_id = g.id WHERE gm.movies_id = m.id
WHERE ) AS genres,
gm.movies_id = m.id) AS genres, (
( SELECT json_agg(
SELECT json_build_object(
json_agg(json_build_object('name', a.name_string, 'url', a.slug, 'country', a.country, 'total_plays', a.total_plays) 'name', a.name_string,
ORDER BY a.name_string ASC) 'url', a.slug,
FROM 'country', a.country,
movies_artists ma 'total_plays', a.total_plays,
LEFT JOIN artists a ON ma.artists_id = a.id 'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
WHERE 'grid', json_build_object(
ma.movies_id = m.id) AS artists, 'title', a.name_string,
( 'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
SELECT 'alt', CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name_string),
json_agg(json_build_object('title', b.title, 'author', b.author, 'url', b.slug) 'subtext', CASE
ORDER BY b.title ASC) WHEN a.total_plays > 0 THEN CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays')
FROM ELSE NULL
movies_books mb END,
LEFT JOIN books b ON mb.books_id = b.id 'url', a.slug
WHERE ),
mb.movies_id = m.id) AS books, 'type', 'music'
( )
SELECT ORDER BY a.name_string
json_agg(json_build_object('title', s.title, 'year', s.year, 'url', s.slug)
ORDER BY s.year DESC)
FROM
shows_movies sm
LEFT JOIN shows s ON sm.shows_id = s.id
WHERE
sm.movies_id = m.id) AS shows,
(
SELECT
json_agg(json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
ORDER BY p.date DESC)
FROM
posts_movies pm
LEFT JOIN posts p ON pm.posts_id = p.id
WHERE
pm.movies_id = m.id) AS posts,
(
SELECT
json_agg(json_build_object('title', rm.title, 'year', rm.year, 'url', rm.slug)
ORDER BY rm.year DESC)
FROM
related_movies r
LEFT JOIN movies rm ON r.related_movies_id = rm.id
WHERE
r.movies_id = m.id) AS related_movies,
CASE
WHEN m.star_rating IS NOT NULL AND m.last_watched IS NOT NULL THEN
json_build_object(
'title', CONCAT(m.title, CASE
WHEN m.star_rating IS NOT NULL THEN CONCAT(' (', m.star_rating, ')')
ELSE ''
END),
'url', m.slug,
'date', m.last_watched,
'description', COALESCE(m.review, m.description),
'image', CONCAT('/', df.filename_disk),
'rating', m.star_rating
) )
ELSE FROM movies_artists ma
NULL LEFT JOIN artists a ON ma.artists_id = a.id
END AS feed LEFT JOIN directus_files df_artist ON a.art = df_artist.id
FROM WHERE ma.movies_id = m.id
movies m ) AS artists,
LEFT JOIN directus_files df ON m.art = df.id (
LEFT JOIN directus_files df2 ON m.backdrop = df2.id SELECT json_agg(
GROUP BY json_build_object(
m.id, 'title', b.title,
df.filename_disk, 'author', b.author,
df2.filename_disk 'url', b.slug,
ORDER BY 'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
m.last_watched DESC, 'grid', json_build_object(
m.favorite DESC, 'title', b.title,
m.title ASC; 'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'alt', CONCAT('Cover for ', b.title, ' by ', b.author),
'subtext', b.author,
'url', b.slug
),
'type', 'books'
)
ORDER BY b.title
)
FROM movies_books mb
LEFT JOIN books b ON mb.books_id = b.id
LEFT JOIN directus_files df_book ON b.art = df_book.id
WHERE mb.movies_id = m.id
) AS books,
(
SELECT json_agg(
json_build_object(
'title', s.title,
'year', s.year,
'url', s.slug,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'grid', json_build_object(
'title', s.title,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'alt', CONCAT('Artwork for ', s.title),
'subtext', s.year,
'url', s.slug
),
'type', 'tv'
)
ORDER BY s.year DESC
)
FROM shows_movies sm
LEFT JOIN shows s ON sm.shows_id = s.id
LEFT JOIN directus_files df_show ON s.art = df_show.id
WHERE sm.movies_id = m.id
) AS shows,
(
SELECT json_agg(json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
ORDER BY p.date DESC)
FROM posts_movies pm
LEFT JOIN posts p ON pm.posts_id = p.id
WHERE pm.movies_id = m.id
) AS posts,
(
SELECT json_agg(
json_build_object(
'title', rm.title,
'year', rm.year,
'url', rm.slug,
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'grid', json_build_object(
'title', rm.title,
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'alt', CONCAT('Poster for ', rm.title),
'subtext', rm.year,
'url', rm.slug
),
'type', 'movies'
)
ORDER BY rm.year DESC
)
FROM related_movies r
LEFT JOIN movies rm ON r.related_movies_id = rm.id
LEFT JOIN directus_files df_related ON rm.art = df_related.id
WHERE r.movies_id = m.id
) AS related_movies,
CASE
WHEN m.star_rating IS NOT NULL AND m.last_watched IS NOT NULL THEN
json_build_object(
'title', CONCAT(m.title, ' (', m.star_rating, ')'),
'url', m.slug,
'date', m.last_watched,
'description', COALESCE(m.review, m.description),
'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'rating', m.star_rating
)
ELSE NULL
END AS feed,
json_build_object(
'open_graph_image', CASE
WHEN df2.filename_disk IS NOT NULL AND df2.filename_disk != '' AND df2.filename_disk != '/' THEN
CONCAT('/', df2.filename_disk)
ELSE NULL
END
) AS metadata
FROM movies m
LEFT JOIN directus_files df ON m.art = df.id
LEFT JOIN directus_files df2 ON m.backdrop = df2.id
CROSS JOIN optimized_globals globals
GROUP BY m.id, df.filename_disk, df2.filename_disk, globals.cdn_url;

3
queries/views/media/music/album_releases.sql
View file

@ -9,7 +9,7 @@ SELECT
EXTRACT(EPOCH FROM a.release_date) AS release_timestamp, EXTRACT(EPOCH FROM a.release_date) AS release_timestamp,
json_build_object( json_build_object(
'title', a.name, 'title', a.name,
'image', CONCAT('/', df.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'url', COALESCE(a.release_link, ar.slug), 'url', COALESCE(a.release_link, ar.slug),
'alt', CONCAT(a.name, ' by ', ar.name_string), 'alt', CONCAT(a.name, ' by ', ar.name_string),
'subtext', CONCAT(ar.name_string, ' • ', TO_CHAR(a.release_date, 'Mon FMDD, YYYY')) 'subtext', CONCAT(ar.name_string, ' • ', TO_CHAR(a.release_date, 'Mon FMDD, YYYY'))
@ -18,5 +18,6 @@ FROM
albums a albums a
LEFT JOIN directus_files df ON a.art = df.id LEFT JOIN directus_files df ON a.art = df.id
LEFT JOIN artists ar ON a.artist = ar.id LEFT JOIN artists ar ON a.artist = ar.id
CROSS JOIN optimized_globals globals
WHERE WHERE
a.release_date IS NOT NULL; a.release_date IS NOT NULL;

9
queries/views/media/music/albums.sql
View file

@ -6,10 +6,10 @@ SELECT
al.total_plays AS total_plays_raw, al.total_plays AS total_plays_raw,
ar.name_string AS artist_name, ar.name_string AS artist_name,
ar.slug AS artist_url, ar.slug AS artist_url,
CONCAT('/', df_album.filename_disk) AS image, CONCAT(globals.cdn_url, '/', df_album.filename_disk) AS image,
json_build_object( json_build_object(
'title', al.name, 'title', al.name,
'image', CONCAT('/', df_album.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df_album.filename_disk),
'url', ar.slug, 'url', ar.slug,
'alt', CONCAT('Cover for ', al.name, ' by ', ar.name_string), 'alt', CONCAT('Cover for ', al.name, ' by ', ar.name_string),
'subtext', CONCAT(to_char(al.total_plays, 'FM999,999,999,999'), ' plays') 'subtext', CONCAT(to_char(al.total_plays, 'FM999,999,999,999'), ' plays')
@ -18,7 +18,7 @@ SELECT
'title', al.name, 'title', al.name,
'artist', ar.name_string, 'artist', ar.name_string,
'plays', to_char(al.total_plays, 'FM999,999,999,999'), 'plays', to_char(al.total_plays, 'FM999,999,999,999'),
'image', CONCAT('/', df_album.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df_album.filename_disk),
'url', ar.slug, 'url', ar.slug,
'year', al.release_year, 'year', al.release_year,
'alt', CONCAT('Cover for ', al.name, ' by ', ar.name_string) 'alt', CONCAT('Cover for ', al.name, ' by ', ar.name_string)
@ -26,4 +26,5 @@ SELECT
FROM albums al FROM albums al
LEFT JOIN artists ar ON al.artist = ar.id LEFT JOIN artists ar ON al.artist = ar.id
LEFT JOIN directus_files df_album ON al.art = df_album.id LEFT JOIN directus_files df_album ON al.art = df_album.id
GROUP BY al.id, ar.name_string, ar.slug, df_album.filename_disk; CROSS JOIN optimized_globals globals
GROUP BY al.id, ar.name_string, ar.slug, df_album.filename_disk, globals.cdn_url;

108
queries/views/media/music/artists.sql
View file

@ -14,10 +14,10 @@ SELECT
json_build_object('name', g.name, 'url', g.slug, 'emoji', g.emoji) AS genre, json_build_object('name', g.name, 'url', g.slug, 'emoji', g.emoji) AS genre,
ar.emoji, ar.emoji,
ar.tattoo, ar.tattoo,
CONCAT('/', df.filename_disk) AS image, CONCAT(globals.cdn_url, '/', df.filename_disk) AS image,
json_build_object( json_build_object(
'title', ar.name_string, 'title', ar.name_string,
'image', CONCAT('/', df.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'url', ar.slug, 'url', ar.slug,
'alt', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays of ', ar.name_string), 'alt', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays of ', ar.name_string),
'subtext', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays') 'subtext', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays')
@ -28,7 +28,7 @@ SELECT
'genre_url', g.slug, 'genre_url', g.slug,
'emoji', COALESCE(ar.emoji, g.emoji), 'emoji', COALESCE(ar.emoji, g.emoji),
'plays', to_char(ar.total_plays, 'FM999,999,999,999'), 'plays', to_char(ar.total_plays, 'FM999,999,999,999'),
'image', CONCAT('/', df.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'url', ar.slug, 'url', ar.slug,
'alt', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays of ', ar.name_string) 'alt', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays of ', ar.name_string)
) AS table, ) AS table,
@ -41,15 +41,15 @@ SELECT
'art', df_album.filename_disk, 'art', df_album.filename_disk,
'grid', json_build_object( 'grid', json_build_object(
'title', a.name, 'title', a.name,
'image', CONCAT('/', df_album.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df_album.filename_disk),
'alt', CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name), 'alt', CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name),
'subtext', 'subtext', CASE
CASE WHEN a.total_plays > 0
WHEN a.total_plays > 0 THEN CONCAT(a.release_year, ' • ', to_char(a.total_plays, 'FM999,999,999,999'), ' plays')
THEN CONCAT(a.release_year, ' • ', to_char(a.total_plays, 'FM999,999,999,999'), ' plays') ELSE CONCAT(a.release_year, '')
ELSE CONCAT(a.release_year, '') END
END ),
) 'type', 'albums'
) )
ORDER BY a.release_year ORDER BY a.release_year
) )
@ -76,60 +76,116 @@ SELECT
) AS concerts, ) AS concerts,
( (
SELECT json_agg( SELECT json_agg(
json_build_object('title', b.title, 'author', b.author, 'url', b.slug) json_build_object(
'title', b.title,
'author', b.author,
'url', b.slug,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'grid', json_build_object(
'title', b.title,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'alt', CONCAT('Cover for ', b.title, ' by ', b.author),
'subtext', b.author,
'url', b.slug
),
'type', 'books'
)
ORDER BY b.title ASC ORDER BY b.title ASC
) )
FROM books_artists ba FROM books_artists ba
LEFT JOIN books b ON ba.books_id = b.id LEFT JOIN books b ON ba.books_id = b.id
LEFT JOIN directus_files df_book ON b.art = df_book.id
WHERE ba.artists_id = ar.id WHERE ba.artists_id = ar.id
) AS books, ) AS books,
( (
SELECT json_agg( SELECT json_agg(
json_build_object('title', m.title, 'year', m.year, 'url', m.slug) json_build_object(
'title', m.title,
'year', m.year,
'url', m.slug,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'grid', json_build_object(
'title', m.title,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'alt', CONCAT('Poster for ', m.title),
'subtext', m.year,
'url', m.slug
),
'type', 'movies'
)
ORDER BY m.year DESC ORDER BY m.year DESC
) )
FROM movies_artists ma FROM movies_artists ma
LEFT JOIN movies m ON ma.movies_id = m.id LEFT JOIN movies m ON ma.movies_id = m.id
LEFT JOIN directus_files df_movie ON m.art = df_movie.id
WHERE ma.artists_id = ar.id WHERE ma.artists_id = ar.id
) AS movies, ) AS movies,
( (
SELECT json_agg( SELECT json_agg(
json_build_object('title', s.title, 'year', s.year, 'url', s.slug) json_build_object(
'title', s.title,
'year', s.year,
'url', s.slug,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'grid', json_build_object(
'title', s.title,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'alt', CONCAT('Artwork for ', s.title),
'subtext', s.year,
'url', s.slug
),
'type', 'tv'
)
ORDER BY s.year DESC ORDER BY s.year DESC
) )
FROM shows_artists sa FROM shows_artists sa
LEFT JOIN shows s ON sa.shows_id = s.id LEFT JOIN shows s ON sa.shows_id = s.id
LEFT JOIN directus_files df_show ON s.art = df_show.id
WHERE sa.artists_id = ar.id WHERE sa.artists_id = ar.id
) AS shows, ) AS shows,
(
SELECT json_agg(
json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
ORDER BY p.date DESC
)
FROM posts_artists pa
LEFT JOIN posts p ON pa.posts_id = p.id
WHERE pa.artists_id = ar.id
) AS posts,
( (
SELECT json_agg( SELECT json_agg(
json_build_object( json_build_object(
'name', related_ar.name_string, 'name', related_ar.name_string,
'url', related_ar.slug, 'url', related_ar.slug,
'country', related_ar.country, 'country', related_ar.country,
'total_plays', to_char(related_ar.total_plays, 'FM999,999,999,999') 'total_plays', to_char(related_ar.total_plays, 'FM999,999,999,999'),
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'grid', json_build_object(
'title', related_ar.name_string,
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'alt', CONCAT(to_char(related_ar.total_plays, 'FM999,999,999,999'), ' plays of ', related_ar.name_string),
'subtext', CASE
WHEN related_ar.total_plays > 0
THEN CONCAT(to_char(related_ar.total_plays, 'FM999,999,999,999'), ' plays')
ELSE NULL
END,
'url', related_ar.slug
),
'type', 'music'
) )
ORDER BY related_ar.name_string ORDER BY related_ar.name_string
) )
FROM related_artists ra FROM related_artists ra
LEFT JOIN artists related_ar ON ra.related_artists_id = related_ar.id LEFT JOIN artists related_ar ON ra.related_artists_id = related_ar.id
LEFT JOIN directus_files df_related ON related_ar.art = df_related.id
WHERE ra.artists_id = ar.id WHERE ra.artists_id = ar.id
) AS related_artists ) AS related_artists,
json_build_object(
'open_graph_image', CASE
WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN
CONCAT('/', df.filename_disk)
ELSE NULL
END
) AS metadata
FROM artists ar FROM artists ar
LEFT JOIN directus_files df ON ar.art = df.id LEFT JOIN directus_files df ON ar.art = df.id
LEFT JOIN genres g ON ar.genres = g.id LEFT JOIN genres g ON ar.genres = g.id
CROSS JOIN optimized_globals globals
GROUP BY GROUP BY
ar.id, ar.id,
df.filename_disk, df.filename_disk,
g.name, g.name,
g.slug, g.slug,
g.emoji; g.emoji,
globals.cdn_url;

14
queries/views/media/music/listens.sql
View file

@ -1,17 +1,20 @@
CREATE OR REPLACE VIEW optimized_listens AS SELECT DISTINCT ON (l.id, l.listened_at, l.track_name, l.artist_name, l.album_name) CREATE OR REPLACE VIEW optimized_listens AS
SELECT DISTINCT ON (l.id, l.listened_at, l.track_name, l.artist_name, l.album_name)
l.id, l.id,
l.listened_at, l.listened_at,
l.track_name, l.track_name,
l.artist_name, l.artist_name,
l.album_name, l.album_name,
l.album_key, l.album_key,
CONCAT('/', df_art.filename_disk) AS artist_art, CONCAT(globals.cdn_url, '/', df_art.filename_disk) AS artist_art,
CONCAT('/', df_art.filename_disk) AS opengraph_image_artist,
a.genres AS artist_genres, a.genres AS artist_genres,
g.name AS genre_name, g.name AS genre_name,
g.slug AS genre_url, g.slug AS genre_url,
a.country AS artist_country, a.country AS artist_country,
a.slug AS artist_url, a.slug AS artist_url,
CONCAT('/', df_album.filename_disk) AS album_art CONCAT(globals.cdn_url, '/', df_album.filename_disk) AS album_art,
CONCAT('/', df_album.filename_disk) AS opengraph_image_album
FROM FROM
listens l listens l
LEFT JOIN artists a ON (l.artist_name = a.name_string) LEFT JOIN artists a ON (l.artist_name = a.name_string)
@ -19,10 +22,11 @@ FROM
LEFT JOIN directus_files df_art ON (a.art = df_art.id) LEFT JOIN directus_files df_art ON (a.art = df_art.id)
LEFT JOIN directus_files df_album ON (al.art = df_album.id) LEFT JOIN directus_files df_album ON (al.art = df_album.id)
LEFT JOIN genres g ON (a.genres = g.id) LEFT JOIN genres g ON (a.genres = g.id)
CROSS JOIN optimized_globals globals
ORDER BY ORDER BY
l.id, l.id,
l.listened_at, l.listened_at,
l.track_name, l.track_name,
l.artist_name, l.artist_name,
l.album_name; l.album_name,
globals.cdn_url;

19
queries/views/media/music/month/albums.sql
View file

@ -5,7 +5,20 @@ SELECT
COUNT(*) AS plays, COUNT(*) AS plays,
ol.album_art, ol.album_art,
ol.artist_url, ol.artist_url,
json_build_object('title', ol.album_name, 'image', ol.album_art, 'url', ol.artist_url, 'alt', CONCAT(ol.album_name, ' by ', ol.artist_name), 'subtext', ol.artist_name) AS grid json_build_object(
'title', ol.album_name,
'image', ol.album_art,
'url', ol.artist_url,
'alt', CONCAT(ol.album_name, ' by ', ol.artist_name),
'subtext', ol.artist_name
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_album IS NOT NULL AND ol.opengraph_image_album != '' AND ol.opengraph_image_album != '/' THEN ol.opengraph_image_album
ELSE NULL
END
) AS metadata
FROM FROM
optimized_listens ol optimized_listens ol
WHERE WHERE
@ -14,7 +27,7 @@ GROUP BY
ol.album_name, ol.album_name,
ol.artist_name, ol.artist_name,
ol.album_art, ol.album_art,
ol.artist_url ol.artist_url,
ol.opengraph_image_album
ORDER BY ORDER BY
plays DESC; plays DESC;

19
queries/views/media/music/month/artists.sql
View file

@ -5,7 +5,20 @@ SELECT
ol.artist_art, ol.artist_art,
ol.artist_url, ol.artist_url,
ARRAY_AGG(DISTINCT ol.genre_name) AS genres, ARRAY_AGG(DISTINCT ol.genre_name) AS genres,
json_build_object('title', ol.artist_name, 'image', ol.artist_art, 'url', ol.artist_url, 'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name), 'subtext', CONCAT(COUNT(*), ' plays')) AS grid json_build_object(
'title', ol.artist_name,
'image', ol.artist_art,
'url', ol.artist_url,
'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name),
'subtext', CONCAT(COUNT(*), ' plays')
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_artist IS NOT NULL AND ol.opengraph_image_artist != '' AND ol.opengraph_image_artist != '/' THEN ol.opengraph_image_artist
ELSE NULL
END
) AS metadata
FROM FROM
optimized_listens ol optimized_listens ol
WHERE WHERE
@ -13,7 +26,7 @@ WHERE
GROUP BY GROUP BY
ol.artist_name, ol.artist_name,
ol.artist_art, ol.artist_art,
ol.artist_url ol.artist_url,
ol.opengraph_image_artist
ORDER BY ORDER BY
plays DESC; plays DESC;

19
queries/views/media/music/week/albums.sql
View file

@ -5,7 +5,20 @@ SELECT
COUNT(*) AS plays, COUNT(*) AS plays,
ol.album_art, ol.album_art,
ol.artist_url, ol.artist_url,
json_build_object('title', ol.album_name, 'image', ol.album_art, 'url', ol.artist_url, 'alt', CONCAT(ol.album_name, ' by ', ol.artist_name), 'subtext', ol.artist_name) AS grid json_build_object(
'title', ol.album_name,
'image', ol.album_art,
'url', ol.artist_url,
'alt', CONCAT(ol.album_name, ' by ', ol.artist_name),
'subtext', ol.artist_name
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_album IS NOT NULL AND ol.opengraph_image_album != '' AND ol.opengraph_image_album != '/' THEN ol.opengraph_image_album
ELSE NULL
END
) AS metadata
FROM FROM
optimized_listens ol optimized_listens ol
WHERE WHERE
@ -14,7 +27,7 @@ GROUP BY
ol.album_name, ol.album_name,
ol.artist_name, ol.artist_name,
ol.album_art, ol.album_art,
ol.artist_url ol.artist_url,
ol.opengraph_image_album
ORDER BY ORDER BY
plays DESC; plays DESC;

18
queries/views/media/music/week/artists.sql
View file

@ -5,7 +5,20 @@ SELECT
ol.artist_art, ol.artist_art,
ol.artist_url, ol.artist_url,
ARRAY_AGG(DISTINCT ol.genre_name) AS genres, ARRAY_AGG(DISTINCT ol.genre_name) AS genres,
json_build_object('title', ol.artist_name, 'image', ol.artist_art, 'url', ol.artist_url, 'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name), 'subtext', CONCAT(COUNT(*), ' plays')) AS grid json_build_object(
'title', ol.artist_name,
'image', ol.artist_art,
'url', ol.artist_url,
'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name),
'subtext', CONCAT(COUNT(*), ' plays')
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_artist IS NOT NULL AND ol.opengraph_image_artist != '' AND ol.opengraph_image_artist != '/' THEN ol.opengraph_image_artist
ELSE NULL
END
) AS metadata
FROM FROM
optimized_listens ol optimized_listens ol
WHERE WHERE
@ -13,6 +26,7 @@ WHERE
GROUP BY GROUP BY
ol.artist_name, ol.artist_name,
ol.artist_art, ol.artist_art,
ol.artist_url ol.artist_url,
ol.opengraph_image_artist
ORDER BY ORDER BY
plays DESC; plays DESC;

206
queries/views/media/shows/shows.sql
View file

@ -10,35 +10,36 @@ SELECT
s.review, s.review,
s.ongoing, s.ongoing,
s.slug AS url, s.slug AS url,
CONCAT('/', df_art.filename_disk) AS image, CONCAT(globals.cdn_url, '/', df_art.filename_disk) AS image,
CONCAT('/', df_backdrop.filename_disk) AS backdrop, CONCAT(globals.cdn_url, '/', df_backdrop.filename_disk) AS backdrop,
json_build_object( json_build_object(
'title', NULL, 'title', s.title,
'image', CONCAT('/', df_art.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df_art.filename_disk),
'backdrop', CONCAT('/', df_backdrop.filename_disk), 'backdrop', CONCAT(globals.cdn_url, '/', df_backdrop.filename_disk),
'url', s.slug, 'url', s.slug,
'alt', CONCAT('Poster from ', s.title), 'alt', CONCAT('Poster from ', s.title),
'subtext', CASE 'subtext', CASE
WHEN ( WHEN (
SELECT MAX(e1.last_watched_at) SELECT MAX(e1.last_watched_at)
FROM episodes e1 FROM episodes e1
WHERE e1.show = s.id WHERE e1.show = s.id
) >= NOW() - INTERVAL '90 days' THEN ) >= NOW() - INTERVAL '90 days' THEN
(SELECT CONCAT('S', e2.season_number, 'E', e2.episode_number) (SELECT CONCAT('S', e2.season_number, 'E', e2.episode_number)
FROM episodes e2 FROM episodes e2
WHERE e2.show = s.id WHERE e2.show = s.id
ORDER BY e2.last_watched_at DESC, e2.season_number DESC, e2.episode_number DESC ORDER BY e2.last_watched_at DESC, e2.season_number DESC, e2.episode_number DESC
LIMIT 1) LIMIT 1)
ELSE ELSE
s.year::text s.year::text
END END,
'type', 'tv'
) AS grid, ) AS grid,
json_build_object( json_build_object(
'title', s.title, 'title', s.title,
'year', s.year, 'year', s.year,
'url', s.slug, 'url', s.slug,
'image', CONCAT('/', df_art.filename_disk), 'image', CONCAT(globals.cdn_url, '/', df_art.filename_disk),
'backdrop', CONCAT('/', df_backdrop.filename_disk), 'backdrop', CONCAT(globals.cdn_url, '/', df_backdrop.filename_disk),
'formatted_episode', COALESCE(( 'formatted_episode', COALESCE((
SELECT CONCAT('S', e2.season_number, 'E', e2.episode_number) SELECT CONCAT('S', e2.season_number, 'E', e2.episode_number)
FROM episodes e2 FROM episodes e2
@ -53,73 +54,126 @@ SELECT
) )
) AS episode, ) AS episode,
( (
SELECT SELECT json_agg(
json_agg(json_build_object('title', m.title, 'year', m.year, 'url', m.slug) json_build_object(
ORDER BY m.year DESC) 'title', m.title,
FROM 'year', m.year,
shows_movies sm 'url', m.slug,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'grid', json_build_object(
'title', m.title,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'alt', CONCAT('Poster for ', m.title),
'subtext', m.year,
'url', m.slug
),
'type', 'movies'
)
ORDER BY m.year DESC
)
FROM shows_movies sm
LEFT JOIN movies m ON sm.movies_id = m.id LEFT JOIN movies m ON sm.movies_id = m.id
WHERE LEFT JOIN directus_files df_movie ON m.art = df_movie.id
sm.shows_id = s.id WHERE sm.shows_id = s.id
) AS movies, ) AS movies,
( (
SELECT SELECT json_agg(
json_agg(json_build_object('title', b.title, 'author', b.author, 'url', b.slug) json_build_object(
ORDER BY b.title ASC) 'title', b.title,
FROM 'author', b.author,
shows_books sb 'url', b.slug,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'grid', json_build_object(
'title', b.title,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'alt', CONCAT('Cover for ', b.title, ' by ', b.author),
'subtext', b.author,
'url', b.slug
),
'type', 'books'
)
ORDER BY b.title
)
FROM shows_books sb
LEFT JOIN books b ON sb.books_id = b.id LEFT JOIN books b ON sb.books_id = b.id
WHERE LEFT JOIN directus_files df_book ON b.art = df_book.id
sb.shows_id = s.id WHERE sb.shows_id = s.id
) AS books, ) AS books,
( (
SELECT SELECT json_agg(json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
json_agg(json_build_object('title', p.title, 'date', p.date, 'url', p.slug) ORDER BY p.date DESC)
ORDER BY p.date DESC) FROM posts_shows ps
FROM
posts_shows ps
LEFT JOIN posts p ON ps.posts_id = p.id LEFT JOIN posts p ON ps.posts_id = p.id
WHERE WHERE ps.shows_id = s.id
ps.shows_id = s.id
) AS posts, ) AS posts,
( (
SELECT SELECT array_agg(t.name)
array_agg(t.name) FROM shows_tags st
FROM
shows_tags st
LEFT JOIN tags t ON st.tags_id = t.id LEFT JOIN tags t ON st.tags_id = t.id
WHERE WHERE st.shows_id = s.id
st.shows_id = s.id
) AS tags, ) AS tags,
( (
SELECT SELECT json_agg(
json_agg(json_build_object('title', rs.title, 'year', rs.year, 'url', rs.slug) json_build_object(
ORDER BY rs.year DESC) 'title', rs.title,
FROM 'year', rs.year,
related_shows sr 'url', rs.slug,
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'grid', json_build_object(
'title', rs.title,
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'alt', CONCAT('Artwork for ', rs.title),
'subtext', rs.year,
'url', rs.slug
),
'type', 'tv'
)
ORDER BY rs.year DESC
)
FROM related_shows sr
LEFT JOIN shows rs ON sr.related_shows_id = rs.id LEFT JOIN shows rs ON sr.related_shows_id = rs.id
WHERE LEFT JOIN directus_files df_related ON rs.art = df_related.id
sr.shows_id = s.id WHERE sr.shows_id = s.id
) AS related_shows, ) AS related_shows,
( (
SELECT SELECT json_agg(
json_agg(json_build_object('name', a.name_string, 'url', a.slug, 'country', a.country, 'total_plays', a.total_plays) json_build_object(
ORDER BY a.name_string ASC) 'name', a.name_string,
FROM 'url', a.slug,
shows_artists sa 'country', a.country,
'total_plays', a.total_plays,
'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
'grid', json_build_object(
'title', a.name_string,
'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
'alt', CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name_string),
'subtext', CASE
WHEN a.total_plays > 0 THEN CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays')
ELSE NULL
END,
'url', a.slug
),
'type', 'music'
)
ORDER BY a.name_string
)
FROM shows_artists sa
LEFT JOIN artists a ON sa.artists_id = a.id LEFT JOIN artists a ON sa.artists_id = a.id
WHERE LEFT JOIN directus_files df_artist ON a.art = df_artist.id
sa.shows_id = s.id WHERE sa.shows_id = s.id
) AS artists, ) AS artists,
MAX(e.last_watched_at) AS last_watched_at MAX(e.last_watched_at) AS last_watched_at,
FROM json_build_object(
shows s 'open_graph_image', CASE
LEFT JOIN episodes e ON s.id = e.show WHEN df_backdrop.filename_disk IS NOT NULL AND df_backdrop.filename_disk != '' AND df_backdrop.filename_disk != '/' THEN
LEFT JOIN directus_files df_art ON s.art = df_art.id CONCAT('/', df_backdrop.filename_disk)
LEFT JOIN directus_files df_backdrop ON s.backdrop = df_backdrop.id ELSE NULL
GROUP BY END
s.id, ) AS metadata
df_art.filename_disk, FROM shows s
df_backdrop.filename_disk LEFT JOIN episodes e ON s.id = e.show
ORDER BY LEFT JOIN directus_files df_art ON s.art = df_art.id
MAX(e.last_watched_at) DESC; LEFT JOIN directus_files df_backdrop ON s.backdrop = df_backdrop.id
CROSS JOIN optimized_globals globals
GROUP BY s.id, df_art.filename_disk, df_backdrop.filename_disk, globals.cdn_url
ORDER BY MAX(e.last_watched_at) DESC;

97
server/utils/media.php
View file

@ -1,19 +1,9 @@
<?php <?php
function renderMediaGrid(array $items, string $cdnUrl, string $shape = 'square', int $count = 0, string $loading = 'lazy') { function renderMediaGrid(array $items, int $count = 0, string $loading = 'lazy') {
$imageClass = 'square';
$width = 150;
$height = 150;
if ($shape === 'vertical') {
$imageClass = 'vertical';
$width = 120;
$height = 184;
}
$limit = $count > 0 ? $count : count($items); $limit = $count > 0 ? $count : count($items);
echo '<div class="media-grid ' . htmlspecialchars($shape) . '">'; echo '<div class="media-grid">';
foreach (array_slice($items, 0, $limit) as $item) { foreach (array_slice($items, 0, $limit) as $item) {
$grid = $item['grid'] ?? $item; $grid = $item['grid'] ?? $item;
$alt = htmlspecialchars($grid['alt'] ?? ''); $alt = htmlspecialchars($grid['alt'] ?? '');
@ -21,8 +11,13 @@
$title = htmlspecialchars($grid['title'] ?? ''); $title = htmlspecialchars($grid['title'] ?? '');
$subtext = htmlspecialchars($grid['subtext'] ?? ''); $subtext = htmlspecialchars($grid['subtext'] ?? '');
$url = $grid['url'] ?? null; $url = $grid['url'] ?? null;
$type = $item['type'] ?? '';
$isVertical = in_array($type, ['books', 'movies', 'shows']);
$imageClass = $isVertical ? 'vertical' : 'square';
$width = $isVertical ? 120 : 150;
$height = $isVertical ? 184 : 150;
$openLink = $url ? '<a href="' . htmlspecialchars($url) . '" title="' . $alt . '">' : ''; $openLink = $url ? '<a class="' . htmlspecialchars($type) . '" href="' . htmlspecialchars($url) . '" title="' . $alt . '">' : '';
$closeLink = $url ? '</a>' : ''; $closeLink = $url ? '</a>' : '';
echo $openLink; echo $openLink;
@ -36,10 +31,10 @@
} }
echo '<img echo '<img
srcset="' . $cdnUrl . $image . '?class=' . $imageClass . 'sm&type=webp ' . $width . 'w, ' . srcset="' . $image . '?class=' . $imageClass . 'sm&type=webp ' . $width . 'w, ' .
$cdnUrl . $image . '?class=' . $imageClass . 'md&type=webp ' . ($width * 2) . 'w" $image . '?class=' . $imageClass . 'md&type=webp ' . ($width * 2) . 'w"
sizes="(max-width: 450px) ' . $width . 'px, ' . ($width * 2) . 'px" sizes="(max-width: 450px) ' . $width . 'px, ' . ($width * 2) . 'px"
src="' . $cdnUrl . $image . '?class=' . $imageClass . 'sm&type=webp" src="' . $image . '?class=' . $imageClass . 'sm&type=webp"
alt="' . $alt . '" alt="' . $alt . '"
loading="' . $loading . '" loading="' . $loading . '"
decoding="async" decoding="async"
@ -52,57 +47,44 @@
echo '</div>'; echo '</div>';
} }
function renderAssociatedMedia($artists = [], $books = [], $genres = [], $movies = [], $posts = [], $shows = []) function renderAssociatedMedia(
{ array $artists = [],
$media = array_merge($artists, $books, $genres, $movies, $posts, $shows); array $books = [],
array $genres = [],
if (empty($media)) return; array $movies = [],
array $posts = [],
array $shows = [],
) {
$sections = [ $sections = [
"artists" => ["icon" => "headphones", "css_class" => "music", "label" => "Related artist(s)"], "artists" => ["icon" => "headphones", "css_class" => "music", "label" => "Related artist(s)", "hasGrid" => true],
"books" => ["icon" => "books", "css_class" => "books", "label" => "Related book(s)"], "books" => ["icon" => "books", "css_class" => "books", "label" => "Related book(s)", "hasGrid" => true],
"genres" => ["icon" => "headphones", "css_class" => "music", "label" => "Related genre(s)"], "genres" => ["icon" => "headphones", "css_class" => "music", "label" => "Related genre(s)", "hasGrid" => false],
"movies" => ["icon" => "movie", "css_class" => "movies", "label" => "Related movie(s)"], "movies" => ["icon" => "movie", "css_class" => "movies", "label" => "Related movie(s)", "hasGrid" => true],
"posts" => ["icon" => "article", "css_class" => "article", "label" => "Related post(s)"], "posts" => ["icon" => "article", "css_class" => "article", "label" => "Related post(s)", "hasGrid" => false],
"shows" => ["icon" => "device-tv-old", "css_class" => "tv", "label" => "Related show(s)"] "shows" => ["icon" => "device-tv-old", "css_class" => "tv", "label" => "Related show(s)", "hasGrid" => true]
]; ];
$allMedia = compact('artists', 'books', 'genres', 'movies', 'posts', 'shows');
echo '<div class="associated-media">'; echo '<div class="associated-media">';
foreach ($sections as $key => $section) { foreach ($sections as $key => $section) {
switch ($key) { $items = $allMedia[$key];
case "artists":
$items = $artists;
break;
case "books":
$items = $books;
break;
case "genres":
$items = $genres;
break;
case "movies":
$items = $movies;
break;
case "posts":
$items = $posts;
break;
case "shows":
$items = $shows;
break;
default:
$items = [];
}
if (!empty($items)) { if (empty($items)) continue;
echo '<p id="' . htmlspecialchars($key) . '" class="' . htmlspecialchars($section['css_class']) . '">';
echo '<span class="icon">' . getTablerIcon($section['icon']) . '</span> '; echo '<h3 id="' . htmlspecialchars($key) . '" class="' . htmlspecialchars($section['css_class']) . '">';
echo htmlspecialchars($section['label']); echo getTablerIcon($section['icon']);
echo '</p>'; echo htmlspecialchars($section['label']);
echo '</h3>';
if ($section['hasGrid']) {
renderMediaGrid($items);
} else {
echo '<ul>'; echo '<ul>';
foreach ($items as $item) { foreach ($items as $item) {
echo '<li class="' . htmlspecialchars($section['css_class']) . '">'; echo '<li class="' . htmlspecialchars($section['css_class']) . '">';
echo '<a href="' . htmlspecialchars($item['url']) . '">' . htmlspecialchars($item['title'] ?? $item['name'] ?? 'Untitled') . '</a>'; echo '<a href="' . htmlspecialchars($item['url']) . '">' . htmlspecialchars($item['title'] ?? $item['name'] ?? '') . '</a>';
if ($key === "artists" && isset($item['total_plays']) && $item['total_plays'] > 0) { if ($key === "artists" && isset($item['total_plays']) && $item['total_plays'] > 0) {
echo ' (' . htmlspecialchars($item['total_plays']) . ' play' . ($item['total_plays'] > 1 ? 's' : '') . ')'; echo ' (' . htmlspecialchars($item['total_plays']) . ' play' . ($item['total_plays'] > 1 ? 's' : '') . ')';
@ -116,7 +98,6 @@
echo '</li>'; echo '</li>';
} }
echo '</ul>'; echo '</ul>';
} }
} }

8
src/assets/styles/components/media-grid.css
View file

@ -5,6 +5,14 @@
a { a {
aspect-ratio: var(--aspect-ratio); aspect-ratio: var(--aspect-ratio);
img {
border-color: var(--section-color);
}
}
&:not(:has(a)) img {
border: var(--border-gray);
} }
& + .media-grid { & + .media-grid {

10
src/assets/styles/pages/reading.css
View file

@ -1,9 +1,3 @@
:is(.book-entry, .book-focus) img {
height: auto;
aspect-ratio: var(--aspect-ratio-vertical);
border: var(--border-gray);
}
.book-years a:first-of-type { .book-years a:first-of-type {
font-weight: var(--font-weight-bold); font-weight: var(--font-weight-bold);
} }
@ -25,10 +19,6 @@
align-items: start; align-items: start;
} }
img {
max-width: calc(var(--sizing-3xl) * 4);
}
.media-meta { .media-meta {
margin-top: var(--sizing-base); margin-top: var(--sizing-base);
align-items: center; align-items: center;

8
src/feeds/rss.liquid
View file

@ -17,7 +17,7 @@ permalink: "{{ feed.permalink }}.xml"
<atom:link href="{{ globals.url }}{{ feed.permalink }}.xml" rel="self" type="application/rss+xml" /> <atom:link href="{{ globals.url }}{{ feed.permalink }}.xml" rel="self" type="application/rss+xml" />
<lastBuildDate>{{ "now" | date:"%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate> <lastBuildDate>{{ "now" | date:"%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
<image> <image>
<url>{{ globals.url }}/og/w200/{% appVersion %}{{ globals.avatar }}</url> <url>{{ globals.url }}/og/w200/{% appVersion %}{{ globals.metadata.open_graph_image }}</url>
<title><![CDATA[{{ feed.title | append: " • " | append: globals.site_name }}]]></title> <title><![CDATA[{{ feed.title | append: " • " | append: globals.site_name }}]]></title>
<link>{{ globals.url }}{{ feed.permalink }}.xml</link> <link>{{ globals.url }}{{ feed.permalink }}.xml</link>
<width>144</width> <width>144</width>
@ -31,12 +31,12 @@ permalink: "{{ feed.permalink }}.xml"
<guid isPermaLink="false">{{ feedItem.url | generatePermalink: globals.url | encodeAmp }}</guid> <guid isPermaLink="false">{{ feedItem.url | generatePermalink: globals.url | encodeAmp }}</guid>
<pubDate>{{ feedItem.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate> <pubDate>{{ feedItem.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
{%- if feedItem.image -%} {%- if feedItem.image -%}
{%- assign enclosureUrl = globals.cdn_url | append: feedItem.image | append: "?class=w800" -%} {%- assign enclosureUrl = feedItem.image | append: "?class=w800" -%}
<enclosure url="{{ globals.cdn_url }}{{ feedItem.image | encodeAmp }}?class=w800" length="{{ enclosureUrl | getRemoteFileSize }}" type="image/jpeg" /> <enclosure url="{{ feedItem.image | encodeAmp }}?class=w800" length="{{ enclosureUrl | getRemoteFileSize }}" type="image/jpeg" />
{%- endif -%} {%- endif -%}
<description><![CDATA[ <description><![CDATA[
{%- if feedItem.image -%} {%- if feedItem.image -%}
<img src="{{ globals.cdn_url }}{{ feedItem.image | encodeAmp }}?class=w800" alt="Image from {{ feedItem.title }}" /> <img src="{{ feedItem.image | encodeAmp }}?class=w800" alt="Image from {{ feedItem.title }}" />
{%- endif -%} {%- endif -%}
{%- if feedItem.content -%} {%- if feedItem.content -%}
{{ feedItem.content | markdown | convertRelativeLinks: globals.url }} {{ feedItem.content | markdown | convertRelativeLinks: globals.url }}

61
src/includes/blocks/associated-media.liquid
View file

@ -2,12 +2,12 @@
{% if media.size > 0 %} {% if media.size > 0 %}
<div class="associated-media"> <div class="associated-media">
{% assign sections = {% assign sections =
"artists:headphones:music:Related artist(s)," | append: "artists:headphones:music:Related artist(s):true," | append:
"books:books:books:Related book(s)," | append: "books:books:books:Related book(s):true," | append:
"genres:headphones:music:Related genre(s)," | append: "genres:headphones:music:Related genre(s):false," | append:
"movies:movie:movies:Related movie(s)," | append: "movies:movie:movies:Related movie(s):true," | append:
"posts:article:article:Related post(s)," | append: "posts:article:article:Related post(s):false," | append:
"shows:device-tv-old:tv:Related show(s)" "shows:device-tv-old:tv:Related show(s):true"
| split:"," %} | split:"," %}
{% for section in sections %} {% for section in sections %}
{% assign parts = section | split:":" %} {% assign parts = section | split:":" %}
@ -15,6 +15,8 @@
{% assign icon = parts[1] %} {% assign icon = parts[1] %}
{% assign css_class = parts[2] %} {% assign css_class = parts[2] %}
{% assign label = parts[3] %} {% assign label = parts[3] %}
{% assign hasGrid = parts[4] == "true" %}
{% assign items = nil %}
{% case key %} {% case key %}
{% when "artists" %} {% assign items = artists %} {% when "artists" %} {% assign items = artists %}
{% when "books" %} {% assign items = books %} {% when "books" %} {% assign items = books %}
@ -24,26 +26,37 @@
{% when "shows" %} {% assign items = shows %} {% when "shows" %} {% assign items = shows %}
{% endcase %} {% endcase %}
{% if items and items.size > 0 %} {% if items and items.size > 0 %}
<p id="{{ key }}" class="{{ css_class }}"> <h3 id="{{ key }}" class="{{ css_class }}">
{% tablericon icon %} {% tablericon icon %}
{{ label }} {{ label }}
</p> </h3>
<ul> {% if hasGrid %}
{% for item in items %} {% assign shape = "square" %}
<li class="{{ css_class }}"> {% if key == "books" or key == "movies" or key == "shows" %}
<a href="{{ item.url }}">{{ item.title | default:item.name }}</a> {% assign shape = "vertical" %}
{% if key == "artists" and item.total_plays > 0 %} {% endif %}
({{ item.total_plays }} {{ item.total_plays | pluralize:"play" }}) {% render "media/grid.liquid",
{% elsif key == "books" %} data:items,
by {{ item.author }} shape:shape
{% elsif key == "movies" or key == "shows" %} %}
({{ item.year }}) {% else %}
{% elsif key == "posts" %} <ul>
({{ item.date | date:"%B %e, %Y" }}) {% for item in items %}
{% endif %} <li class="{{ css_class }}">
</li> <a href="{{ item.url }}">{{ item.title | default:item.name }}</a>
{% endfor %} {% if key == "artists" and item.total_plays > 0 %}
</ul> ({{ item.total_plays }} {{ item.total_plays | pluralize:"play" }})
{% elsif key == "books" %}
by {{ item.author }}
{% elsif key == "movies" or key == "shows" %}
({{ item.year }})
{% elsif key == "posts" %}
({{ item.date | date:"%B %e, %Y" }})
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>

10
src/includes/blocks/hero.liquid
View file

@ -1,17 +1,17 @@
<img <img
srcset=" srcset="
{{ globals.cdn_url }}{{ image }}?class=bannersm&type=webp 256w, {{ image }}?class=bannersm&type=webp 256w,
{{ globals.cdn_url }}{{ image }}?class=bannermd&type=webp 512w, {{ image }}?class=bannermd&type=webp 512w,
{{ globals.cdn_url }}{{ image }}?class=bannerbase&type=webp 1024w {{ image }}?class=bannerbase&type=webp 1024w
" "
sizes="(max-width: 450px) 256px, sizes="(max-width: 450px) 256px,
(max-width: 850px) 512px, (max-width: 850px) 512px,
1024px" 1024px"
src="{{ globals.cdn_url }}{{ image }}?class=bannersm&type=webp" src="{{ image }}?class=bannersm&type=webp"
alt="{{ alt | replaceQuotes }}" alt="{{ alt | replaceQuotes }}"
class="image-banner" class="image-banner"
loading="lazy" loading="lazy"
decoding="async" decoding="async"
width="720" width="720"
height="480" height="480"
/> />

4
src/includes/fetchers/artist.php.liquid
View file

@ -3,7 +3,6 @@
require __DIR__ . "/../../vendor/autoload.php"; require __DIR__ . "/../../vendor/autoload.php";
require __DIR__ . "/../../server/utils/init.php"; require __DIR__ . "/../../server/utils/init.php";
use App\Classes\GlobalsFetcher;
use App\Classes\ArtistFetcher; use App\Classes\ArtistFetcher;
use voku\helper\HtmlMin; use voku\helper\HtmlMin;
@ -12,7 +11,6 @@
if (strpos($url, "music/artists/") !== 0) redirectTo404(); if (strpos($url, "music/artists/") !== 0) redirectTo404();
$globals = (new GlobalsFetcher())->fetch();
$artist = (new ArtistFetcher())->fetch($url); $artist = (new ArtistFetcher())->fetch($url);
if (!$artist) redirectTo404(); if (!$artist) redirectTo404();
@ -20,7 +18,7 @@
$artist["description"] = parseMarkdown($artist["description"]); $artist["description"] = parseMarkdown($artist["description"]);
$pageTitle = htmlspecialchars("Artists • " . $artist["name"], ENT_QUOTES, "UTF-8"); $pageTitle = htmlspecialchars("Artists • " . $artist["name"], ENT_QUOTES, "UTF-8");
$pageDescription = truncateText(htmlspecialchars(strip_tags($artist["description"]), ENT_QUOTES, "UTF-8"), 250); $pageDescription = truncateText(htmlspecialchars(strip_tags($artist["description"]), ENT_QUOTES, "UTF-8"), 250);
$ogImage = htmlspecialchars($artist["image"], ENT_QUOTES, "UTF-8"); $ogImage = htmlspecialchars($artist["metadata"]["open_graph_image"], ENT_QUOTES, "UTF-8");
$fullUrl = "https://www.coryd.dev" . $requestUri; $fullUrl = "https://www.coryd.dev" . $requestUri;
$oembedUrl = "https://www.coryd.dev/oembed" . $requestUri; $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;

2
src/includes/fetchers/book.php.liquid
View file

@ -18,7 +18,7 @@
$book["description"] = parseMarkdown($book["description"]); $book["description"] = parseMarkdown($book["description"]);
$pageTitle = htmlspecialchars("Books • {$book["title"]} by {$book["author"]}", ENT_QUOTES, "UTF-8"); $pageTitle = htmlspecialchars("Books • {$book["title"]} by {$book["author"]}", ENT_QUOTES, "UTF-8");
$pageDescription = truncateText(htmlspecialchars(strip_tags($book["description"]), ENT_QUOTES, "UTF-8"), 250); $pageDescription = truncateText(htmlspecialchars(strip_tags($book["description"]), ENT_QUOTES, "UTF-8"), 250);
$ogImage = htmlspecialchars($book["image"], ENT_QUOTES, "UTF-8"); $ogImage = htmlspecialchars($book["metadata"]["open_graph_image"], ENT_QUOTES, "UTF-8");
$fullUrl = "https://www.coryd.dev" . $requestUri; $fullUrl = "https://www.coryd.dev" . $requestUri;
$oembedUrl = "https://www.coryd.dev/oembed" . $requestUri; $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;

2
src/includes/fetchers/genre.php.liquid
View file

@ -20,7 +20,7 @@
htmlspecialchars(strip_tags($genre["description"]), ENT_QUOTES, "UTF-8"), htmlspecialchars(strip_tags($genre["description"]), ENT_QUOTES, "UTF-8"),
250 250
); );
$ogImage = htmlspecialchars($genre["artists"][0]["image"] ?? "", ENT_QUOTES, "UTF-8"); $ogImage = htmlspecialchars($genre["artists"][0]["metadata"]["open_graph_image"] ?? "", ENT_QUOTES, "UTF-8");
$fullUrl = "https://www.coryd.dev" . $requestUri; $fullUrl = "https://www.coryd.dev" . $requestUri;
$oembedUrl = "https://www.coryd.dev/oembed" . $requestUri; $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;

2
src/includes/fetchers/movie.php.liquid
View file

@ -18,7 +18,7 @@
$movie["description"] = parseMarkdown($movie["description"]); $movie["description"] = parseMarkdown($movie["description"]);
$pageTitle = htmlspecialchars("Movies • " . $movie["title"], ENT_QUOTES, "UTF-8"); $pageTitle = htmlspecialchars("Movies • " . $movie["title"], ENT_QUOTES, "UTF-8");
$pageDescription = truncateText(htmlspecialchars(strip_tags($movie["description"]), ENT_QUOTES, "UTF-8"), 250); $pageDescription = truncateText(htmlspecialchars(strip_tags($movie["description"]), ENT_QUOTES, "UTF-8"), 250);
$ogImage = htmlspecialchars($movie["backdrop"], ENT_QUOTES, "UTF-8"); $ogImage = htmlspecialchars($movie["metadata"]["open_graph_image"], ENT_QUOTES, "UTF-8");
$fullUrl = "https://www.coryd.dev" . $requestUri; $fullUrl = "https://www.coryd.dev" . $requestUri;
$oembedUrl = "https://www.coryd.dev/oembed" . $requestUri; $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;

2
src/includes/fetchers/show.php.liquid
View file

@ -20,7 +20,7 @@
htmlspecialchars(strip_tags($show["description"]), ENT_QUOTES, "UTF-8"), htmlspecialchars(strip_tags($show["description"]), ENT_QUOTES, "UTF-8"),
250 250
); );
$ogImage = htmlspecialchars($show["image"], ENT_QUOTES, "UTF-8"); $ogImage = htmlspecialchars($show["metadata"]["open_graph_image"], ENT_QUOTES, "UTF-8");
$fullUrl = "https://www.coryd.dev" . $requestUri; $fullUrl = "https://www.coryd.dev" . $requestUri;
$oembedUrl = "https://www.coryd.dev/oembed" . $requestUri; $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;

6
src/includes/layout/header.liquid
View file

@ -1,11 +1,11 @@
{%- capture headerContent -%} {%- capture headerContent -%}
<img <img
srcset=" srcset="
{{ globals.cdn_url }}{{ globals.avatar_header }}?class=w100&v={% appVersion %} 100w, {{ globals.avatar_header }}?class=w100&v={% appVersion %} 100w,
{{ globals.cdn_url }}{{ globals.avatar_header }}?class=w200&v={% appVersion %} 200w {{ globals.avatar_header }}?class=w200&v={% appVersion %} 200w
" "
sizes="(max-width: 450px) 100px, 200px" sizes="(max-width: 450px) 100px, 200px"
class="icon" src="{{ globals.cdn_url }}{{ globals.avatar_header }}?class=w100&v={% appVersion %}" class="icon" src="{{ globals.avatar_header }}?class=w100&v={% appVersion %}"
alt="{{ globals.site_name }}" alt="{{ globals.site_name }}"
width="100" width="100"
height="145" height="145"

8
src/includes/media/grid.liquid
View file

@ -3,7 +3,7 @@
{%- for item in data limit:count -%} {%- for item in data limit:count -%}
{%- assign alt = item.grid.alt | replaceQuotes -%} {%- assign alt = item.grid.alt | replaceQuotes -%}
{%- assign imageUrl = item.grid.image -%} {%- assign imageUrl = item.grid.image -%}
<a href="{{ item.grid.url }}" title="{{ alt }}"> <a class="{{ item.type }}" href="{{ item.grid.url }}" title="{{ alt }}">
<div class="media-grid-item"> <div class="media-grid-item">
{%- if item.grid.title or item.grid.subtext -%} {%- if item.grid.title or item.grid.subtext -%}
<div class="meta-text media-highlight {{ item.type }}"> <div class="meta-text media-highlight {{ item.type }}">
@ -27,11 +27,11 @@
{%- endcase -%} {%- endcase -%}
<img <img
srcset=" srcset="
{{ globals.cdn_url }}{{ imageUrl }}?class={{ imageClass }}sm&type=webp {{ width }}w, {{ imageUrl }}?class={{ imageClass }}sm&type=webp {{ width }}w,
{{ globals.cdn_url }}{{ imageUrl }}?class={{ imageClass }}md&type=webp {{ width | times:2 }}w {{ imageUrl }}?class={{ imageClass }}md&type=webp {{ width | times:2 }}w
" "
sizes="(max-width: 450px) {{ width }}px, {{ width | times:2 }}px" sizes="(max-width: 450px) {{ width }}px, {{ width | times:2 }}px"
src="{{ globals.cdn_url }}{{ imageUrl }}?class={{ imageClass }}sm&type=webp" src="{{ imageUrl }}?class={{ imageClass }}sm&type=webp"
alt="{{ alt }}" alt="{{ alt }}"
loading="{{ loadingStrategy }}" loading="{{ loadingStrategy }}"
decoding="async" decoding="async"

6
src/includes/media/music/charts/recent.liquid
View file

@ -5,11 +5,11 @@
<a href="{{ item.chart.url }}"> <a href="{{ item.chart.url }}">
<img <img
srcset=" srcset="
{{ globals.cdn_url }}{{ item.chart.image }}?class=w50&type=webp 50w, {{ item.chart.image }}?class=w50&type=webp 50w,
{{ globals.cdn_url }}{{ item.chart.image }}?class=w100&type=webp 100w {{ item.chart.image }}?class=w100&type=webp 100w
" "
sizes="(max-width: 450px) 50px, 100px" sizes="(max-width: 450px) 50px, 100px"
src="{{ globals.cdn_url }}{{ item.chart.image }}?class=w50&type=webp" src="{{ item.chart.image }}?class=w50&type=webp"
alt="{{ item.chart.alt | replaceQuotes }}" alt="{{ item.chart.alt | replaceQuotes }}"
loading="lazy" loading="lazy"
decoding="async" decoding="async"

2
src/includes/media/music/tables/all-time/albums.liquid
View file

@ -9,7 +9,7 @@
<tr> <tr>
<td> <td>
<div> <div>
<img src="{{ globals.cdn_url }}{{ album.table.image }}?class=w100" alt="{{ album.table.alt }}" width="50"> <img src="{{ album.table.image }}?class=w100" alt="{{ album.table.alt }}" width="50">
{{ album.table.title }} {{ album.table.title }}
</div> </div>
</td> </td>

2
src/includes/media/music/tables/all-time/artists.liquid
View file

@ -8,7 +8,7 @@
<tr> <tr>
<td> <td>
<div> <div>
<img src="{{ globals.cdn_url }}{{ artist.table.image }}?class=w100" alt="{{ artist.table.alt }}" width="50"> <img src="{{ artist.table.image }}?class=w100" alt="{{ artist.table.alt }}" width="50">
<a href="{{ artist.table.url }}">{{ artist.table.title }}</a> <a href="{{ artist.table.url }}">{{ artist.table.title }}</a>
</div> </div>
</td> </td>

28
src/includes/metadata/index.liquid
View file

@ -20,7 +20,7 @@
{{ globals.site_description }} {{ globals.site_description }}
{%- endif -%} {%- endif -%}
{%- endcapture -%} {%- endcapture -%}
{%- assign ogImage = ogImageBaseUrl | append: globals.avatar -%} {%- assign ogImage = ogImageBaseUrl | append: globals.metadata.open_graph_image -%}
{%- case schema -%} {%- case schema -%}
{%- when 'artist' -%} {%- when 'artist' -%}
{% render "fetchers/artist.php.liquid" %} {% render "fetchers/artist.php.liquid" %}
@ -37,20 +37,20 @@
{%- when 'blog' -%} {%- when 'blog' -%}
{%- assign pageTitle = post.title -%} {%- assign pageTitle = post.title -%}
{%- assign pageDescription = post.description -%} {%- assign pageDescription = post.description -%}
{%- assign ogImage = ogImageBaseUrl | append: post.image -%} {%- assign ogImage = ogImageBaseUrl | append: post.metadata.open_graph_image -%}
{%- when 'music-index', 'music-week-artists' -%} {%- when 'music-index', 'music-week-artists' -%}
{%- assign ogImage = ogImageBaseUrl | append: music.week.artists[0].grid.image -%} {%- assign ogImage = ogImageBaseUrl | append: music.week.artists[0].metadata.open_graph_image -%}
{%- when 'music-week-albums', 'music-week-tracks' -%} {%- when 'music-week-albums', 'music-week-tracks' -%}
{%- assign ogImage = ogImageBaseUrl | append: music.week.albums[0].grid.image -%} {%- assign ogImage = ogImageBaseUrl | append: music.week.albums[0].metadata.open_graph_image -%}
{%- when 'music-month-artists' -%} {%- when 'music-month-artists' -%}
{%- assign ogImage = ogImageBaseUrl | append: music.month.artists[0].grid.image -%} {%- assign ogImage = ogImageBaseUrl | append: music.month.artists[0].metadata.open_graph_image -%}
{%- when 'music-month-albums' -%} {%- when 'music-month-albums' -%}
{%- assign ogImage = ogImageBaseUrl | append: music.month.albums[0].grid.image -%} {%- assign ogImage = ogImageBaseUrl | append: music.month.albums[0].metadata.open_graph_image -%}
{%- when 'music-releases' -%} {%- when 'music-releases' -%}
{%- assign ogImage = ogImageBaseUrl | append: albumReleases.upcoming[0].grid.image -%} {%- assign ogImage = ogImageBaseUrl | append: albumReleases.upcoming[0].metadata.open_graph_image -%}
{%- when 'books' -%} {%- when 'books' -%}
{%- assign overviewBook = books.all | filterBooksByStatus: 'started' | reverse | first %} {%- assign overviewBook = books.all | filterBooksByStatus: 'started' | reverse | first %}
{%- assign ogImage = ogImageBaseUrl | append: overviewBook.image -%} {%- assign ogImage = ogImageBaseUrl | append: overviewBook.metadata.open_graph_image -%}
{%- when 'reading-year' -%} {%- when 'reading-year' -%}
{%- assign pageTitle = 'Books' | append: ' • ' | append: year.value | append: ' • ' | append: globals.site_name -%} {%- assign pageTitle = 'Books' | append: ' • ' | append: year.value | append: ' • ' | append: globals.site_name -%}
{%- capture pageDescription -%} {%- capture pageDescription -%}
@ -58,21 +58,21 @@
{%- endcapture -%} {%- endcapture -%}
{%- assign bookData = year.data | filterBooksByStatus: 'finished' -%} {%- assign bookData = year.data | filterBooksByStatus: 'finished' -%}
{%- assign bookYear = bookData | shuffleArray | first -%} {%- assign bookYear = bookData | shuffleArray | first -%}
{%- assign ogImage = ogImageBaseUrl | append: bookYear.image -%} {%- assign ogImage = ogImageBaseUrl | append: bookYear.metadata.open_graph_image -%}
{%- when 'favorite-movies' -%} {%- when 'favorite-movies' -%}
{%- assign favoriteMovie = movies.favorites | shuffleArray | first %} {%- assign favoriteMovie = movies.favorites | shuffleArray | first %}
{%- assign ogImage = ogImageBaseUrl | append: favoriteMovie.backdrop -%} {%- assign ogImage = ogImageBaseUrl | append: favoriteMovie.metadata.open_graph_image -%}
{%- when 'favorite-shows' -%} {%- when 'favorite-shows' -%}
{%- assign favoriteShow = tv.favorites | shuffleArray | first %} {%- assign favoriteShow = tv.favorites | shuffleArray | first %}
{%- assign ogImage = ogImageBaseUrl | append: favoriteShow.backdrop -%} {%- assign ogImage = ogImageBaseUrl | append: favoriteShow.metadata.open_graph_image -%}
{%- when 'watching' -%} {%- when 'watching' -%}
{%- assign mergedMovies = movies.recentlyWatched | mergeArray: movies.favorites %} {%- assign mergedMovies = movies.recentlyWatched | mergeArray: movies.favorites %}
{%- assign mergedShows = tv.recentlyWatched | mergeArray: tv.favorites %} {%- assign mergedShows = tv.recentlyWatched | mergeArray: tv.favorites %}
{%- assign overviewWatched = mergedMovies | mergeArray: mergedShows | shuffleArray | first -%} {%- assign overviewWatched = mergedMovies | mergeArray: mergedShows | shuffleArray | first -%}
{%- assign ogImage = ogImageBaseUrl | append: overviewWatched.backdrop -%} {%- assign ogImage = ogImageBaseUrl | append: overviewWatched.metadata.open_graph_image -%}
{%- when 'upcoming-shows' -%} {%- when 'upcoming-shows' -%}
{%- assign upcomingShow = upcomingShows.watching | shuffleArray | first %} {%- assign upcomingShow = upcomingShows.watching | shuffleArray | first %}
{%- assign ogImage = ogImageBaseUrl | append: upcomingShow.backdrop -%} {%- assign ogImage = ogImageBaseUrl | append: upcomingShow.metadata.open_graph_image -%}
{%- when 'page' -%} {%- when 'page' -%}
{%- assign pageDescription = page.description -%} {%- assign pageDescription = page.description -%}
{% endcase %} {% endcase %}
@ -82,7 +82,7 @@
oembedUrl:oembedUrl, oembedUrl:oembedUrl,
pageTitle:pageTitle, pageTitle:pageTitle,
pageDescription:pageDescription, pageDescription:pageDescription,
ogImage:globals.avatar, ogImage:globals.metadata.open_graph_image,
globals:globals, globals:globals,
%} %}
{%- else -%} {%- else -%}

2
src/meta/webfinger.json.liquid
View file

@ -28,7 +28,7 @@ excludeFromSitemap: true
{ {
"rel":"http://webfinger.net/rel/avatar", "rel":"http://webfinger.net/rel/avatar",
"type":"image/png", "type":"image/png",
"href":"{{ globals.cdn_url }}{{ globals.avatar }}?class=squarebase" "href":"{{ globals.avatar }}?class=squarebase"
} }
] ]
} }

10
src/pages/dynamic/artist.php.liquid
View file

@ -9,14 +9,14 @@ schema: artist
<img <img
class="media-image" class="media-image"
srcset=" srcset="
{{ globals.cdn_url }}<?= htmlspecialchars($artist["image"]) ?>?class=w200&type=webp 200w, <?= htmlspecialchars($artist["image"]) ?>?class=w200&type=webp 200w,
{{ globals.cdn_url }}<?= htmlspecialchars($artist["image"]) ?>?class=w600&type=webp 400w, <?= htmlspecialchars($artist["image"]) ?>?class=w600&type=webp 400w,
{{ globals.cdn_url }}<?= htmlspecialchars($artist["image"]) ?>?class=w800&type=webp 800w <?= htmlspecialchars($artist["image"]) ?>?class=w800&type=webp 800w
" "
sizes="(max-width: 450px) 200px, sizes="(max-width: 450px) 200px,
(max-width: 850px) 400px, (max-width: 850px) 400px,
800px" 800px"
src="{{ globals.cdn_url }}<?= htmlspecialchars($artist["image"]) ?>?class=w200&type=webp" src="<?= htmlspecialchars($artist["image"]) ?>?class=w200&type=webp"
alt="<?= htmlspecialchars($artist["name"]) ?> • <?= htmlspecialchars(parseCountryField($artist["country"])) ?>" alt="<?= htmlspecialchars($artist["name"]) ?> • <?= htmlspecialchars(parseCountryField($artist["country"])) ?>"
decoding="async" decoding="async"
width="200" width="200"
@ -108,7 +108,7 @@ schema: artist
<?= getTablerIcon('vinyl') ?> <?= getTablerIcon('vinyl') ?>
Albums Albums
</h3> </h3>
<?php renderMediaGrid($artist["albums"], $globals["cdn_url"]); ?> <?php renderMediaGrid($artist["albums"]); ?>
<?php endif; ?> <?php endif; ?>
</article> </article>
<?php <?php

8
src/pages/dynamic/book.php.liquid
View file

@ -9,15 +9,15 @@ schema: book
<img <img
class="media-image" class="media-image"
srcset=" srcset="
{{ globals.cdn_url }}<?= htmlspecialchars($book["image"]) ?>?class=verticalsm&type=webp 200w, <?= htmlspecialchars($book["image"]) ?>?class=verticalsm&type=webp 200w,
{{ globals.cdn_url }}<?= htmlspecialchars($book["image"]) ?>?class=verticalmd&type=webp 400w, <?= htmlspecialchars($book["image"]) ?>?class=verticalmd&type=webp 400w,
{{ globals.cdn_url }}<?= htmlspecialchars($book["image"]) ?>?class=verticalbase&type=webp 800w <?= htmlspecialchars($book["image"]) ?>?class=verticalbase&type=webp 800w
" "
sizes="(max-width: 450px) 203px, sizes="(max-width: 450px) 203px,
(max-width: 850px) 406px, (max-width: 850px) 406px,
(max-width: 1000px) 812px, (max-width: 1000px) 812px,
812px" 812px"
src="{{ globals.cdn_url }}<?= htmlspecialchars($book["image"]) ?>?class=verticalsm&type=webp" src="<?= htmlspecialchars($book["image"]) ?>?class=verticalsm&type=webp"
alt="<?= htmlspecialchars($book["title"]) ?> by <?= htmlspecialchars($book["author"]) ?>" alt="<?= htmlspecialchars($book["title"]) ?> by <?= htmlspecialchars($book["author"]) ?>"
decoding="async" decoding="async"
width="200" width="200"

8
src/pages/dynamic/movie.php.liquid
View file

@ -7,14 +7,14 @@ schema: movie
<article class="watching-focus"> <article class="watching-focus">
<img <img
srcset=" srcset="
{{ globals.cdn_url }}<?= htmlspecialchars($movie["backdrop"]) ?>?class=bannersm&type=webp 256w, <?= htmlspecialchars($movie["backdrop"]) ?>?class=bannersm&type=webp 256w,
{{ globals.cdn_url }}<?= htmlspecialchars($movie["backdrop"]) ?>?class=bannermd&type=webp 512w, <?= htmlspecialchars($movie["backdrop"]) ?>?class=bannermd&type=webp 512w,
{{ globals.cdn_url }}<?= htmlspecialchars($movie["backdrop"]) ?>?class=bannerbase&type=webp 1024w <?= htmlspecialchars($movie["backdrop"]) ?>?class=bannerbase&type=webp 1024w
" "
sizes="(max-width: 450px) 256px, sizes="(max-width: 450px) 256px,
(max-width: 850px) 512px, (max-width: 850px) 512px,
1024px" 1024px"
src="{{ globals.cdn_url }}<?= htmlspecialchars($movie["backdrop"]) ?>?class=bannersm&type=webp" src="<?= htmlspecialchars($movie["backdrop"]) ?>?class=bannersm&type=webp"
alt="<?= htmlspecialchars($movie["title"]) ?> (<?= htmlspecialchars($movie["year"]) ?>)" alt="<?= htmlspecialchars($movie["title"]) ?> (<?= htmlspecialchars($movie["year"]) ?>)"
class="image-banner" class="image-banner"
decoding="async" decoding="async"

8
src/pages/dynamic/show.php.liquid
View file

@ -7,14 +7,14 @@ schema: show
<article class="watching-focus"> <article class="watching-focus">
<img <img
srcset=" srcset="
{{ globals.cdn_url }}<?= htmlspecialchars($show["backdrop"]) ?>?class=bannersm&type=webp 256w, <?= htmlspecialchars($show["backdrop"]) ?>?class=bannersm&type=webp 256w,
{{ globals.cdn_url }}<?= htmlspecialchars($show["backdrop"]) ?>?class=bannermd&type=webp 512w, <?= htmlspecialchars($show["backdrop"]) ?>?class=bannermd&type=webp 512w,
{{ globals.cdn_url }}<?= htmlspecialchars($show["backdrop"]) ?>?class=bannerbase&type=webp 1024w <?= htmlspecialchars($show["backdrop"]) ?>?class=bannerbase&type=webp 1024w
" "
sizes="(max-width: 450px) 256px, sizes="(max-width: 450px) 256px,
(max-width: 850px) 512px, (max-width: 850px) 512px,
1024px" 1024px"
src="{{ globals.cdn_url }}<?= htmlspecialchars($show["backdrop"]) ?>?class=bannersm&type=webp" src="<?= htmlspecialchars($show["backdrop"]) ?>?class=bannersm&type=webp"
alt="<?= htmlspecialchars($show["title"]) ?> (<?= htmlspecialchars($show["year"]) ?>)" alt="<?= htmlspecialchars($show["title"]) ?> (<?= htmlspecialchars($show["year"]) ?>)"
class="image-banner" class="image-banner"
decoding="async" decoding="async"

6
src/pages/media/reading/index.html
View file

@ -26,12 +26,12 @@ updated: "now"
<a href="{{ book.url }}"> <a href="{{ book.url }}">
<img <img
srcset=" srcset="
{{ globals.cdn_url }}{{ book.image }}?class=verticalsm&type=webp 200w, {{ book.image }}?class=verticalsm&type=webp 200w,
{{ globals.cdn_url }}{{ book.image }}?class=verticalmd&type=webp 400w {{ book.image }}?class=verticalmd&type=webp 400w
" "
sizes="(max-width: 450px) 200px, sizes="(max-width: 450px) 200px,
400px" 400px"
src="{{ globals.cdn_url }}{{ book.image }}?class=verticalsm&type=webp" src="{{ book.image }}?class=verticalsm&type=webp"
alt="{{ alt | replaceQuotes }}" alt="{{ alt | replaceQuotes }}"
loading="lazy" loading="lazy"
decoding="async" decoding="async"

2
src/pages/page.html
View file

@ -4,7 +4,7 @@ pagination:
size: 1 size: 1
alias: page alias: page
permalink: "{{ page.permalink }}/index.html" permalink: "{{ page.permalink }}/index.html"
image: "{{ page.open_graph_image | prepend: globals.cdn_url | default: globals.avatar }}" image: "{{ page.metadata.open_graph_image | default: globals.avatar }}"
updated: "{{ page.updated | default: null }}" updated: "{{ page.updated | default: null }}"
schema: page schema: page
--- ---

10
src/pages/sections/posts/post.html
View file

@ -24,16 +24,16 @@ schema: blog
{%- if post.image -%} {%- if post.image -%}
<img <img
srcset=" srcset="
{{ globals.cdn_url }}{{ post.image }}?class=w200&type=webp 200w, {{ post.image }}?class=w200&type=webp 200w,
{{ globals.cdn_url }}{{ post.image }}?class=w400&type=webp 400w, {{ post.image }}?class=w400&type=webp 400w,
{{ globals.cdn_url }}{{ post.image }}?class=w800&type=webp 800w, {{ post.image }}?class=w800&type=webp 800w,
{{ globals.cdn_url }}{{ post.image }}?class=w1600&type=webp 1600w {{ post.image }}?class=w1600&type=webp 1600w
" "
sizes="(max-width: 450px) 200px, sizes="(max-width: 450px) 200px,
(max-width: 850px) 400px, (max-width: 850px) 400px,
(max-width: 1000px) 800px, (max-width: 1000px) 800px,
1200px" 1200px"
src="{{ globals.cdn_url }}{{ post.image }}?class=w200" src="{{ post.image }}?class=w200"
alt="{{ post.image_alt | replaceQuotes }}" alt="{{ post.image_alt | replaceQuotes }}"
class="image-banner" class="image-banner"
loading="eager" loading="eager"