From 7cc0847db11cf88a207f090d05b45197a6235e8b Mon Sep 17 00:00:00 2001 From: Michael C Date: Fri, 24 Jun 2022 10:49:57 -0400 Subject: [PATCH] store response status 200 --- src/content.ts | 5 +++-- src/popup.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/content.ts b/src/content.ts index 9a11dc3b..e97d5309 100644 --- a/src/content.ts +++ b/src/content.ts @@ -833,7 +833,6 @@ async function sponsorsLookup(keepOldSubmissions = true) { const hashParams = getHashParams(); if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment; - // Check for hashPrefix setting const hashPrefix = (await utils.getHash(sponsorVideoID, 1)).slice(0, 4) as VideoID & HashedValue; const response = await utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, { categories, @@ -842,6 +841,9 @@ async function sponsorsLookup(keepOldSubmissions = true) { ...extraRequestData }); + // store last response status + lastResponseStatus = response?.status; + if (response?.ok) { const recievedSegments: SponsorTime[] = JSON.parse(response.responseText) ?.filter((video) => video.videoID === sponsorVideoID) @@ -910,7 +912,6 @@ async function sponsorsLookup(keepOldSubmissions = true) { updatePreviewBar(); } } else { - lastResponseStatus = response?.status; if (lastResponseStatus === 404) { retryFetch(); } diff --git a/src/popup.ts b/src/popup.ts index f91efede..75afa07b 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -367,7 +367,7 @@ async function runThePopup(messageListener?: MessageListener): Promise { PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound"); displayDownloadedSponsorTimes(request); - } else if (request.status == 404) { + } else if (request.status == 404 || request.status == 200) { PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404"); } else { PageElements.videoFound.innerHTML = chrome.i18n.getMessage("connectionError") + request.status;