Added yatte #57
This commit is contained in:
ManeraKai
parent
344c2865d2
commit
41ccec4783
@ -214,12 +214,12 @@ function setFrontend(val) {
|
||||
console.log("youtubeFrontend: ", val)
|
||||
}
|
||||
|
||||
let freetubeFrontend;
|
||||
const getFreetubeFrontend = () => freetubeFrontend;
|
||||
function setFreetubeFrontend(val) {
|
||||
freetubeFrontend = val;
|
||||
browser.storage.local.set({ freetubeFrontend })
|
||||
console.log("freetubeFrontend: ", freetubeFrontend)
|
||||
let youtubeEmbedFrontend;
|
||||
const getYoutubeEmbedFrontend = () => youtubeEmbedFrontend;
|
||||
function setYoutubeEmbedFrontend(val) {
|
||||
youtubeEmbedFrontend = val;
|
||||
browser.storage.local.set({ youtubeEmbedFrontend })
|
||||
console.log("youtubeEmbedFrontend: ", youtubeEmbedFrontend)
|
||||
}
|
||||
|
||||
let persistInvidiousPrefs;
|
||||
@ -303,18 +303,24 @@ function isYoutube(url, initiator) {
|
||||
function redirect(url, type) {
|
||||
if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return null; // Don't redirect YouTube Player API.
|
||||
|
||||
if (frontend == 'freetube' && type === "main_frame")
|
||||
if (frontend == 'yatte' && type === "main_frame")
|
||||
return url.href.replace(/^https?:\/\//, 'yattee://');
|
||||
|
||||
else if (frontend == 'freetube' && type === "main_frame")
|
||||
return `freetube://${url}`;
|
||||
|
||||
else if (frontend == 'freetube' && type !== "main_frame" && freetubeFrontend == "youtube")
|
||||
else if (frontend == 'freetube' && type !== "main_frame" && youtubeEmbedFrontend == "youtube")
|
||||
return null;
|
||||
|
||||
else if (frontend == 'invidious' || (frontend == 'freetube' && freetubeFrontend == 'invidious' && type == "sub_frame")) {
|
||||
else if (
|
||||
frontend == 'invidious' ||
|
||||
((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'invidious' && type == "sub_frame")
|
||||
) {
|
||||
|
||||
if (OnlyEmbeddedVideo == 'onlyEmbedded' && type !== "sub_frame") return null;
|
||||
if (
|
||||
OnlyEmbeddedVideo == 'onlyNotEmbedded' && type !== "main_frame" &&
|
||||
!(frontend == 'freetube' && freetubeFrontend == 'invidious' && type === "sub_frame")
|
||||
!((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'invidious' && type === "sub_frame")
|
||||
) return null;
|
||||
|
||||
let instancesList;
|
||||
@ -326,12 +332,15 @@ function redirect(url, type) {
|
||||
|
||||
return `${randomInstance}${url.pathname.replace("/shorts/", "/watch?v=")}${url.search}`;
|
||||
|
||||
} else if (frontend == 'piped' || (frontend == 'freetube' && freetubeFrontend == 'piped' && type === "sub_frame")) {
|
||||
} else if (
|
||||
frontend == 'piped' ||
|
||||
((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'piped' && type === "sub_frame")
|
||||
) {
|
||||
|
||||
if (OnlyEmbeddedVideo == 'onlyEmbedded' && type !== "sub_frame") return null;
|
||||
if (
|
||||
OnlyEmbeddedVideo == 'onlyNotEmbedded' && type !== "main_frame" &&
|
||||
!(frontend == 'freetube' && freetubeFrontend == 'piped' && type == "sub_frame")
|
||||
!((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'piped' && type == "sub_frame")
|
||||
) return null;
|
||||
|
||||
let instancesList;
|
||||
@ -345,6 +354,28 @@ function redirect(url, type) {
|
||||
return 'CANCEL';
|
||||
}
|
||||
|
||||
function changeInstance(url) {
|
||||
|
||||
let protocolHost = `${url.protocol}//${url.host}`;
|
||||
let instancesList;
|
||||
if (frontend == 'invidious') {
|
||||
if (protocol == 'normal') instancesList = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects];
|
||||
else if (protocol == 'tor') instancesList = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects];
|
||||
}
|
||||
else if (frontend == 'piped') {
|
||||
if (protocol == 'normal') instancesList = [...pipedNormalRedirectsChecks, ...pipedNormalCustomRedirects];
|
||||
else if (protocol == 'tor') instancesList = [...pipedTorRedirectsChecks, ...pipedTorCustomRedirects];
|
||||
}
|
||||
|
||||
console.log("instancesList", instancesList);
|
||||
let index = instancesList.indexOf(protocolHost);
|
||||
if (index > -1) instancesList.splice(index, 1);
|
||||
|
||||
if (instancesList.length === 0) return null;
|
||||
let randomInstance = commonHelper.getRandomInstance(instancesList);
|
||||
return `${randomInstance}${url.pathname}${url.search}`;
|
||||
}
|
||||
|
||||
function isPipedorInvidious(url, type) {
|
||||
let protocolHost = `${url.protocol}//${url.host}`;
|
||||
return (type === "main_frame" || type === "sub_frame") && [
|
||||
@ -502,7 +533,7 @@ async function init() {
|
||||
"pipedTorRedirectsChecks",
|
||||
"pipedTorCustomRedirects",
|
||||
"alwaysusePreferred",
|
||||
"freetubeFrontend",
|
||||
"youtubeEmbedFrontend",
|
||||
|
||||
"youtubeProtocol",
|
||||
],
|
||||
@ -513,7 +544,7 @@ async function init() {
|
||||
disable = result.disableYoutube ?? false;
|
||||
protocol = result.youtubeProtocol ?? 'normal';
|
||||
frontend = result.youtubeFrontend ?? 'piped';
|
||||
freetubeFrontend = result.freetubeFrontend ?? 'invidious';
|
||||
youtubeEmbedFrontend = result.youtubeEmbedFrontend ?? 'invidious';
|
||||
|
||||
theme = result.youtubeTheme ?? 'DEFAULT';
|
||||
volume = result.youtubeVolume ?? '--';
|
||||
@ -553,8 +584,8 @@ export default {
|
||||
getFrontend,
|
||||
setFrontend,
|
||||
|
||||
getFreetubeFrontend,
|
||||
setFreetubeFrontend,
|
||||
getYoutubeEmbedFrontend,
|
||||
setYoutubeEmbedFrontend,
|
||||
|
||||
getRedirects,
|
||||
getCustomRedirects,
|
||||
@ -563,6 +594,7 @@ export default {
|
||||
|
||||
redirect,
|
||||
isYoutube,
|
||||
changeInstance,
|
||||
|
||||
isPipedorInvidious,
|
||||
isUrlPipedorInvidious,
|
||||
|
||||
@ -118,17 +118,17 @@ function changeInstance(url) {
|
||||
var protocolHost = `${tabUrl.protocol}//${tabUrl.host}`;
|
||||
var newUrl;
|
||||
|
||||
if (
|
||||
youtubeHelper.getCustomRedirects().invidious.normal.includes(protocolHost) ||
|
||||
youtubeHelper.getCustomRedirects().piped.normal.includes(protocolHost)
|
||||
)
|
||||
newUrl = 'https://youtube.com';
|
||||
console.log("wewe")
|
||||
newUrl = youtubeHelper.changeInstance(url);
|
||||
|
||||
if (twitterHelper.getRedirects().nitter.normal.includes(protocolHost)) newUrl = 'https://twitter.com';
|
||||
let twitterList = [...twitterHelper.getRedirects().nitter.normal];
|
||||
if (twitterList.includes(protocolHost) && twitterList.length > 1) newUrl = 'https://twitter.com';
|
||||
|
||||
if (instagramHelper.getRedirects().bibliogram.normal.includes(protocolHost)) newUrl = 'https://instagram.com';
|
||||
let instagramList = [...instagramHelper.getRedirects().bibliogram.normal];
|
||||
if (instagramList.includes(protocolHost) && instagramList.length > 1) newUrl = 'https://instagram.com';
|
||||
|
||||
if (redditHelper.getRedirects().libreddit.normal.includes(protocolHost) || redditHelper.getRedirects().teddit.normal.includes(protocolHost)) {
|
||||
let redditList = [...redditHelper.getRedirects().libreddit.normal, ...redditHelper.getRedirects().teddit.normal]
|
||||
if (redditList.includes(protocolHost) && redditList.length > 1) {
|
||||
if (tabUrl.pathname.startsWith('/img')) {
|
||||
newUrl = "https://i.redd.it"
|
||||
tabUrl.href = tabUrl.href.replace("/img", "")
|
||||
@ -137,21 +137,20 @@ function changeInstance(url) {
|
||||
newUrl = 'https://reddit.com';
|
||||
}
|
||||
|
||||
if (
|
||||
searchHelper.getRedirects().searx.normal.includes(protocolHost) ||
|
||||
searchHelper.getRedirects().whoogle.normal.includes(protocolHost)
|
||||
) newUrl = 'https://google.com';
|
||||
let searchList = [...searchHelper.getRedirects().searx.normal, ...searchHelper.getRedirects().whoogle.normal]
|
||||
if (searchList.includes(protocolHost) && searchList.length > 1) newUrl = 'https://google.com';
|
||||
|
||||
if (
|
||||
translateHelper.getRedirects().simplyTranslate.normal.includes(protocolHost) ||
|
||||
translateHelper.getRedirects().lingva.normal.includes(protocolHost)
|
||||
) newUrl = 'https://translate.google.com';
|
||||
let translateList = [...translateHelper.getRedirects().simplyTranslate.normal, ...translateHelper.getRedirects().lingva.normal]
|
||||
if (translateList.includes(protocolHost) && translateList.length > 1) newUrl = 'https://translate.google.com';
|
||||
|
||||
if (mediumHelper.getRedirects().scribe.normal.includes(protocolHost)) newUrl = 'https://medium.com';
|
||||
let mediumList = [...mediumHelper.getRedirects().scribe.normal]
|
||||
if (mediumList.includes(protocolHost) && mediumList.length > 1) newUrl = 'https://medium.com';
|
||||
|
||||
if (imgurHelper.getRedirects().rimgo.normal.includes(protocolHost)) newUrl = 'https://imgur.com';
|
||||
let imgurList = [...imgurHelper.getRedirects().rimgo.normal];
|
||||
if (imgurList.includes(protocolHost) && imgurList.length > 1) newUrl = 'https://imgur.com';
|
||||
|
||||
if (wikipediaHelper.getRedirects().wikiless.normal.includes(protocolHost)) newUrl = 'https://wikipedia.com';
|
||||
let wikipediaList = [...wikipediaHelper.getRedirects().wikiless.normal]
|
||||
if (wikipediaList.includes(protocolHost) && wikipediaList.length > 1) newUrl = 'https://wikipedia.com';
|
||||
|
||||
if (newUrl) browser.tabs.update({ url: tabUrl.href.replace(protocolHost, newUrl) });
|
||||
}
|
||||
|
||||
@ -124,15 +124,16 @@
|
||||
<option value="piped">Piped</option>
|
||||
<option value="invidious">Invidious</option>
|
||||
<option value="freetube">FreeTube</option>
|
||||
<option value="yatte">Yatte</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<div id="freetube">
|
||||
<div id="freetube-yatte">
|
||||
<div class="some-block option-block">
|
||||
<h4>Embedded Videos Frontend</h4>
|
||||
<select id="freetube-embedded-frontend">
|
||||
<select id="youtube-embed-frontend">
|
||||
<option value="invidious">Invidious</option>
|
||||
<option value="piped">Piped</option>
|
||||
<option value="youtube">Youtube</option>
|
||||
|
||||
@ -6,42 +6,42 @@ let youtubeFrontendElement = document.getElementById("youtube-frontend");
|
||||
let invidiousDivElement = document.getElementById("invidious");
|
||||
let pipedDivElement = document.getElementById("piped");
|
||||
let invidiousPipedDivElement = document.getElementById("invidious-piped");
|
||||
let freetubeDivElement = document.getElementById("freetube");
|
||||
let freetubeFrontendElement = document.getElementById("freetube-embedded-frontend");
|
||||
let freetubeYatteDivElement = document.getElementById("freetube-yatte");
|
||||
|
||||
|
||||
function changeFrontendsSettings(frontend) {
|
||||
if (frontend == 'piped') {
|
||||
invidiousPipedDivElement.style.display = 'block'
|
||||
pipedDivElement.style.display = 'block';
|
||||
invidiousDivElement.style.display = 'none';
|
||||
freetubeDivElement.style.display = 'none';
|
||||
freetubeYatteDivElement.style.display = 'none';
|
||||
}
|
||||
else if (frontend == 'invidious') {
|
||||
invidiousPipedDivElement.style.display = 'block'
|
||||
pipedDivElement.style.display = 'none';
|
||||
invidiousDivElement.style.display = 'block';
|
||||
freetubeDivElement.style.display = 'none';
|
||||
freetubeYatteDivElement.style.display = 'none';
|
||||
}
|
||||
else if (frontend == 'freetube') {
|
||||
else if (frontend == 'freetube' || frontend == 'yatte') {
|
||||
invidiousPipedDivElement.style.display = 'none'
|
||||
pipedDivElement.style.display = 'none';
|
||||
invidiousDivElement.style.display = 'none';
|
||||
freetubeDivElement.style.display = 'block';
|
||||
freetubeYatteDivElement.style.display = 'block';
|
||||
}
|
||||
}
|
||||
|
||||
function changeFreetubeFrontendsSettings(freetubeFrontend) {
|
||||
if (freetubeFrontend == 'invidious') {
|
||||
function changeYoutubeEmbedFrontendsSettings(youtubeEmbedFrontend) {
|
||||
if (youtubeEmbedFrontend == 'invidious') {
|
||||
invidiousPipedDivElement.style.display = 'block'
|
||||
pipedDivElement.style.display = 'none';
|
||||
invidiousDivElement.style.display = 'block';
|
||||
}
|
||||
if (freetubeFrontend == 'piped') {
|
||||
if (youtubeEmbedFrontend == 'piped') {
|
||||
invidiousPipedDivElement.style.display = 'block'
|
||||
pipedDivElement.style.display = 'block';
|
||||
invidiousDivElement.style.display = 'none';
|
||||
}
|
||||
else if (freetubeFrontend == 'youtube') {
|
||||
else if (youtubeEmbedFrontend == 'youtube') {
|
||||
invidiousPipedDivElement.style.display = 'none'
|
||||
pipedDivElement.style.display = 'none';
|
||||
invidiousDivElement.style.display = 'none';
|
||||
@ -52,13 +52,16 @@ youtubeFrontendElement.addEventListener("change",
|
||||
let frontend = event.target.options[youtubeFrontendElement.selectedIndex].value
|
||||
youtubeHelper.setFrontend(frontend);
|
||||
changeFrontendsSettings(frontend);
|
||||
changeYoutubeEmbedFrontendsSettings(youtubeHelper.getYoutubeEmbedFrontend());
|
||||
}
|
||||
);
|
||||
freetubeFrontendElement.addEventListener("change",
|
||||
|
||||
let youtubeEmbedFrontendElement = document.getElementById("youtube-embed-frontend");
|
||||
youtubeEmbedFrontendElement.addEventListener("change",
|
||||
(event) => {
|
||||
let freetubeFrontend = event.target.options[freetubeFrontendElement.selectedIndex].value
|
||||
youtubeHelper.setFreetubeFrontend(freetubeFrontend);
|
||||
changeFreetubeFrontendsSettings(freetubeFrontend);
|
||||
let youtubeEmbedFrontend = event.target.options[youtubeEmbedFrontendElement.selectedIndex].value
|
||||
youtubeHelper.setYoutubeEmbedFrontend(youtubeEmbedFrontend);
|
||||
changeYoutubeEmbedFrontendsSettings(youtubeEmbedFrontend);
|
||||
}
|
||||
);
|
||||
|
||||
@ -148,7 +151,10 @@ youtubeHelper.init().then(() => {
|
||||
protocolElement.value = protocol;
|
||||
changeProtocolSettings(protocol);
|
||||
|
||||
let freetubeFrontend = youtubeHelper.getFreetubeFrontend()
|
||||
freetubeFrontendElement.value = freetubeFrontend
|
||||
if (frontend == "freetube") changeFreetubeFrontendsSettings(freetubeFrontend);
|
||||
let youtubeEmbedFrontend = youtubeHelper.getYoutubeEmbedFrontend()
|
||||
youtubeEmbedFrontendElement.value = youtubeEmbedFrontend
|
||||
if (frontend == "freetube" || frontend == "yatte") {
|
||||
console.log("youtubeEmbedFrontend", youtubeEmbedFrontend);
|
||||
changeYoutubeEmbedFrontendsSettings(youtubeEmbedFrontend)
|
||||
};
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user