From 623aacfad2606d9d4df8357951a6299ffccc4930 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Sat, 22 Jul 2023 13:14:35 +0300
Subject: Hopefully fixing
 https://github.com/libredirect/browser_extension/issues/765

---
 src/assets/javascripts/services.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

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

diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index d0d85acd..0005770d 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -58,13 +58,6 @@ function redirect(url, type, initiator, forceRedirection) {
 
 		frontend = options[service].frontend
 
-		if (
-			config.services[service].embeddable &&
-			type != options[service].redirectType && options[service].redirectType != "both"
-		) {
-			if (options[service].unsupportedUrls == 'block') return 'CANCEL'
-			return
-		}
 
 		if (config.services[service].frontends[frontend].desktopApp && type != "main_frame" && options[service].redirectType != "main_frame")
 			frontend = options[service].embedFrontend
@@ -75,6 +68,14 @@ function redirect(url, type, initiator, forceRedirection) {
 			continue
 		}
 
+		if (
+			config.services[service].embeddable &&
+			type != options[service].redirectType && options[service].redirectType != "both"
+		) {
+			if (options[service].unsupportedUrls == 'block') return 'CANCEL'
+			return
+		}
+
 		let instanceList = options[frontend]
 		if (instanceList === undefined) break
 		if (instanceList.length === 0) return null
@@ -111,13 +112,6 @@ function redirect(url, type, initiator, forceRedirection) {
 	if (!frontend) return
 
 	switch (frontend) {
-		case "beatbump": {
-			return `${randomInstance}${url.pathname}${url.search}`
-				.replace("/watch?v=", "/listen?id=")
-				.replace("/channel/", "/artist/")
-				.replace("/playlist?list=", "/playlist/VL")
-				.replace(/\/search\?q=.*/, searchQuery => searchQuery.replace("?q=", "/") + "?filter=all")
-		}
 		case "hyperpipe": {
 			return `${randomInstance}${url.pathname}${url.search}`.replace(/\/search\?q=.*/, searchQuery => searchQuery.replace("?q=", "/"))
 		}
@@ -701,7 +695,6 @@ const defaultInstances = {
 	'lingva': ['https://lingva.ml'],
 	'searxng': ['https://search.bus-hit.me'],
 	'rimgo': ['https://rimgo.vern.cc'],
-	'beatbump': ['https://beatbump.ml'],
 	'hyperpipe': ['https://hyperpipe.surge.sh'],
 	'facil': [' https://facilmap.org '],
 	'osm': ['https://www.openstreetmap.org'],
-- 
cgit 1.4.1