devol
/
libredirect
mirror of https://codeberg.org/LibRedirect/libredirect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-added EmbedFrontend https://github.com/libredirect/browser_extension/issues/624

This commit is contained in:
ManeraKai 2023-06-20 02:47:28 +03:00
parent a44ba0effe
commit 39a19e56cc
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
4 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/assets/javascripts/services.js
View File

@ -56,22 +56,31 @@ function redirect(url, type, initiator, forceRedirection) {
for (const service in config.services) {
if (!forceRedirection && !options[service].enabled) continue
frontend = options[service].frontend
if (!regexArray(service, url, config, frontend)) {
frontend = null
continue
}
frontend = options[service]
if (
(config.services[service].embeddable && type != options[service].redirectType && options[service].redirectType != "both")
||
(!config.services[service].embeddable && type != "main_frame")
config.services[service].embeddable &&
type != options[service].redirectType &&
options[service].redirectType != "both"
) {
if (options[service].unsupportedUrls == 'block') return 'CANCEL'
return
}
if (
config.services[service].embeddable
&&
type != "main_frame"
&&
options[service].redirectType != "main_frame"
&&
options[service].embedFrontend != "disabled"
) frontend = options[service].embedFrontend
if (!regexArray(service, url, config, frontend)) {
frontend = null
continue
}
let instanceList = options[frontend]
if (instanceList === undefined) break
if (instanceList.length === 0) return null

31
src/config.json
View File

@ -69,6 +69,7 @@
],
"name": "FreeTube",
"embeddable": false,
"desktopApp": true,
"instanceList": false,
"url": "https://github.com/FreeTubeApp/FreeTube"
},
@ -79,6 +80,7 @@
],
"name": "Yattee",
"embeddable": false,
"desktopApp": true,
"instanceList": false,
"url": "https://github.com/yattee/yattee"
}
@ -97,6 +99,7 @@
"enabled": false,
"redirectType": "main_frame",
"frontend": "invidious",
"embedFrontend": "disabled",
"unsupportedUrls": "bypass"
},
"imageType": "png",
@ -126,7 +129,6 @@
"unsupportedUrls": "bypass"
},
"imageType": "png",
"embeddable": false,
"url": "https://music.youtube.com"
},
"twitter": {
@ -177,7 +179,6 @@
"instance": "public"
},
"imageType": "png",
"embeddable": false,
"url": "https://tiktok.com"
},
"reddit": {
@ -207,7 +208,6 @@
"instance": "public"
},
"imageType": "png",
"embeddable": false,
"url": "https://reddit.com"
},
"imgur": {
@ -253,7 +253,6 @@
"frontend": "pixivFe"
},
"imageType": "svg",
"embeddable": false,
"url": "https://www.pixiv.net"
},
"medium": {
@ -297,7 +296,6 @@
"unsupportedUrls": "bypass"
},
"imageType": "svg",
"embeddable": false,
"url": "https://medium.com"
},
"quora": {
@ -320,7 +318,6 @@
"instance": "public"
},
"imageType": "png",
"embeddable": false,
"url": "https://quora.com"
},
"imdb": {
@ -343,7 +340,6 @@
"instance": "public"
},
"imageType": "svg",
"embeddable": false,
"url": "https://imdb.com"
},
"fandom": {
@ -365,7 +361,6 @@
"frontend": "breezeWiki"
},
"imageType": "svg",
"embeddable": false,
"url": "https://fandom.com"
},
"pinterest": {
@ -427,7 +422,6 @@
"instance": "public"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://search.libredirect.invalid"
},
"translate": {
@ -462,7 +456,6 @@
"instance": "public"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://translate.libredirect.invalid"
},
"maps": {
@ -489,7 +482,6 @@
"unsupportedUrls": "bypass"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://maps.libredirect.invalid"
},
"sendFiles": {
@ -512,7 +504,6 @@
"frontend": "send"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://send.libredirect.invalid"
},
"textStorage": {
@ -533,7 +524,6 @@
"frontend": "privateBin"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://paste.libredirect.invalid"
},
"reuters": {
@ -554,7 +544,6 @@
"frontend": "neuters"
},
"imageType": "svg",
"embeddable": false,
"url": "https://reuters.com"
},
"genius": {
@ -583,7 +572,6 @@
"instance": "public"
},
"imageType": "svg",
"embeddable": false,
"url": "https://genius.com"
},
"urbanDictionary": {
@ -604,7 +592,6 @@
"frontend": "ruralDictionary"
},
"imageType": "svg",
"embeddable": false,
"url": "https://urbandictionary.com"
},
"stackOverflow": {
@ -628,7 +615,6 @@
"instance": "public"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://stackoverflow.com/"
},
"goodreads": {
@ -651,7 +637,6 @@
"instance": "public"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://goodreads.com/"
},
"wikipedia": {
@ -672,7 +657,6 @@
"frontend": "wikiless"
},
"imageType": "svg",
"embeddable": false,
"url": "https://wikipedia.org"
},
"snopes": {
@ -693,7 +677,6 @@
"frontend": "suds"
},
"imageType": "svg",
"embeddable": false,
"url": "https://www.snopes.com"
},
"waybackMachine": {
@ -714,7 +697,6 @@
"frontend": "waybackClassic"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://web.archive.org"
},
"github": {
@ -735,7 +717,6 @@
"frontend": "gothub"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://github.com"
},
"bilibili": {
@ -757,7 +738,6 @@
"frontend": "mikuInvidious"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://bilibili.com/"
},
"bandcamp": {
@ -779,7 +759,6 @@
"frontend": "tent"
},
"imageType": "svg",
"embeddable": false,
"url": "https://bandcamp.com"
},
"gitlab": {
@ -802,7 +781,6 @@
"frontend": "laboratory"
},
"imageType": "svg",
"embeddable": false,
"url": "https://gitlab.com/"
},
"wolframAlpha": {
@ -823,7 +801,6 @@
"frontend": "wolfreeAlpha"
},
"imageType": "svg",
"embeddable": false,
"url": "https://www.wolframalpha.com"
},
"speedTest": {
@ -846,7 +823,6 @@
"frontend": "libreSpeed"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://speedtest.libredirect.invalid"
},
"meet": {
@ -867,7 +843,6 @@
"frontend": "jitsi"
},
"imageType": "svgMono",
"embeddable": false,
"url": "https://meet.libredirect.invalid"
}
}

15
src/pages/options/index.js
View File

@ -33,7 +33,11 @@ async function changeFrontendsSettings(service) {
if (config.services[service].frontends[frontend].instanceList) {
const frontendDiv = document.getElementById(frontend)
if (typeof divs[service].frontend !== "undefined") {
if (frontend == divs[service].frontend.value) {
if (
frontend == divs[service].frontend.value
||
(!config.services[service].frontends[divs[service].frontend.value].embeddable && divs[service].embedFrontend && frontend == divs[service].embedFrontend.value)
) {
frontendDiv.style.display = ""
if (config.services[service].frontends[frontend].localhost === true) {
document.getElementById(`${service}-instance-div`).style.display = ""
@ -52,19 +56,24 @@ async function changeFrontendsSettings(service) {
}
if (document.getElementById(`${service}-redirectType`)) {
const frontend = options[service].frontend
if (config.services[service].frontends[frontend].embeddable) {
if (config.services[service].frontends[frontend].embeddable || config.services[service].frontends[frontend].desktopApp) {
document.getElementById(`${service}-redirectType`).innerHTML = `
<option value="both" data-localise="__MSG_both__">both</options>
<option value="sub_frame" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
<option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
`
document.getElementById(`${service}-redirectType`).value = options[frontend].redirectType = options[service].redirectType
document.getElementById(`${service}-redirectType`).value = options[service].redirectType
} else {
document.getElementById(`${service}-redirectType`).innerHTML =
'<option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>'
options[service].redirectType = "main_frame"
browser.storage.local.set({ options })
}
if (config.services[service].frontends[frontend].desktopApp) {
document.getElementById(`${service}-embedFrontend-div`).style.display = ''
} else {
document.getElementById(`${service}-embedFrontend-div`).style.display = 'none'
}
}
const frontend_name_element = document.getElementById(`${service}_page`).getElementsByClassName("frontend_name")[0]
frontend_name_element.href = config.services[service].frontends[divs[service].frontend.value].url

17
src/pages/options/widgets/services.pug
View File

@ -29,10 +29,19 @@ each val, service in services
option(value="localhost") localhost
option(value="public") public instances
if services[service].embeddable
div(class="some-block option-block")
h4(data-localise="__MSG_redirectType__") Redirect Type
select(id=service+"-redirectType")
div(class="some-block option-block")
h4(data-localise="__MSG_redirectType__") Redirect Type
select(id=service+"-redirectType")
div(id=service+"-embedFrontend-div" class="some-block option-block")
h4(data-localise="__MSG_embedFrontend__") Embed Frontend
select(id=service+"-embedFrontend")
option(value="disabled") Disabled
each val, frontend in services[service].frontends
if services[service].frontends[frontend].embeddable && services[service].frontends[frontend].instanceList
option(value=frontend)=services[service].frontends[frontend].name
div(class="some-block option-block")
h4 Unsupported iframes handling