diff options
| -rw-r--r-- | src/background.ts | 1 | ||||
| -rw-r--r-- | src/content.ts | 18 | ||||
| -rw-r--r-- | src/messageTypes.ts | 8 | ||||
| -rw-r--r-- | src/popup.ts | 51 |
4 files changed, 57 insertions, 21 deletions
diff --git a/src/background.ts b/src/background.ts index f2c13286..9391d610 100644 --- a/src/background.ts +++ b/src/background.ts @@ -107,6 +107,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) { } case "time": case "infoUpdated": + case "videoChanged": if (sender.tab) { popupPort[sender.tab.id]?.postMessage(request); } diff --git a/src/content.ts b/src/content.ts index 6db9803b..3e3d01b7 100644 --- a/src/content.ts +++ b/src/content.ts @@ -215,7 +215,6 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo case "getVideoID": sendResponse({ videoID: sponsorVideoID, - creatingSegment: isSegmentCreationInProgress(), }); break; @@ -243,15 +242,9 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo // update video on refresh if videoID invalid if (!sponsorVideoID) videoIDChange(getYouTubeVideoID(document)); // fetch segments - sponsorsLookup(false).then(() => sendResponse({ - found: sponsorDataFound, - status: lastResponseStatus, - sponsorTimes: sponsorTimes, - time: video.currentTime, - onMobileYouTube - })); + sponsorsLookup(false); - return true; + break; case "unskip": unskipSponsorTime(sponsorTimes.find((segment) => segment.UUID === request.UUID), null, true); break; @@ -438,6 +431,13 @@ async function videoIDChange(id: string): Promise<void> { } } + // Notify the popup about the video change + chrome.runtime.sendMessage({ + message: "videoChanged", + videoID: sponsorVideoID, + whitelisted: channelWhitelisted + }); + sponsorsLookup(); // Make sure all player buttons are properly added diff --git a/src/messageTypes.ts b/src/messageTypes.ts index f57ba891..78cf59cf 100644 --- a/src/messageTypes.ts +++ b/src/messageTypes.ts @@ -124,4 +124,10 @@ export type InfoUpdatedMessage = IsInfoFoundMessageResponse & { message: "infoUpdated"; } -export type PopupMessage = TimeUpdateMessage | InfoUpdatedMessage; +export interface VideoChangedPopupMessage { + message: "videoChanged"; + videoID: string; + whitelisted: boolean; +} + +export type PopupMessage = TimeUpdateMessage | InfoUpdatedMessage | VideoChangedPopupMessage; diff --git a/src/popup.ts b/src/popup.ts index d46258f3..98d798e2 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -84,8 +84,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { }; type PageElements = { [key: string]: HTMLElement } & InputPageElements - /** If true, the content script is in the process of creating a new segment. */ - let creatingSegment = false; + let stopLoadingAnimation = null; //the start and end time pairs (2d) let sponsorTimes: SponsorTime[] = []; @@ -393,7 +392,6 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { messageHandler.sendMessage(tabs[0].id, { message: 'getVideoID' }, function (result) { if (result !== undefined && result.videoID) { currentVideoID = result.videoID; - creatingSegment = result.creatingSegment; loadTabData(tabs, updating); } else if (result === undefined && chrome.runtime.lastError) { @@ -429,6 +427,12 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { } async function infoFound(request: IsInfoFoundMessageResponse) { + // End any loading animation + if (stopLoadingAnimation != null) { + stopLoadingAnimation(); + stopLoadingAnimation = null; + } + if (chrome.runtime.lastError) { //This page doesn't have the injected content script, or at least not yet displayNoVideo(); @@ -490,10 +494,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { } function startSponsorCallback(response: SponsorStartResponse) { - creatingSegment = response.creatingSegment; - // Only update the segments after a segment was created - if (!creatingSegment) { + if (!response.creatingSegment) { sponsorTimes = Config.config.unsubmittedSegments[currentVideoID] || []; } @@ -728,9 +730,16 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { PageElements.showNoticeAgain.style.display = "none"; } + function isCreatingSegment(): boolean { + const segments = Config.config.unsubmittedSegments[currentVideoID]; + if (!segments) return false; + const lastSegment = segments[segments.length - 1]; + return lastSegment && lastSegment?.segment?.length !== 2; + } + /** Updates any UI related to segment editing and submission according to the current state. */ function updateSegmentEditingUI() { - PageElements.sponsorStart.innerText = chrome.i18n.getMessage(creatingSegment ? "sponsorEnd" : "sponsorStart"); + PageElements.sponsorStart.innerText = chrome.i18n.getMessage(isCreatingSegment() ? "sponsorEnd" : "sponsorStart"); PageElements.submitTimes.style.display = sponsorTimes && sponsorTimes.length > 0 ? "unset" : "none"; PageElements.submissionHint.style.display = sponsorTimes && sponsorTimes.length > 0 ? "unset" : "none"; @@ -929,11 +938,13 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { }); } - async function refreshSegments() { - const stopAnimation = AnimationUtils.applyLoadingAnimation(PageElements.refreshSegmentsButton, 0.3); + function startLoadingAnimation() { + stopLoadingAnimation = AnimationUtils.applyLoadingAnimation(PageElements.refreshSegmentsButton, 0.3); + } - infoFound(await sendTabMessageAsync({ message: 'refreshSegments' }) as IsInfoFoundMessageResponse) - stopAnimation(); + function refreshSegments() { + startLoadingAnimation(); + sendTabMessage({ message: 'refreshSegments' }); } function skipSegment(actionType: ActionType, UUID: SegmentUUID, element?: HTMLElement): void { @@ -1058,6 +1069,24 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { case "infoUpdated": infoFound(msg); break; + case "videoChanged": + currentVideoID = msg.videoID + sponsorTimes = Config.config.unsubmittedSegments[currentVideoID] ?? []; + updateSegmentEditingUI(); + + if (msg.whitelisted) { + PageElements.whitelistChannel.style.display = "none"; + PageElements.unwhitelistChannel.style.display = "unset"; + PageElements.whitelistToggle.checked = true; + document.querySelectorAll('.SBWhitelistIcon')[0].classList.add("rotated"); + } + + // Clear segments list & start loading animation + // We'll get a ping once they're loaded + startLoadingAnimation(); + PageElements.videoFound.innerHTML = chrome.i18n.getMessage("Loading"); + displayDownloadedSponsorTimes([], 0); + break; } } } |