LBRYFoundation/Watch-on-LBRY
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/Watch-on-LBRY.git synced 2025-08-23 17:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

🍣 Some more bug fixes

Browse source
This commit is contained in:
Shiba 2022-07-07 18:00:32 +00:00
parent ce11d4fdf3
commit 4102177212
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/scripts/ytContent.tsx
View file

@ -141,7 +141,11 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
// We should get this from background, so the caching works and we don't get errors in the future if yt decides to impliment CORS // We should get this from background, so the caching works and we don't get errors in the future if yt decides to impliment CORS
async function requestResolveById(...params: Parameters<typeof resolveById>): ReturnType<typeof resolveById> { async function requestResolveById(...params: Parameters<typeof resolveById>): ReturnType<typeof resolveById> {
const json = await new Promise<string | null | 'error'>((resolve) => chrome.runtime.sendMessage({ json: JSON.stringify(params) }, resolve)) const json = await new Promise<string | null | 'error'>((resolve) => chrome.runtime.sendMessage({ json: JSON.stringify(params) }, resolve))
if (json === 'error') throw new Error("Background error.") if (json === 'error')
{
console.error("Background error on:", params)
throw new Error("Background error.")
}
return json ? JSON.parse(json) : null return json ? JSON.parse(json) : null
} }
@ -156,11 +160,10 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
while (true) { while (true) {
await sleep(500) await sleep(500)
const url = new URL(location.href); const url: URL = (urlCache?.href === location.href) ? urlCache : new URL(location.href);
let target = (await getTargetsByURL(url))[url.href]
try { try {
if (settings.redirect) { if (settings.redirect) {
const target = (await getTargetsByURL(url))[url.href]
if (!target) continue if (!target) continue
if (url === urlCache) continue if (url === urlCache) continue
@ -184,6 +187,8 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
} }
} }
else { else {
if (urlCache !== url) updateButton(null)
let target = (await getTargetsByURL(url))[url.href]
if (!target) { if (!target) {
const descriptionElement = document.querySelector(sourcePlatform.htmlQueries.videoDescription) const descriptionElement = document.querySelector(sourcePlatform.htmlQueries.videoDescription)
if (descriptionElement) { if (descriptionElement) {
@ -215,7 +220,7 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
} }
} }
if (target) { if (target?.type === 'video') {
const videoElement = document.querySelector<HTMLVideoElement>(sourcePlatform.htmlQueries.videoPlayer) const videoElement = document.querySelector<HTMLVideoElement>(sourcePlatform.htmlQueries.videoPlayer)
if (videoElement) target.time = videoElement.currentTime > 3 && videoElement.currentTime < videoElement.duration - 1 ? videoElement.currentTime : null if (videoElement) target.time = videoElement.currentTime > 3 && videoElement.currentTime < videoElement.duration - 1 ? videoElement.currentTime : null
} }