diff options
Diffstat (limited to 'src/assets/javascripts')
5 files changed, 314 insertions, 23 deletions
diff --git a/src/assets/javascripts/helpers/youtube/invidious-options.js b/src/assets/javascripts/helpers/youtube/invidious-options.js index ea45ae01..aab5508b 100644 --- a/src/assets/javascripts/helpers/youtube/invidious-options.js +++ b/src/assets/javascripts/helpers/youtube/invidious-options.js @@ -1,7 +1,9 @@ "use strict"; +window.browser = window.browser || window.chrome; + export let invidiousQuality; -export const getinvidiousQuality = () => invidiousQuality; +export const getInvidiousQuality = () => invidiousQuality; export function setinvidiousQuality(val) { invidiousQuality = val; browser.storage.local.set({ invidiousQuality }) @@ -48,14 +50,6 @@ export function setInvidiousContinue(val) { console.log("invidiousContinue: ", invidiousContinue) } -export let invidiousListen; -export const getInvidiousListen = () => invidiousListen; -export function setInvidiousListen(val) { - invidiousListen = val; - browser.storage.local.set({ invidiousListen }) - console.log("invidiousListen: ", invidiousListen) -} - export let invidiousSpeed; export const getInvidiousSpeed = () => invidiousSpeed; export function setInvidiousSpeed(val) { @@ -141,7 +135,6 @@ export async function invidiousInit() { "invidiousVideoLoop", "invidiousContinueAutoplay", "invidiousContinue", - "invidiousListen", "invidiousSpeed", "invidiousQualityDash", "invidiousComments", @@ -159,7 +152,6 @@ export async function invidiousInit() { invidiousQuality = r.invidiousQuality ?? 'hd720'; invidiousContinueAutoplay = r.invidiousContinueAutoplay ?? true; invidiousContinue = r.invidiousContinue ?? false; - invidiousListen = r.invidiousListen ?? false; invidiousSpeed = r.invidiousSpeed ?? '1.0'; invidiousQualityDash = r.invidiousQualityDash ?? 'auto'; invidiousComments = r.invidiousComments ?? ['youtube', '']; diff --git a/src/assets/javascripts/helpers/youtube/piped-options.js b/src/assets/javascripts/helpers/youtube/piped-options.js new file mode 100644 index 00000000..f0aea4ea --- /dev/null +++ b/src/assets/javascripts/helpers/youtube/piped-options.js @@ -0,0 +1,138 @@ +"use strict"; + +window.browser = window.browser || window.chrome; + +export let pipedBufferGoal; +export const getPipedBufferGoal = () => pipedBufferGoal; +export function setPipedBufferGoal(val) { + pipedBufferGoal = val; + browser.storage.local.set({ pipedBufferGoal }) + console.log("pipedBufferGoal: ", pipedBufferGoal) +} + +export let pipedComments; +export const getPipedComments = () => pipedComments; +export function setPipedComments(val) { + pipedComments = val; + browser.storage.local.set({ pipedComments }) + console.log("pipedComments: ", pipedComments) +} + +export let pipedDisableLBRY; +export const getPipedDisableLBRY = () => pipedDisableLBRY; +export function setPipedDisableLBRY(val) { + pipedDisableLBRY = val; + browser.storage.local.set({ pipedDisableLBRY }) + console.log("pipedDisableLBRY: ", pipedDisableLBRY) +} + +export let pipedEnabledCodecs; +export const getPipedEnabledCodecs = () => pipedEnabledCodecs; +export function setPipedEnabledCodecs(val) { + pipedEnabledCodecs = val; + browser.storage.local.set({ pipedEnabledCodecs }) + console.log("pipedEnabledCodecs: ", pipedEnabledCodecs) +} + +export let pipedHomepage; +export const getPipedHomepage = () => pipedHomepage; +export function setPipedHomepage(val) { + pipedHomepage = val; + browser.storage.local.set({ pipedHomepage }) + console.log("pipedHomepage: ", pipedHomepage) +} + +export let pipedMinimizeDescription; +export const getPipedMinimizeDescription = () => pipedMinimizeDescription; +export function setPipedMinimizeDescription(val) { + pipedMinimizeDescription = val; + browser.storage.local.set({ pipedMinimizeDescription }) + console.log("pipedMinimizeDescription: ", pipedMinimizeDescription) +} + +export let pipedProxyLBRY; +export const getPipedProxyLBRY = () => pipedProxyLBRY; +export function setPipedProxyLBRY(val) { + pipedProxyLBRY = val; + browser.storage.local.set({ pipedProxyLBRY }) + console.log("pipedProxyLBRY: ", pipedProxyLBRY) +} + +export let pipedQuality; +export const getPipedQuality = () => pipedQuality; +export function setPipedQuality(val) { + pipedQuality = val; + browser.storage.local.set({ pipedQuality }) + console.log("pipedQuality: ", pipedQuality) +} + +export let pipedRegion; +export const getPipedRegion = () => pipedRegion; +export function setPipedRegion(val) { + pipedRegion = val; + browser.storage.local.set({ pipedRegion }) + console.log("pipedRegion: ", pipedRegion) +} + +export let pipedSelectedSkip; +export const getPipedSelectedSkip = () => pipedSelectedSkip; +export function setPipedSelectedSkip(val) { + pipedSelectedSkip = val; + browser.storage.local.set({ pipedSelectedSkip }) + console.log("pipedSelectedSkip: ", pipedSelectedSkip) +} + +export let pipedSponsorblock; +export const getPipedSponsorblock = () => pipedSponsorblock; +export function setPipedSponsorblock(val) { + pipedSponsorblock = val; + browser.storage.local.set({ pipedSponsorblock }) + console.log("pipedSponsorblock: ", pipedSponsorblock) +} + +export let pipedWatchHistory; +export const getPipedWatchHistory = () => pipedWatchHistory; +export function setPipedWatchHistory(val) { + pipedWatchHistory = val; + browser.storage.local.set({ pipedWatchHistory }) + console.log("pipedWatchHistory: ", pipedWatchHistory) +} + +export async function pipedInit() { + return new Promise( + resolve => { + browser.storage.local.get( + [ + "pipedBufferGoal", + "pipedComments", + "pipedDisableLBRY", + "pipedEnabledCodecs", + "pipedHomepage", + "pipedMinimizeDescription", + "pipedProxyLBRY", + "pipedQuality", + "pipedRegion", + "pipedSelectedSkip", + "pipedSponsorblock", + "pipedWatchHistory", + ], + r => { + pipedBufferGoal = r.pipedBufferGoal ?? 10; + pipedComments = r.pipedComments ?? true; + pipedDisableLBRY = r.pipedDisableLBRY ?? false; + pipedEnabledCodecs = r.pipedEnabledCodecs ?? ["av1", "vp9", "avc"]; + pipedHomepage = r.pipedHomepage ?? "trending"; + pipedMinimizeDescription = r.pipedMinimizeDescription ?? false; + pipedProxyLBRY = r.pipedProxyLBRY ?? false; + pipedQuality = r.pipedQuality ?? 0; + pipedRegion = r.pipedRegion ?? "US"; + pipedSelectedSkip = r.pipedSelectedSkip ?? ["sponsor", "interaction", "selfpromo", "music_offtopic"]; + pipedSponsorblock = r.pipedSponsorblock ?? true; + pipedWatchHistory = r.pipedWatchHistory ?? false; + + resolve(); + } + ) + } + ) +} diff --git a/src/assets/javascripts/helpers/youtube/piped-preferences.js b/src/assets/javascripts/helpers/youtube/piped-preferences.js index f4b41e5c..9182b1e5 100644 --- a/src/assets/javascripts/helpers/youtube/piped-preferences.js +++ b/src/assets/javascripts/helpers/youtube/piped-preferences.js @@ -4,15 +4,56 @@ browser.storage.local.get( [ "theme", "youtubeVolume", - "youtubeAutoplay" + "youtubeAutoplay", + "youtubeListen", + + "pipedBufferGoal", + "pipedComments", + "pipedDisableLBRY", + "pipedEnabledCodecs", + "pipedHomepage", + "pipedMinimizeDescription", + "pipedProxyLBRY", + "pipedQuality", + "pipedRegion", + "pipedSelectedSkip", + "pipedSponsorblock", + "pipedWatchHistory", ], r => { let theme = r.theme ?? "dark"; let youtubeAutoplay = r.youtubeAutoplay ?? false; let youtubeVolume = r.youtubeVolume ?? 100; + let youtubeListen = r.youtubeListen ?? false; + + let pipedBufferGoal = r.pipedBufferGoal ?? 10; + let pipedComments = r.pipedComments ?? true; + let pipedDisableLBRY = r.pipedDisableLBRY ?? false; + let pipedEnabledCodecs = r.pipedEnabledCodecs ?? "av1,vp9,avc"; + let pipedHomepage = r.pipedHomepage ?? "trending"; + let pipedMinimizeDescription = r.pipedMinimizeDescription ?? false; + let pipedProxyLBRY = r.pipedProxyLBRY ?? false; + let pipedQuality = r.pipedQuality ?? 0; + let pipedRegion = r.pipedRegion ?? "US"; + let pipedSelectedSkip = r.pipedSelectedSkip ?? []; + let pipedSponsorblock = r.pipedSponsorblock ?? true; + let pipedWatchHistory = r.pipedWatchHistory ?? false; + localStorage.setItem("bufferGoal", pipedBufferGoal); + localStorage.setItem("comments", pipedComments); + localStorage.setItem("disableLBRY", pipedDisableLBRY); + localStorage.setItem("enabledCodecs", pipedEnabledCodecs); + localStorage.setItem("homepage", pipedHomepage); + localStorage.setItem("listen", youtubeListen); + localStorage.setItem("minimizeDescription", pipedMinimizeDescription); + localStorage.setItem("playerAutoPlay", youtubeAutoplay); + localStorage.setItem("proxyLBRY", pipedProxyLBRY); + localStorage.setItem("quality", pipedQuality); + localStorage.setItem("region", pipedRegion); + localStorage.setItem("selectedSkip", pipedSelectedSkip); + localStorage.setItem("sponsorblock", pipedSponsorblock); localStorage.setItem("theme", theme); localStorage.setItem("volume", youtubeVolume / 100); - localStorage.setItem("playerAutoPlay", youtubeAutoplay); + localStorage.setItem("watchHistory", pipedWatchHistory); } )
\ No newline at end of file diff --git a/src/assets/javascripts/helpers/youtube/youtube-options.js b/src/assets/javascripts/helpers/youtube/youtube-options.js new file mode 100644 index 00000000..cacc80c7 --- /dev/null +++ b/src/assets/javascripts/helpers/youtube/youtube-options.js @@ -0,0 +1,28 @@ +"use strict"; + +window.browser = window.browser || window.chrome; + +export let youtubeListen; +export const getYoutubeListen = () => youtubeListen; +export function setYoutubeListen(val) { + youtubeListen = val; + browser.storage.local.set({ youtubeListen }) + console.log("youtubeListen: ", youtubeListen) +} + +export async function youtubeInit() { + return new Promise( + resolve => { + browser.storage.local.get( + [ + "youtubeListen" + ], + r => { + youtubeListen = r.youtubeListen ?? false; + + resolve(); + } + ) + } + ) +} diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js index 1f4bf298..21a5c634 100644 --- a/src/assets/javascripts/helpers/youtube/youtube.js +++ b/src/assets/javascripts/helpers/youtube/youtube.js @@ -3,7 +3,7 @@ import commonHelper from '../common.js' import { invidiousQuality, - getinvidiousQuality, + getInvidiousQuality, setinvidiousQuality, invidiousAlwaysProxy, @@ -27,10 +27,6 @@ import { getInvidiousContinue, setInvidiousContinue, - invidiousListen, - getInvidiousListen, - setInvidiousListen, - invidiousSpeed, getInvidiousSpeed, setInvidiousSpeed, @@ -67,7 +63,64 @@ import { getInvidiousSavePlayerPos, setInvidiousSavePlayerPos, -} from './invidious-options.js' +} from './invidious-options.js'; +import { + pipedBufferGoal, + getPipedBufferGoal, + setPipedBufferGoal, + + pipedComments, + getPipedComments, + setPipedComments, + + pipedDisableLBRY, + getPipedDisableLBRY, + setPipedDisableLBRY, + + pipedEnabledCodecs, + getPipedEnabledCodecs, + setPipedEnabledCodecs, + + pipedHomepage, + getPipedHomepage, + setPipedHomepage, + + pipedMinimizeDescription, + getPipedMinimizeDescription, + setPipedMinimizeDescription, + + pipedProxyLBRY, + getPipedProxyLBRY, + setPipedProxyLBRY, + + pipedQuality, + getPipedQuality, + setPipedQuality, + + pipedRegion, + getPipedRegion, + setPipedRegion, + + pipedSelectedSkip, + getPipedSelectedSkip, + setPipedSelectedSkip, + + pipedSponsorblock, + getPipedSponsorblock, + setPipedSponsorblock, + + pipedWatchHistory, + getPipedWatchHistory, + setPipedWatchHistory, + + pipedInit +} from './piped-options.js'; +import { + youtubeListen, + getYoutubeListen, + setYoutubeListen, + youtubeInit +} from './youtube-options.js'; window.browser = window.browser || window.chrome; @@ -611,7 +664,7 @@ function initInvidiousCookies() { prefs.video_loop = invidiousVideoLoop == 'true'; prefs.continue_autoplay = invidiousContinueAutoplay == 'true'; prefs.continue = invidiousContinue == 'true'; - prefs.listen = invidiousListen == 'true'; + prefs.listen = youtubeListen == 'true'; prefs.speed = parseFloat(invidiousSpeed); prefs.quality = invidiousQuality; prefs.quality_dash = invidiousQualityDash; @@ -646,7 +699,9 @@ function initInvidiousCookies() { } async function init() { + await youtubeInit(); await invidiousInit(); + await pipedInit(); return new Promise( resolve => { fetch('/instances/data.json').then(response => response.text()).then(data => { @@ -729,6 +784,7 @@ async function init() { if (r.youtubeEmbedExceptions) exceptions = r.youtubeEmbedExceptions; initInvidiousCookies(); + resolve(); }); @@ -765,7 +821,7 @@ export default { getInvidiousAlwaysProxy, setinvidiousQuality, - getinvidiousQuality, + getInvidiousQuality, setInvidiousPlayerStyle, getInvidiousPlayerStyle, @@ -797,8 +853,8 @@ export default { getInvidiousContinue, setInvidiousContinue, - getInvidiousListen, - setInvidiousListen, + getYoutubeListen, + setYoutubeListen, getInvidiousSpeed, setInvidiousSpeed, @@ -827,6 +883,42 @@ export default { getInvidiousSavePlayerPos, setInvidiousSavePlayerPos, + getPipedBufferGoal, + setPipedBufferGoal, + + getPipedComments, + setPipedComments, + + getPipedDisableLBRY, + setPipedDisableLBRY, + + getPipedEnabledCodecs, + setPipedEnabledCodecs, + + getPipedHomepage, + setPipedHomepage, + + getPipedMinimizeDescription, + setPipedMinimizeDescription, + + getPipedProxyLBRY, + setPipedProxyLBRY, + + getPipedQuality, + setPipedQuality, + + getPipedRegion, + setPipedRegion, + + getPipedSelectedSkip, + setPipedSelectedSkip, + + getPipedSponsorblock, + setPipedSponsorblock, + + getPipedWatchHistory, + setPipedWatchHistory, + getInvidiousNormalRedirectsChecks, setInvidiousNormalRedirectsChecks, |