mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-12 22:47:18 +03:00
Prevent retry fetch from potentially using the wrong videoID
Resolves https://github.com/ajayyy/SponsorBlock/issues/667
This commit is contained in:
@@ -573,11 +573,11 @@ async function sponsorsLookup(id: string) {
|
|||||||
if (result.length > 0) {
|
if (result.length > 0) {
|
||||||
result = result[0].segments;
|
result = result[0].segments;
|
||||||
if (result.length === 0) { // return if no segments found
|
if (result.length === 0) { // return if no segments found
|
||||||
retryFetch(id);
|
retryFetch();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else { // return if no video found
|
} else { // return if no video found
|
||||||
retryFetch(id);
|
retryFetch();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -625,7 +625,7 @@ async function sponsorsLookup(id: string) {
|
|||||||
|
|
||||||
sponsorLookupRetries = 0;
|
sponsorLookupRetries = 0;
|
||||||
} else if (response?.status === 404) {
|
} else if (response?.status === 404) {
|
||||||
retryFetch(id);
|
retryFetch();
|
||||||
} else if (sponsorLookupRetries < 15 && !recheckStarted) {
|
} else if (sponsorLookupRetries < 15 && !recheckStarted) {
|
||||||
recheckStarted = true;
|
recheckStarted = true;
|
||||||
|
|
||||||
@@ -638,7 +638,7 @@ async function sponsorsLookup(id: string) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function retryFetch(id: string): void {
|
function retryFetch(): void {
|
||||||
if (!Config.config.refetchWhenNotFound) return;
|
if (!Config.config.refetchWhenNotFound) return;
|
||||||
|
|
||||||
sponsorDataFound = false;
|
sponsorDataFound = false;
|
||||||
@@ -649,7 +649,11 @@ function retryFetch(id: string): void {
|
|||||||
|
|
||||||
//if less than 3 days old
|
//if less than 3 days old
|
||||||
if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
|
if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
|
||||||
setTimeout(() => sponsorsLookup(id), 30000 + Math.random() * 90000);
|
setTimeout(() => {
|
||||||
|
if (sponsorVideoID && sponsorTimes?.length === 0) {
|
||||||
|
sponsorsLookup(sponsorVideoID);
|
||||||
|
}
|
||||||
|
}, 10000 + Math.random() * 30000);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user