From b023ba31e017c1075e7f88d06e6c72196b7e1f94 Mon Sep 17 00:00:00 2001
From: Soumya Chopra <soumyachopra@gmail.com>
Date: Sun, 10 Dec 2023 14:23:14 -0800
Subject: [PATCH] Update /truecolors/ vanity redirects to point directly to
 /firefox/

---
 bedrock/mozorg/redirects.py       | 12 +-----------
 tests/redirects/map_globalconf.py | 16 ++--------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/bedrock/mozorg/redirects.py b/bedrock/mozorg/redirects.py
index ed957eb7634..7c0720d787f 100644
--- a/bedrock/mozorg/redirects.py
+++ b/bedrock/mozorg/redirects.py
@@ -541,17 +541,7 @@ def decider(request, **kwargs):
     # Issue 9984
     redirect(r"^/about/legal/fraud-report/?$", "/about/legal/defend-mozilla-trademarks/"),
     # Issue 11204
-    redirect(
-        r"^(truecolou?rs|turningred)/?$",
-        "https://truecolors.firefox.com/",
-        merge_query=True,
-        query={
-            "utm_campaign": "firefox-disney-us",
-            "utm_medium": "web",
-            "utm_source": "redirect",
-            "utm_content": "mozilla.org-turningred",
-        },
-    ),
+    redirect(r"^(truecolou?rs|turningred)/?$", "firefox"),
     # Issue 11991
     redirect(r"^transparency/?$", "mozorg.about.policy.transparency.index"),
     redirect(r"^santa-locator/?$", "mozorg.santa-locator"),
diff --git a/tests/redirects/map_globalconf.py b/tests/redirects/map_globalconf.py
index d43f1da83a4..cac3c42e7a8 100644
--- a/tests/redirects/map_globalconf.py
+++ b/tests/redirects/map_globalconf.py
@@ -1182,24 +1182,12 @@
         # issue 12156
         url_test("/privacy/{mozilla-vpn,firefox-relay}/", "/privacy/subscription-services/"),
         # Issue 11204
-        url_test(
-            "/{truecolors,truecolours,turningred}/",
-            "https://truecolors.firefox.com/",
-            query={
-                "utm_campaign": "firefox-disney-us",
-                "utm_medium": "web",
-                "utm_source": "redirect",
-                "utm_content": "mozilla.org-turningred",
-            },
-        ),
+        url_test("/{truecolors,truecolours,turningred}/", "/firefox/"),
         url_test(
             "/{truecolors,truecolours,turningred}/?utm_source=dude",
-            "https://truecolors.firefox.com/",
+            "/firefox/",
             query={
-                "utm_campaign": "firefox-disney-us",
-                "utm_medium": "web",
                 "utm_source": "dude",
-                "utm_content": "mozilla.org-turningred",
             },
         ),
         # Issue 11991