From dd2b41a93b7ac1697aef77646828c562ff8c71e3 Mon Sep 17 00:00:00 2001
From: Kara Engelhardt <kara.engelhardt@okfn.de>
Date: Mon, 25 Nov 2024 17:06:29 +0100
Subject: [PATCH] =?UTF-8?q?Bye=20bye=20little=20birdie=20=F0=9F=90=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fragdenstaat_de/fds_cms/cms_plugins.py          |  1 -
 .../0070_remove_sharelinkscmsplugin_twitter.py  | 17 +++++++++++++++++
 fragdenstaat_de/fds_cms/models.py               |  1 -
 .../templates/email/default/base.html           |  2 +-
 .../templates/email/formal/base.html            |  2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 fragdenstaat_de/fds_cms/migrations/0070_remove_sharelinkscmsplugin_twitter.py

diff --git a/fragdenstaat_de/fds_cms/cms_plugins.py b/fragdenstaat_de/fds_cms/cms_plugins.py
index e4f23e3e6..6568bcee7 100644
--- a/fragdenstaat_de/fds_cms/cms_plugins.py
+++ b/fragdenstaat_de/fds_cms/cms_plugins.py
@@ -398,7 +398,6 @@ def render(self, context, instance, placeholder):
         context["url"] = instance.url
         context["text"] = instance.title
         context["image"] = instance.image
-        context["twitter"] = instance.twitter
         context["bluesky"] = instance.bluesky
         context["mastodon"] = instance.mastodon
         context["facebook"] = instance.facebook
diff --git a/fragdenstaat_de/fds_cms/migrations/0070_remove_sharelinkscmsplugin_twitter.py b/fragdenstaat_de/fds_cms/migrations/0070_remove_sharelinkscmsplugin_twitter.py
new file mode 100644
index 000000000..2ea688e1f
--- /dev/null
+++ b/fragdenstaat_de/fds_cms/migrations/0070_remove_sharelinkscmsplugin_twitter.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.16 on 2024-11-25 16:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("fds_cms", "0069_sharelinkscmsplugin_bluesky_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="sharelinkscmsplugin",
+            name="twitter",
+        ),
+    ]
diff --git a/fragdenstaat_de/fds_cms/models.py b/fragdenstaat_de/fds_cms/models.py
index 756e5b897..0a4b1808b 100644
--- a/fragdenstaat_de/fds_cms/models.py
+++ b/fragdenstaat_de/fds_cms/models.py
@@ -378,7 +378,6 @@ class ShareLinksCMSPlugin(CMSPlugin):
         ),
     )
 
-    twitter = models.BooleanField("Twitter", default=False)
     bluesky = models.BooleanField("BlueSky", default=True)
     mastodon = models.BooleanField("Mastodon", default=True)
     facebook = models.BooleanField("Facebook", default=False)
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/base.html b/fragdenstaat_de/fds_mailing/templates/email/default/base.html
index ffad6e409..661ae6c4b 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/base.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/base.html
@@ -264,7 +264,7 @@
                                                     {% block social_media %}
                                                         Unsere Social-Media-Kanäle:
                                                         <br>
-                                                        <a href="https://twitter.com/fragdenstaat/">Twitter</a> | <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://bsky.app/profile/fragdenstaat.de">Bluesky</a>
+                                                        <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://bsky.app/profile/fragdenstaat.de">Bluesky</a>
                                                         <br>
                                                         <br>
                                                     {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/email/formal/base.html b/fragdenstaat_de/fds_mailing/templates/email/formal/base.html
index bc97e18a9..dd7235394 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/formal/base.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/formal/base.html
@@ -2,6 +2,6 @@
 {% block social_media %}
     Vernetzen Sie sich mit uns!
     <br>
-    <a href="https://twitter.com/fragdenstaat/">Twitter</a> | <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://bsky.app/profile/fragdenstaat.de">Bluesky</a>
+    <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://bsky.app/profile/fragdenstaat.de">Bluesky</a>
     <br>
 {% endblock %}