From 261d9ba59c16d66bd3a2789dcad5b0e019f724c6 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sat, 1 Oct 2022 10:28:44 +0200
Subject: [PATCH] First decode tracking links, then strip query parameters

---
 dev/Common/Html.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 075cfb835..fe20ba7e4 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -20,8 +20,6 @@ const
 	stripTracking = text => text
 		.replace(/tracking\.(printabout\.nl[^?]+)\?.*/gsi, (...m) => m[1])
 		.replace(/^.+awstrack\.me\/.+(https:%2F%2F[^/]+)/gsi, (...m) => decodeURIComponent(m[1]))
-		.replace(/([?&])utm_[a-z]+=[^&?#]*/gsi, '$1') // Urchin Tracking Module
-		.replace(/([?&])ec_[a-z]+=[^&?#]*/gsi, '$1')  // Sitecore
 		.replace(/^.+mandrillapp.com.+\?p=([a-z0-9]+)/gsi, (...m) => {
 			let d = JSON.parse(atob(m[1]));
 			if (d && d.p) {
@@ -32,6 +30,8 @@ const
 			}
 			return m[0];
 		})
+		.replace(/([?&])utm_[a-z]+=[^&?#]*/gsi, '$1') // Urchin Tracking Module
+		.replace(/([?&])ec_[a-z]+=[^&?#]*/gsi, '$1')  // Sitecore
 		.replace(/&&+/, '');
 
 export const