Bye bye little birdie 🐦

okfde · Nov 26, 2024 · dd2b41a · dd2b41a
1 parent e9d9e19
commit dd2b41a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 %}