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

Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements

Browse Source 
# Conflicts:
#	src/components/SkipNoticeComponent.tsx
#	src/config.ts
#	src/content.ts
This commit is contained in:
Ajay Ramachandran
2021-06-30 21:27:21 -04:00
parent 71ec724295 bd429f02a7
commit d458bb0cdf
56 changed files with 1677 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/config.ts
View File

@@ -30,11 +30,15 @@ interface SBConfig {
supportInvidious: boolean,
serverAddress: string,
minDuration: number,
skipNoticeDuration: number,
audioNotificationOnSkip,
checkForUnlistedVideos: boolean,
testingServer: boolean,
refetchWhenNotFound: boolean,
ytInfoPermissionGranted: boolean,
askAboutUnlistedVideos: boolean,
allowExpirements: boolean,
autoHideInfoButton: boolean,
// What categories should be skipped
categorySelections: CategorySelection[],
@@ -168,11 +172,15 @@ const Config: SBObject = {
supportInvidious: false,
serverAddress: CompileConfig.serverAddress,
minDuration: 0,
skipNoticeDuration: 4,
audioNotificationOnSkip: false,
checkForUnlistedVideos: false,
testingServer: false,
refetchWhenNotFound: true,
ytInfoPermissionGranted: false,
askAboutUnlistedVideos: true,
allowExpirements: true,
autoHideInfoButton: true,
categorySelections: [{
name: "sponsor" as Category,
@@ -226,11 +234,11 @@ const Config: SBObject = {
opacity: "0.7"
},
"preview": {
color: "#0b9d65",
color: "#008fd6",
opacity: "0.7"
},
"preview-preview": {
color: "#065b3a",
color: "#005799",
opacity: "0.7"
},
"music_offtopic": {
@@ -346,7 +354,7 @@ function fetchConfig(): Promise<void> {
function migrateOldFormats(config: SBConfig) {
if (!config["highlightCategoryAdded"] && !config.categorySelections.some((s) => s.name === "highlight")) {
config["highlightCategoryAdded"] = true;
config.categorySelections.push({
name: "highlight" as Category,
option: CategorySkipOption.ManualSkip
@@ -355,6 +363,35 @@ function migrateOldFormats(config: SBConfig) {
config.categorySelections = config.categorySelections;
}
// Adding preview category
if (!config["previewCategoryUpdate"]) {
config["previewCategoryUpdate"] = true;
for (const selection of config.categorySelections) {
if (selection.name === "intro"
&& selection.option === CategorySkipOption.AutoSkip || selection.option === CategorySkipOption.ManualSkip) {
// Add a default skip option for preview category
config.categorySelections.push({
name: "preview" as Category,
option: CategorySkipOption.ManualSkip
});
// Ensure it gets updated
config.categorySelections = config.categorySelections;
break;
}
}
}
if (config["disableAutoSkip"]) {
for (const selection of config.categorySelections) {
if (selection.name === "sponsor") {
selection.option = CategorySkipOption.ManualSkip;
chrome.storage.sync.remove("disableAutoSkip");
}
}
}
// Remove some old unused options
if (config["sponsorVideoID"] !== undefined) {
chrome.storage.sync.remove("sponsorVideoID");