From 86550d1563e507f329b23580240192ed2a0797ba Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 5 Oct 2022 00:12:51 +0200
Subject: [PATCH] strip more tracking parameters

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

diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 86032db93..d125fde0c 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -30,7 +30,8 @@ const
 	 * https://maxchadwick.xyz/tracking-query-params-registry/
 	 * https://github.com/M66B/FairEmail/blob/master/app/src/main/java/eu/faircode/email/UriHelper.java
 	 */
-	stripParams = /^(utm_|ec_|fbclid|mc_eid|mkt_tok|_hsenc|vero_id|oly_enc_id|oly_anon_id|__s|Referrer|mailing)/i,
+	// eslint-disable-next-line max-len
+	stripParams = /^(utm_|ec_|fbclid|mc_eid|mkt_tok|_hsenc|vero_id|oly_enc_id|oly_anon_id|__s|Referrer|mailing|elq|bch|trc)/i,
 	urlGetParam = (url, name) => new URL(url).searchParams.get(name) || url,
 	base64Url = data => atob(data.replace(/_/g,'/').replace(/-/g,'+')),
 	stripTracking = url => {
@@ -38,6 +39,7 @@ const
 			.replace(/tracking\.(printabout\.nl[^?]+)\?.*/i, (...m) => m[1])
 			.replace(/^.+awstrack\.me\/.+(https:%2F%2F[^/]+)/i, (...m) => decodeURIComponent(m[1]))
 			.replace(/^.+(www\.google|safelinks\.protection\.outlook\.com).+$/i, () => urlGetParam(url, 'url'))
+			.replace(/^.+delivery-status\.com.+$/i, () => urlGetParam(url, 'fb'))
 			.replace(/^.+go\.dhlparcel\.nl.+\/([^/]+)$/i, (...m) => base64Url(m[1]))
 			// Mandrill
 			.replace(/^.+\/track\/click\/.+\?p=.+$/i, () => {