From c87bbba349ced5cbc5d9559fbf8af88f9557ad24 Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Tue, 4 Oct 2022 19:10:07 +0100
Subject: Ported 87d68cb662

---
 src/assets/javascripts/services.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/assets/javascripts/services.js')

diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index afd7906f..eed1e6c6 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -140,13 +140,23 @@ function redirect(url, type, initiator) {
 		case "send":
 			return randomInstance
 		case "nitter":
+			let search = new URLSearchParams(url.search)
+
+			search.delete("ref_src")
+			search.delete("ref_url")
+
+			search = search.toString()
+			if (search !== "") search = `?${search}`
+
 			if (url.host.split(".")[0] === "pbs" || url.host.split(".")[0] === "video") {
 				const [, id, format, extra] = url.search.match(/(.*)\?format=(.*)&(.*)/)
 				const query = encodeURIComponent(`${id}.${format}?${extra}`)
-				return `${randomInstance}/pic${url.pathname}${query}`
-			} else if (url.pathname.split("/").includes("tweets")) return `${randomInstance}${url.pathname.replace("/tweets", "")}${url.search}`
-			else if (url.host == "t.co") return `${randomInstance}/t.co${url.pathname}`
-			else return `${randomInstance}${url.pathname}${url.search}`
+				return `${randomInstance}/pic${search}${query}`
+			}
+
+			if (url.pathname.split("/").includes("tweets")) return `${randomInstance}${url.pathname.replace("/tweets", "")}${search}`
+			if (url.host == "t.co") return `${randomInstance}/t.co${url.pathname}`
+			return `${randomInstance}${url.pathname}${search}`
 		case "yattee":
 			return url.href.replace(/^https?:\/{2}/, "yattee://")
 		case "freetube":
-- 
cgit 1.4.1