diff --git a/api/og-image.php b/api/og-image.php new file mode 100644 index 0000000..97c95ef --- /dev/null +++ b/api/og-image.php @@ -0,0 +1,41 @@ +/dev/null 2>&1 */3 * * * * curl -X POST -H "Authorization: Bearer {{NAVIDROME_SCROBBLE_TOKEN}}" https://www.coryd.dev/api/scrobble.php 0 0 * * * curl -X POST -H "Authorization: Bearer {{SEASONS_IMPORT_TOKEN}}" https://www.coryd.dev/api/seasons-import.php diff --git a/src/feeds/json.liquid b/src/feeds/json.liquid index fc73798..05567ed 100644 --- a/src/feeds/json.liquid +++ b/src/feeds/json.liquid @@ -11,7 +11,7 @@ permalink: "{{ feed.permalink }}.json" { "version": "https://jsonfeed.org/version/1", "title": "{{ feed.title | append: " • " | append: globals.site_name }}", - "icon": "{{ globals.url }}/assets/icons/feed.png", + "icon": "{{ globals.url }}/og/w200/{% appVersion %}{{ globals.avatar }}", "home_page_url": "{{ globals.url }}", "feed_url": "{{ globals.url }}{{ feed.permalink }}.json", "items": [ diff --git a/src/feeds/rss.liquid b/src/feeds/rss.liquid index 1440575..d4d0cba 100644 --- a/src/feeds/rss.liquid +++ b/src/feeds/rss.liquid @@ -17,7 +17,7 @@ permalink: "{{ feed.permalink }}.xml" {{ "now" | date:"%a, %d %b %Y %H:%M:%S %z" }} - {{ globals.url }}/assets/icons/feed.png + {{ globals.url }}/og/w200/{% appVersion %}{{ globals.avatar }} <![CDATA[{{ feed.title | append: " • " | append: globals.site_name }}]]> {{ globals.url }}{{ feed.permalink }}.xml 144 diff --git a/src/includes/fetchers/artist.php.liquid b/src/includes/fetchers/artist.php.liquid index 42ac003..056fd26 100644 --- a/src/includes/fetchers/artist.php.liquid +++ b/src/includes/fetchers/artist.php.liquid @@ -73,7 +73,7 @@ ENT_QUOTES, "UTF-8" ), 250); - $ogImage = htmlspecialchars($artist["image"] . "?class=w800", ENT_QUOTES, "UTF-8"); + $ogImage = htmlspecialchars($artist["image"], ENT_QUOTES, "UTF-8"); $fullUrl = "https://www.coryd.dev" . $requestUri; ob_start(); diff --git a/src/includes/fetchers/book.php.liquid b/src/includes/fetchers/book.php.liquid index 2793741..0409024 100644 --- a/src/includes/fetchers/book.php.liquid +++ b/src/includes/fetchers/book.php.liquid @@ -96,7 +96,7 @@ ENT_QUOTES, "UTF-8" ), 250); - $ogImage = htmlspecialchars($book["image"] . "?class=w800", ENT_QUOTES, "UTF-8"); + $ogImage = htmlspecialchars($book["image"], ENT_QUOTES, "UTF-8"); $fullUrl = "https://www.coryd.dev" . $requestUri; ob_start(); diff --git a/src/includes/fetchers/genre.php.liquid b/src/includes/fetchers/genre.php.liquid index b84cba8..7da6908 100644 --- a/src/includes/fetchers/genre.php.liquid +++ b/src/includes/fetchers/genre.php.liquid @@ -64,7 +64,7 @@ $pageTitle = htmlspecialchars("Genres • " . $genre["name"], ENT_QUOTES, "UTF-8"); $pageDescription = truncateText(htmlspecialchars(strip_tags($genre["description"]), ENT_QUOTES, "UTF-8"), 250); - $ogImage = htmlspecialchars($genre["artists"][0]["image"] . "?class=w800", ENT_QUOTES, "UTF-8"); + $ogImage = htmlspecialchars($genre["artists"][0]["image"], ENT_QUOTES, "UTF-8"); $fullUrl = "https://www.coryd.dev" . $requestUri; ob_start(); diff --git a/src/includes/fetchers/movie.php.liquid b/src/includes/fetchers/movie.php.liquid index 8e621dd..d22d732 100644 --- a/src/includes/fetchers/movie.php.liquid +++ b/src/includes/fetchers/movie.php.liquid @@ -73,7 +73,7 @@ ENT_QUOTES, "UTF-8" ), 250); - $ogImage = htmlspecialchars($movie["backdrop"] . "?class=w800", ENT_QUOTES, "UTF-8"); + $ogImage = htmlspecialchars($movie["backdrop"], ENT_QUOTES, "UTF-8"); $fullUrl = "https://www.coryd.dev" . $requestUri; ob_start(); diff --git a/src/includes/fetchers/show.php.liquid b/src/includes/fetchers/show.php.liquid index a121727..f88d764 100644 --- a/src/includes/fetchers/show.php.liquid +++ b/src/includes/fetchers/show.php.liquid @@ -64,7 +64,7 @@ $pageTitle = htmlspecialchars("Show • " . $show["title"], ENT_QUOTES, "UTF-8"); $pageDescription = truncateText(htmlspecialchars(strip_tags($show["description"]), ENT_QUOTES, "UTF-8"), 250); - $ogImage = htmlspecialchars($show["image"] . "?class=w800", ENT_QUOTES, "UTF-8"); + $ogImage = htmlspecialchars($show["image"], ENT_QUOTES, "UTF-8"); $fullUrl = "https://www.coryd.dev" . $requestUri; ob_start(); diff --git a/src/includes/metadata/base.liquid b/src/includes/metadata/base.liquid index f5c1030..9bacbae 100644 --- a/src/includes/metadata/base.liquid +++ b/src/includes/metadata/base.liquid @@ -4,10 +4,9 @@ - - - - - - - + + + + + + diff --git a/src/includes/metadata/dynamic.php.liquid b/src/includes/metadata/dynamic.php.liquid index 3661876..517981d 100644 --- a/src/includes/metadata/dynamic.php.liquid +++ b/src/includes/metadata/dynamic.php.liquid @@ -2,7 +2,7 @@ -" /> +" /> diff --git a/src/includes/metadata/static.liquid b/src/includes/metadata/static.liquid index 3949880..b0a627b 100644 --- a/src/includes/metadata/static.liquid +++ b/src/includes/metadata/static.liquid @@ -6,4 +6,4 @@ - + diff --git a/src/meta/htaccess.liquid b/src/meta/htaccess.liquid index df25c50..1ad2896 100644 --- a/src/meta/htaccess.liquid +++ b/src/meta/htaccess.liquid @@ -47,6 +47,9 @@ RewriteRule ^music/genres/([^/]+)/?$ music/genres/index.php [L] ## tags RewriteRule ^tags/([^/]+)(?:/([0-9]+))?/?$ tags/index.php [L] +## open graph assets +RewriteRule ^og/([a-z0-9\-]+)/([\d\.]+)/([a-f0-9\-]+)\.([a-z0-9]+)$ /api/og-image.php?id=$3&class=$1&v=$2&extension=$4 [L] + {% for redirect in redirects -%} Redirect {{ redirect.status_code | default: "301" }} {{ redirect.source_url }} {{ redirect.destination_url }} {% endfor -%}