__MSG_customServerAddress__
diff --git a/src/config.ts b/src/config.ts
index 47d99fcf..2a007dce 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -33,6 +33,10 @@ interface SBObject {
defaults: SBConfig;
localConfig: SBConfig;
config: SBConfig;
+
+ // Functions
+ encodeStoredItem(data: T): T | Array;
+ convertJSON(): void;
}
// Allows a SBMap to be conveted into json form
@@ -119,7 +123,11 @@ var Config: SBObject = {
mobileUpdateShowCount: 0
},
localConfig: null,
- config: null
+ config: null,
+
+ // Functions
+ encodeStoredItem,
+ convertJSON
};
// Function setup
@@ -130,7 +138,7 @@ var Config: SBObject = {
*
* @param data
*/
-function encodeStoredItem(data) {
+function encodeStoredItem(data: T): T | Array {
// if data is SBMap convert to json for storing
if(!(data instanceof SBMap)) return data;
return Array.from(data.entries());
@@ -142,7 +150,7 @@ function encodeStoredItem(data) {
*
* @param {*} data
*/
-function decodeStoredItem(id: string, data) {
+function decodeStoredItem(id: string, data: T): T | SBMap {
if (!Config.defaults[id]) return data;
if (Config.defaults[id] instanceof SBMap) {
@@ -239,7 +247,7 @@ function resetConfig() {
Config.config = Config.defaults;
};
-function convertJSON() {
+function convertJSON(): void {
Object.keys(Config.localConfig).forEach(key => {
Config.localConfig[key] = decodeStoredItem(key, Config.localConfig[key]);
});
diff --git a/src/content.ts b/src/content.ts
index 9d7840a9..c90e6ea3 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -25,7 +25,7 @@ var UUIDs = [];
var sponsorVideoID = null;
// Skips are scheduled to ensure precision.
-// Skips are rescheduled every seeked event.
+// Skips are rescheduled every seeking event.
// Skips are canceled every seeking event
var currentSkipSchedule: NodeJS.Timeout = null;
var seekListenerSetUp = false
@@ -39,6 +39,9 @@ var sponsorSkipped = [];
//the video
var video: HTMLVideoElement;
+/** The last time this video was seeking to */
+var lastVideoTime: number = null;
+
var onInvidious;
var onMobileYouTube;
@@ -271,7 +274,12 @@ function resetValues() {
//reset sponsor data found check
sponsorDataFound = false;
- switchingVideos = true;
+ if (switchingVideos === null) {
+ // When first loading a video, it is not switching videos
+ switchingVideos = false;
+ } else {
+ switchingVideos = true;
+ }
}
async function videoIDChange(id) {
@@ -483,12 +491,24 @@ function startSponsorSchedule(currentTime?: number): void {
let forcedSkipTime: number = null;
if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
- skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice);
+ // Double check that the videoID is correct
+ // TODO: Remove this bug catching if statement when the bug is found
+ let currentVideoID = getYouTubeVideoID(document.URL);
+ if (currentVideoID == sponsorVideoID) {
+ skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice);
- if (Config.config.disableAutoSkip) {
- forcedSkipTime = skipTime[0] + 0.001;
+ if (Config.config.disableAutoSkip) {
+ forcedSkipTime = skipTime[0] + 0.001;
+ } else {
+ forcedSkipTime = skipTime[1];
+ }
} else {
- forcedSkipTime = skipTime[1];
+ // Something has really gone wrong
+ console.error("[SponsorBlock] The videoID recorded when trying to skip is different than what it should be.");
+ console.error("[SponsorBlock] VideoID recorded: " + sponsorVideoID + ". Actual VideoID: " + currentVideoID);
+
+ // Video ID change occured
+ videoIDChange(currentVideoID);
}
}
@@ -540,12 +560,27 @@ function sponsorsLookup(id: string, channelIDPromise?) {
startSponsorSchedule();
}
});
- video.addEventListener('seeked', () => {
- if (!video.paused) startSponsorSchedule();
+ video.addEventListener('seeking', () => {
+ // Reset lastCheckVideoTime
+ lastCheckVideoTime = -1
+ lastCheckTime = 0;
+
+ lastVideoTime = video.currentTime;
+
+ if (!video.paused){
+ startSponsorSchedule();
+ }
});
video.addEventListener('ratechange', () => startSponsorSchedule());
- video.addEventListener('seeking', cancelSponsorSchedule);
- video.addEventListener('pause', cancelSponsorSchedule);
+ video.addEventListener('pause', () => {
+ // Reset lastCheckVideoTime
+ lastCheckVideoTime = -1;
+ lastCheckTime = 0;
+
+ lastVideoTime = video.currentTime;
+
+ cancelSponsorSchedule();
+ });
startSponsorSchedule();
}
@@ -600,26 +635,26 @@ function sponsorsLookup(id: string, channelIDPromise?) {
UUIDs = smallUUIDs;
}
- // See if there are any zero second sponsors
- let zeroSecondSponsor = false;
- for (const time of sponsorTimes) {
- if (time[0] <= 0) {
- zeroSecondSponsor = true;
- break;
- }
- }
- if (!zeroSecondSponsor) {
- for (const time of sponsorTimesSubmitting) {
- if (time[0] <= 0) {
- zeroSecondSponsor = true;
+ if (!switchingVideos) {
+ // See if there are any starting sponsors
+ let startingSponsor: number = -1;
+ for (const time of sponsorTimes) {
+ if (time[0] <= video.currentTime && time[0] > startingSponsor && time[1] > video.currentTime) {
+ startingSponsor = time[0];
break;
}
}
- }
+ if (!startingSponsor) {
+ for (const time of sponsorTimesSubmitting) {
+ if (time[0] <= video.currentTime && time[0] > startingSponsor && time[1] > video.currentTime) {
+ startingSponsor = time[0];
+ break;
+ }
+ }
+ }
- if (!video.paused && !switchingVideos) {
- if (zeroSecondSponsor) {
- startSponsorSchedule(0);
+ if (startingSponsor !== -1) {
+ startSponsorSchedule(startingSponsor);
} else {
startSponsorSchedule();
}
diff --git a/src/options.ts b/src/options.ts
index f5ebdb70..27d2a1f6 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -1,4 +1,6 @@
import Config from "./config";
+import * as CompileConfig from "../config.json";
+
// Make the config public for debugging purposes
( window).SB = Config;
@@ -126,6 +128,16 @@ async function init() {
invidiousInstanceAddInit( optionsElements[i], privateTextChangeOption);
}
+ break;
+ case "button-press":
+ let actionButton = optionsElements[i].querySelector(".trigger-button");
+
+ switch(optionsElements[i].getAttribute("sync-option")) {
+ case "copyDebugInformation":
+ actionButton.addEventListener("click", copyDebugOutputToClipboard);
+ break;
+ }
+
break;
case "keybind-change":
let keybindButton = optionsElements[i].querySelector(".trigger-button");
@@ -307,7 +319,7 @@ function activateKeybindChange(element: HTMLElement) {
element.querySelector(".option-hidden-section").classList.remove("hidden");
- document.addEventListener("keydown", (e) => keybindKeyPressed(element, e), {once: true});
+ document.addEventListener("keydown", (e) => keybindKeyPressed(element, e), {once: true});
}
/**
@@ -319,25 +331,60 @@ function activateKeybindChange(element: HTMLElement) {
function keybindKeyPressed(element: HTMLElement, e: KeyboardEvent) {
var key = e.key;
- let button = element.querySelector(".trigger-button");
+ if (["Shift", "Control", "Meta", "Alt", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Tab"].indexOf(key) !== -1) {
+
+ // Wait for more
+ document.addEventListener("keydown", (e) => keybindKeyPressed(element, e), {once: true});
+ } else {
+ let button: HTMLElement = element.querySelector(".trigger-button");
+ let option = element.getAttribute("sync-option");
+
+ // Don't allow keys which are already listened for by youtube
+ let restrictedKeys = "1234567890,.jklftcibmJKLFTCIBMNP/<> -+";
+ if (restrictedKeys.indexOf(key) !== -1 ) {
+ closeKeybindOption(element, button);
+
+ alert(chrome.i18n.getMessage("theKey") + " " + key + " " + chrome.i18n.getMessage("keyAlreadyUsedByYouTube"));
+ return;
+ }
+
+ // Make sure keybind isn't used by the other listener
+ // TODO: If other keybindings are going to be added, we need a better way to find the other keys used.
+ let otherKeybind = (option === "startSponsorKeybind") ? Config.config['submitKeybind'] : Config.config['startSponsorKeybind'];
+ if (key === otherKeybind) {
+ closeKeybindOption(element, button);
+
+ alert(chrome.i18n.getMessage("theKey") + " " + key + " " + chrome.i18n.getMessage("keyAlreadyUsed"));
+ return;
+ }
+
+ // cancel setting a keybind
+ if (key === "Escape") {
+ closeKeybindOption(element, button);
+
+ return;
+ }
+
+ Config.config[option] = key;
+
+ let status = element.querySelector(".option-hidden-section > .keybind-status");
+ status.innerText = chrome.i18n.getMessage("keybindDescriptionComplete");
+
+ let statusKey = element.querySelector(".option-hidden-section > .keybind-status-key");
+ statusKey.innerText = key;
- // cancel setting a keybind
- if (key === "Escape") {
- element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled");
- return;
}
+}
- let option = element.getAttribute("sync-option");
-
- Config.config[option] = key;
-
- let status = element.querySelector(".option-hidden-section > .keybind-status");
- status.innerText = chrome.i18n.getMessage("keybindDescriptionComplete");
-
- let statusKey = element.querySelector(".option-hidden-section > .keybind-status-key");
- statusKey.innerText = key;
-
+/**
+ * Closes the menu for editing the keybind
+ *
+ * @param element
+ * @param button
+ */
+function closeKeybindOption(element: HTMLElement, button: HTMLElement) {
+ element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled");
}
@@ -367,7 +414,12 @@ function activatePrivateTextChange(element: HTMLElement) {
// See if anything extra must be done
switch (option) {
case "*":
- result = JSON.stringify(Config.localConfig);
+ let jsonData = JSON.parse(JSON.stringify(Config.localConfig));
+
+ // Fix sponsorTimes data as it is destroyed from the JSON stringify
+ jsonData.sponsorTimes = Config.encodeStoredItem(Config.localConfig.sponsorTimes);
+
+ result = JSON.stringify(jsonData);
break;
}
@@ -387,7 +439,9 @@ function activatePrivateTextChange(element: HTMLElement) {
for (const key in newConfig) {
Config.config[key] = newConfig[key];
}
+ Config.convertJSON();
+ // Reload options on page
init();
if (newConfig.supportInvidious) {
@@ -433,3 +487,35 @@ function validateServerAddress(input: string): string {
return input;
}
+
+function copyDebugOutputToClipboard() {
+ // Build output debug information object
+ let output = {
+ debug: {
+ userAgent: navigator.userAgent,
+ platform: navigator.platform,
+ language: navigator.language,
+ extensionVersion: chrome.runtime.getManifest().version
+ },
+ config: JSON.parse(JSON.stringify(Config.localConfig)) // Deep clone config object
+ };
+
+ // Fix sponsorTimes data as it is destroyed from the JSON stringify
+ output.config.sponsorTimes = Config.encodeStoredItem(Config.localConfig.sponsorTimes);
+
+ // Sanitise sensitive user config values
+ delete output.config.userID;
+ output.config.serverAddress = (output.config.serverAddress === CompileConfig.serverAddress)
+ ? "Default server address" : "Custom server address";
+ output.config.invidiousInstances = output.config.invidiousInstances.length;
+ output.config.whitelistedChannels = output.config.whitelistedChannels.length;
+
+ // Copy object to clipboard
+ navigator.clipboard.writeText(JSON.stringify(output, null, 4))
+ .then(() => {
+ alert(chrome.i18n.getMessage("copyDebugInformationComplete"));
+ })
+ .catch(err => {
+ alert(chrome.i18n.getMessage("copyDebugInformationFailed"));
+ });;
+}
\ No newline at end of file