Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-10 21:47:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix old video ids potentially being fetched

Browse Source
This commit is contained in:
Ajay
2022-05-03 14:28:05 -04:00
parent 95696e23fe
commit fd260f4caa
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/content.ts
View File

@@ -195,14 +195,14 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
break; break;
case "whitelistChange": case "whitelistChange":
channelWhitelisted = request.value; channelWhitelisted = request.value;
sponsorsLookup(sponsorVideoID); sponsorsLookup();
break; break;
case "submitTimes": case "submitTimes":
submitSponsorTimes(); submitSponsorTimes();
break; break;
case "refreshSegments": case "refreshSegments":
sponsorsLookup(sponsorVideoID, false).then(() => sendResponse({ sponsorsLookup(false).then(() => sendResponse({
found: sponsorDataFound, found: sponsorDataFound,
sponsorTimes: sponsorTimes, sponsorTimes: sponsorTimes,
onMobileYouTube onMobileYouTube
@@ -235,7 +235,7 @@ function contentConfigUpdateListener(changes: StorageChangesObject) {
updateVisibilityOfPlayerControlsButton() updateVisibilityOfPlayerControlsButton()
break; break;
case "categorySelections": case "categorySelections":
sponsorsLookup(sponsorVideoID); sponsorsLookup();
break; break;
} }
} }
@@ -747,11 +747,11 @@ function setupCategoryPill() {
categoryPill.attachToPage(onMobileYouTube, onInvidious, voteAsync); categoryPill.attachToPage(onMobileYouTube, onInvidious, voteAsync);
} }
async function sponsorsLookup(id: string, keepOldSubmissions = true) { async function sponsorsLookup(keepOldSubmissions = true) {
if (!video || !isVisible(video)) refreshVideoAttachments(); if (!video || !isVisible(video)) refreshVideoAttachments();
//there is still no video here //there is still no video here
if (!video) { if (!video) {
setTimeout(() => sponsorsLookup(id), 100); setTimeout(() => sponsorsLookup(), 100);
return; return;
} }
@@ -765,7 +765,7 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment; if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
// Check for hashPrefix setting // Check for hashPrefix setting
const hashPrefix = (await utils.getHash(id, 1)).slice(0, 4) as VideoID & HashedValue; const hashPrefix = (await utils.getHash(sponsorVideoID, 1)).slice(0, 4) as VideoID & HashedValue;
const response = await utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, { const response = await utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
categories, categories,
actionTypes: getEnabledActionTypes(), actionTypes: getEnabledActionTypes(),
@@ -775,7 +775,7 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
if (response?.ok) { if (response?.ok) {
const recievedSegments: SponsorTime[] = JSON.parse(response.responseText) const recievedSegments: SponsorTime[] = JSON.parse(response.responseText)
?.filter((video) => video.videoID === id) ?.filter((video) => video.videoID === sponsorVideoID)
?.map((video) => video.segments)[0]; ?.map((video) => video.segments)[0];
if (!recievedSegments || !recievedSegments.length) { if (!recievedSegments || !recievedSegments.length) {
// return if no video found // return if no video found
@@ -835,7 +835,7 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
//update the preview bar //update the preview bar
//leave the type blank for now until categories are added //leave the type blank for now until categories are added
if (lastPreviewBarUpdate == id || (lastPreviewBarUpdate == null && !isNaN(video.duration))) { if (lastPreviewBarUpdate == sponsorVideoID || (lastPreviewBarUpdate == null && !isNaN(video.duration))) {
//set it now //set it now
//otherwise the listener can handle it //otherwise the listener can handle it
updatePreviewBar(); updatePreviewBar();
@@ -845,7 +845,7 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
} }
if (Config.config.isVip) { if (Config.config.isVip) {
lockedCategoriesLookup(id); lockedCategoriesLookup();
} }
} }
@@ -861,13 +861,13 @@ function getEnabledActionTypes(): ActionType[] {
return actionTypes; return actionTypes;
} }
async function lockedCategoriesLookup(id: string): Promise<void> { async function lockedCategoriesLookup(): Promise<void> {
const hashPrefix = (await utils.getHash(id, 1)).slice(0, 4); const hashPrefix = (await utils.getHash(sponsorVideoID, 1)).slice(0, 4);
const response = await utils.asyncRequestToServer("GET", "/api/lockCategories/" + hashPrefix); const response = await utils.asyncRequestToServer("GET", "/api/lockCategories/" + hashPrefix);
if (response.ok) { if (response.ok) {
try { try {
const categoriesResponse = JSON.parse(response.responseText).filter((lockInfo) => lockInfo.videoID === id)[0]?.categories; const categoriesResponse = JSON.parse(response.responseText).filter((lockInfo) => lockInfo.videoID === sponsorVideoID)[0]?.categories;
if (Array.isArray(categoriesResponse)) { if (Array.isArray(categoriesResponse)) {
lockedCategories = categoriesResponse; lockedCategories = categoriesResponse;
} }
@@ -882,7 +882,7 @@ function retryFetch(): void {
setTimeout(() => { setTimeout(() => {
if (sponsorVideoID && sponsorTimes?.length === 0) { if (sponsorVideoID && sponsorTimes?.length === 0) {
sponsorsLookup(sponsorVideoID); sponsorsLookup();
} }
}, 10000 + Math.random() * 30000); }, 10000 + Math.random() * 30000);
} }
@@ -1593,7 +1593,7 @@ function startOrEndTimingNewSegment() {
Config.forceSyncUpdate("unsubmittedSegments"); Config.forceSyncUpdate("unsubmittedSegments");
// Make sure they know if someone has already submitted something it while they were watching // Make sure they know if someone has already submitted something it while they were watching
sponsorsLookup(sponsorVideoID); sponsorsLookup();
updateEditButtonsOnPlayer(); updateEditButtonsOnPlayer();
updateSponsorTimesSubmitting(false); updateSponsorTimesSubmitting(false);
@@ -1908,7 +1908,7 @@ async function sendSubmitMessage() {
return; return;
} }
sponsorsLookup(sponsorVideoID); sponsorsLookup();
// Add loading animation // Add loading animation
playerButtons.submit.image.src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker.svg"); playerButtons.submit.image.src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker.svg");