From 0ff56f27abbceeba79e1174b9d685624c1fa21c1 Mon Sep 17 00:00:00 2001
From: Stefan Wehrmeyer <mail@stefanwehrmeyer.com>
Date: Thu, 24 Jul 2025 12:14:18 +0200
Subject: [PATCH 1/2] Remove twitter card meta data

---
 .../templates/fds_blog/includes/social_meta.html | 12 ------------
 .../fds_cms/templates/fds_cms/social_meta.html   | 16 ----------------
 fragdenstaat_de/templates/account/profile.html   |  1 -
 .../templates/filingcabinet/document_detail.html |  8 --------
 fragdenstaat_de/templates/foirequest/show.html   |  1 -
 5 files changed, 38 deletions(-)

diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
index 449b9a933..6f56fba00 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
@@ -3,18 +3,6 @@
 {# Schema.org markup for Google+ #}
 <meta itemprop="name" content="{{ article.meta_title }}">
 {% if article.abstract %}<meta itemprop="description" content="{{ article.abstract|striptags }}">{% endif %}
-{# Twitter Card data #}
-<meta name="twitter:site" content="@fragdenstaat">
-<meta name="twitter:title" content="{{ article.meta_title }}">
-{% if article.teaser %}<meta name="twitter:description" content="{{ article.teaser|striptags }}">{% endif %}
-<meta name="twitter:creator" content="@fragdenstaat">
-{% if article.image %}
-    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:image:src"
-          content="{% thumbnail article.image 1120x600 crop subject_location=article.image.subject_location %}">
-{% else %}
-    <meta name="twitter:card" content="summary">
-{% endif %}
 {# Open Graph data #}
 <meta property="og:title" content="{{ article.meta_title }}" />
 <meta property="og:type" content="article" />
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
index d0d42378c..8fb5a84b4 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
@@ -15,22 +15,6 @@
 {% if description and description != "None" %}<meta itemprop="description" content="{{ description }}">{% endif %}
 <meta name="description"
       content="{% if description and description != "None" %}{{ description }}{% else %}{% blocktrans with site=SITE_NAME %}{{ site }} helps you to make freedom of information requests to public bodies{% endblocktrans %}{% endif %}" />
-{# Twitter Card data #}
-<meta name="twitter:site" content="@fragdenstaat">
-<meta name="twitter:title" content="{{ title }}">
-{% if description and description != "None" %}<meta name="twitter:description" content="{{ description }}">{% endif %}
-<meta name="twitter:creator" content="@fragdenstaat">
-{% if image_url %}
-    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:image:src" content="{{ image_url }}">
-{% elif object.fdspageextension.image %}
-    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:image:src"
-          content="{% thumbnail object.fdspageextension.image 1120x600 crop subject_location=object.fdspageextension.image.subject_location %}">
-{% else %}
-    <meta name="twitter:card" content="summary">
-    <meta name="twitter:image:src" content="{{ SITE_LOGO }}">
-{% endif %}
 {# Open Graph data #}
 <meta property="og:title" content="{{ title }}" />
 <meta property="og:type" content="article" />
diff --git a/fragdenstaat_de/templates/account/profile.html b/fragdenstaat_de/templates/account/profile.html
index ede9fea5b..ff5c0ead2 100644
--- a/fragdenstaat_de/templates/account/profile.html
+++ b/fragdenstaat_de/templates/account/profile.html
@@ -7,5 +7,4 @@
     <meta property="og:title"
           content="{{ object.get_full_name }} – FragDenStaat-Profil" />
     <meta property="og:image" content="{{ og_image_url }}" />
-    <meta name="twitter:card" content="summary_large_image">
 {% endblock %}
diff --git a/fragdenstaat_de/templates/filingcabinet/document_detail.html b/fragdenstaat_de/templates/filingcabinet/document_detail.html
index 16f3d7b36..e321af0e1 100644
--- a/fragdenstaat_de/templates/filingcabinet/document_detail.html
+++ b/fragdenstaat_de/templates/filingcabinet/document_detail.html
@@ -5,14 +5,6 @@
     {% if object.public %}
         <meta itemprop="name" content="{{ object.title }}">
         {% if object.description %}<meta itemprop="description" content="{{ object.description }}">{% endif %}
-        {# Twitter Card data #}
-        <meta name="twitter:site" content="@fragdenstaat">
-        <meta name="twitter:title" content="{{ object.title }}">
-        {% if object.description %}<meta name="twitter:description" content="{{ object.description }}">{% endif %}
-        <meta name="twitter:creator" content="@fragdenstaat">
-        <meta name="twitter:card" content="summary_large_image">
-        <meta name="twitter:image:src"
-              content="{% thumbnail object.get_cover_image_file 1120x600 crop %}">
         {# Open Graph data #}
         <meta property="og:title" content="{{ object.title }}" />
         <meta property="og:type" content="article" />
diff --git a/fragdenstaat_de/templates/foirequest/show.html b/fragdenstaat_de/templates/foirequest/show.html
index 497dfaf10..6cf14239f 100644
--- a/fragdenstaat_de/templates/foirequest/show.html
+++ b/fragdenstaat_de/templates/foirequest/show.html
@@ -4,5 +4,4 @@
     {% url 'foirequest-show-og' slug=object.slug as foirequest_path %}
     {% ogimage_url path=foirequest_path as og_image_url %}
     <meta property="og:image" content="{{ og_image_url }}" />
-    <meta name="twitter:card" content="summary_large_image">
 {% endblock %}

From 9b5ea98ed630003fa8381734eb2d921a1ad668ab Mon Sep 17 00:00:00 2001
From: Stefan Wehrmeyer <mail@stefanwehrmeyer.com>
Date: Thu, 24 Jul 2025 15:20:24 +0200
Subject: [PATCH 2/2]  Use "ogimage" easy thumbnail alias for og:image
 thumbnails

Also now includes replace alpha option, replacing transparent background with white
---
 .../fds_blog/templates/fds_blog/includes/social_meta.html  | 2 +-
 fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html | 2 +-
 .../fds_events/templates/fds_events/event_detail.html      | 4 ++--
 fragdenstaat_de/settings/base.py                           | 7 +++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
index 6f56fba00..d67669e79 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
@@ -10,7 +10,7 @@
       content="{{ SITE_URL }}{{ article.get_absolute_url }}" />
 {% if article.image %}
     <meta property="og:image"
-          content="{% thumbnail article.image 1200x630 crop subject_location=article.image.subject_location %}" />
+          content="{% thumbnail article.image "ogimage" subject_location=article.image.subject_location %}" />
 {% endif %}
 {% if article.teaser %}<meta property="og:description" content="{{ article.teaser|striptags }}" />{% endif %}
 <meta property="og:site_name" content="{{ SITE_NAME }}" />
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
index 8fb5a84b4..11e90db0d 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
@@ -24,7 +24,7 @@
     <meta property="og:image" content="{{ image_url }}" />
 {% elif object.fdspageextension.image %}
     <meta property="og:image"
-          content="{% thumbnail object.fdspageextension.image 1200x630 crop subject_location=object.fdspageextension.image.subject_location %}" />
+          content="{% thumbnail object.fdspageextension.image "ogimage" subject_location=object.fdspageextension.image.subject_location %}" />
 {% else %}
     <meta property="og:image" content="{{ SITE_LOGO }}">
 {% endif %}
diff --git a/fragdenstaat_de/fds_events/templates/fds_events/event_detail.html b/fragdenstaat_de/fds_events/templates/fds_events/event_detail.html
index 864c38123..18e78523a 100644
--- a/fragdenstaat_de/fds_events/templates/fds_events/event_detail.html
+++ b/fragdenstaat_de/fds_events/templates/fds_events/event_detail.html
@@ -10,7 +10,7 @@
     <meta property="og:description" content="{{ event.description }}" />
     {% if event.image %}
         <meta property="og:image"
-              content="{% thumbnail event.image 1200x630 crop subject_location=event.image.subject_location %}" />
+              content="{% thumbnail event.image "ogimage" subject_location=event.image.subject_location %}" />
     {% endif %}
 {% endblock meta %}
 {% block title %}{{ event.title }} – {{ SITE_NAME }}{% endblock %}
@@ -25,7 +25,7 @@ <h1>{{ event.title }}</h1>
                 </div>
                 {% if event.image %}
                     <div class="col-12 col-md-6 col-lg-4 pb-3">
-                        <img src="{% thumbnail event.image 1200x630 crop subject_location=event.image.subject_location %}"
+                        <img src="{% thumbnail event.image "ogimage" subject_location=event.image.subject_location %}"
                              alt="{{ event.image.default_alt_text }}"
                              class="img-fluid" />
                     </div>
diff --git a/fragdenstaat_de/settings/base.py b/fragdenstaat_de/settings/base.py
index 27c236f8d..5e1b73a17 100644
--- a/fragdenstaat_de/settings/base.py
+++ b/fragdenstaat_de/settings/base.py
@@ -527,6 +527,13 @@ def FILER_SERVERS(self):
             "xxlcontainer@2x": {"size": (2592, 0)},
             "xxxl": {"size": (3840, 0)},
         },
+        "": {
+            "ogimage": {
+                "size": (1200, 630),
+                "crop": True,
+                "replace_alpha": "#ffffff",
+            },
+        },
     }
     FDS_THUMBNAIL_ENABLE_AVIF = False