feat(og-image.php): proxy open graph + meta images to mitigate cases where query params required by cdn may break requests

This commit is contained in:
Cory Dransfeldt 2025-05-07 16:31:32 -07:00
parent b6dab4831f
commit 1e7a51986a
No known key found for this signature in database
9 changed files with 57 additions and 14 deletions

View file

@ -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": [

View file

@ -17,7 +17,7 @@ permalink: "{{ feed.permalink }}.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>
<image>
<url>{{ globals.url }}/assets/icons/feed.png</url>
<url>{{ globals.url }}/og/w200/{% appVersion %}{{ globals.avatar }}</url>
<title><![CDATA[{{ feed.title | append: " • " | append: globals.site_name }}]]></title>
<link>{{ globals.url }}{{ feed.permalink }}.xml</link>
<width>144</width>

View file

@ -4,10 +4,9 @@
<meta name="theme-color" content="{{ globals.theme_color }}" />
<meta name="fediverse:creator" content="{{ globals.mastodon }}" />
<meta name="generator" content="{{ eleventy.generator }}" />
<link href="{{ globals.cdn_url }}{{ globals.avatar_transparent }}?class=w50&v={% appVersion %}" rel="icon" sizes="any" />
<link href="{{ globals.cdn_url }}{{ globals.avatar_transparent }}?class=w50&v={% appVersion %}&type=svg" rel="icon" type="image/svg+xml" />
<link href="{{ globals.cdn_url }}{{ globals.avatar }}?class=w800&v={% appVersion %}" rel="apple-touch-icon" />
<link rel="alternate" href="{{ globals.url }}/feeds/posts.xml" title="Posts • {{ globals.site_name }}" />
<link rel="alternate" href="{{ globals.url }}/feeds/links.xml" title="Links • {{ globals.site_name }}" type="application/rss+xml" />
<link rel="alternate" href="{{ globals.url }}/feeds/movies.xml" title="Movies • {{ globals.site_name }}" type="application/rss+xml" />
<link rel="alternate" href="{{ globals.url }}/feeds/books.xml" title="Books • {{ globals.site_name }}" type="application/rss+xml" />
<link href="/og/w50/{% appVersion %}{{ globals.avatar_transparent }}" rel="icon" sizes="any" />
<link href="/og/w800/{% appVersion %}{{ globals.avatar }}" rel="apple-touch-icon" />
<link rel="alternate" href="/feeds/posts.xml" title="Posts • {{ globals.site_name }}" />
<link rel="alternate" href="/feeds/links.xml" title="Links • {{ globals.site_name }}" type="application/rss+xml" />
<link rel="alternate" href="/feeds/movies.xml" title="Movies • {{ globals.site_name }}" type="application/rss+xml" />
<link rel="alternate" href="/feeds/books.xml" title="Books • {{ globals.site_name }}" type="application/rss+xml" />

View file

@ -2,7 +2,7 @@
<meta name="description" content="<?= cleanMeta($pageDescription ?? '{{ pageDescription | escape }}') ?>" />
<meta property="og:title" content="<?= cleanMeta($pageTitle ?? '{{ pageTitle }}') ?> • {{ globals.site_name }}" />
<meta property="og:description" content="<?= cleanMeta($pageDescription ?? '{{ pageDescription | escape }}') ?>" />
<meta property="og:image" content="<?= cleanMeta("{{ globals.cdn_url }}" . ($ogImage ?? '{{ ogImage }}')) ?>" />
<meta property="og:image" content="<?= cleanMeta("/og/w800/{% appVersion %}" . ($ogImage ?? '{{ ogImage }}')) ?>" />
<meta property="og:url" content="<?= cleanMeta($fullUrl ?? '{{ fullUrl }}') ?>" />
<link rel="canonical" href="<?= cleanMeta($fullUrl ?? '{{ fullUrl }}') ?>" />
<?php if (!empty($pagination)): ?>

View file

@ -6,4 +6,4 @@
<meta property="og:type" content="article" />
<meta property="og:url" content="{{ fullUrl }}" />
<link rel="canonical" href="{{ fullUrl }}" />
<meta property="og:image" content="{{ ogImage }}?class=w800" />
<meta property="og:image" content="/og/w800/{% appVersion %}{{ globals.avatar }}" />

View file

@ -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 [L]
{% for redirect in redirects -%}
Redirect {{ redirect.status_code | default: "301" }} {{ redirect.source_url }} {{ redirect.destination_url }}
{% endfor -%}