Changes

Changed some regex

Made ejs no longer need extra config member variable

Added url reversal

2 files changed, 36 insertions, 14 deletions

diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index 309d5528..25e998d2 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -11,8 +11,7 @@ async function getConfig() {
 		fetch("/config/config.json")

 			.then(response => response.text())

 			.then(data => {

-				const tmp = JSON.parse(data)

-				config = tmp.config

+				config = JSON.parse(data)

 				resolve()

 			})

 	})

@@ -55,7 +54,7 @@ function all(service) {
 	for (const frontend in config.services[service].frontends) {

 		if (config.services[service].frontends[frontend].instanceList) {

 			for (const network in config.networks) {

-				tmp.push(...redirects[frontend][network])

+				tmp.push(...redirects[frontend][network], ...options[frontend][network].custom)

 			}

 		} else if (config.services[service].frontends[frontend].singleInstance != undefined) tmp.push(config.services[service].frontends[frontend].singleInstance)

 	}

@@ -168,10 +167,10 @@ function redirect(url, type, initiator) {
 			} 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}`

-		case "yatte":

+		case "yattee":

 			return url.href.replace(/^https?:\/{2}/, "yattee://")

 		case "freetube":

-			return `freetube://https://youtube.com${url.pathname}${url.search}`

+			return `freetube://https://youtu.be${url.pathname}${url.search}`.replace(/watch\?v=/, "")

 		case "simplyTranslate":

 			return `${randomInstance}/${url.search}`

 		case "osm": {

@@ -462,9 +461,9 @@ function switchInstance(url) {
 	return new Promise(async resolve => {

 		await init()

 		await getConfig()

+		const protocolHost = utils.protocolHost(url)

 		for (const service in config.services) {

 			if (!options[service].enabled) continue

-			const protocolHost = utils.protocolHost(url)

 			if (!all(service).includes(protocolHost)) continue

 

 			let instancesList = [...options[options[service].frontend][options.network].checks, ...options[options[service].frontend][options.network].custom]

@@ -485,15 +484,44 @@ function switchInstance(url) {
 			// This is to make instance switching work when the instance depends on the pathname, eg https://darmarit.org/searx

 			// Doesn't work because of .includes array method, not a top priotiry atm

 			resolve(oldUrl.replace(oldInstance, randomInstance))

+			return

 		}

 		resolve()

 	})

 }

 

+function reverse(url) {

+	return new Promise(async resolve => {

+		await init()

+		await getConfig()

+		let protocolHost = utils.protocolHost(url)

+		let currentService

+		for (const service in config.services) {

+			if (!all(service).includes(protocolHost)) continue

+			currentService = service

+		}

+		switch (currentService) {

+			case "instagram":

+				if (url.pathname.startsWith("/p")) resolve(`https://instagram.com${url.pathname.replace("/p", "")}${url.search}`)

+				if (url.pathname.startsWith("/u")) resolve(`https://instagram.com${url.pathname.replace("/u", "")}${url.search}`)

+			case "youtube":

+			case "imdb":

+			case "imgur":

+			case "tiktok":

+			case "twitter":

+				resolve(config.services[currentService].url + url.pathname + url.search)

+				return

+			default:

+				resolve()

+				return

+		}

+	})

+}

+

 export default {

 	redirect,

 	initDefaults,

 	computeService,

 	switchInstance,

-	init,

+	reverse,

 }

diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js
index 371838ff..c28af018 100644
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -408,13 +408,7 @@ function copyRaw(test, copyRawElement) {
 					return
 				}
 
-				let newUrl = await youtubeHelper.reverse(url)
-				if (!newUrl) newUrl = await twitterHelper.reverse(url)
-				if (!newUrl) newUrl = await instagramHelper.reverse(url)
-				if (!newUrl) newUrl = await tiktokHelper.reverse(url)
-				if (!newUrl) newUrl = await quoraHelper.reverse(url)
-				if (!newUrl) newUrl = await libremdbHelper.reverse(url)
-				if (!newUrl) newUrl = await imgurHelper.reverse(url)
+				let newUrl = await servicesHelper.reverse(url)
 
 				if (newUrl) {
 					resolve(newUrl)