From 367657e44ea56bae46f0ea9962cc9d98f6c2b5f7 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Thu, 2 Jul 2020 21:37:38 -0400 Subject: [PATCH] Added intermission category --- config.json.example | 2 +- public/_locales/en/messages.json | 6 ++++++ src/config.ts | 18 +++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/config.json.example b/config.json.example index 09cf2bba..3fabce07 100644 --- a/config.json.example +++ b/config.json.example @@ -2,5 +2,5 @@ "serverAddress": "https://sponsor.ajay.app", "testingServerAddress": "https://sponsor.ajay.app/test", "serverAddressComment": "This specifies the default SponsorBlock server to connect to", - "categoryList": ["sponsor", "intro", "outro", "interaction", "selfpromo", "music_offtopic"] + "categoryList": ["sponsor", "intro", "outro", "interaction", "selfpromo", "intermission", "music_offtopic"] } diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index f0c7907a..55bd3744 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -512,6 +512,12 @@ "category_selfpromo_description": { "message": "Similar to \"sponsor\" except for unpaid or self promotion. This includes sections about merchandise, donations, or information about who they collaborated with." }, + "category_intermission": { + "message": "Intermission" + }, + "category_intermission_description": { + "message": "An interval without actual content. Could be a pause, static frame, or repeating animation in the video. Should not be used for pauses or transitions with actual content" + }, "category_music_offtopic": { "message": "Music: Non-Music Section" }, diff --git a/src/config.ts b/src/config.ts index 4198b7d6..38225cff 100644 --- a/src/config.ts +++ b/src/config.ts @@ -48,8 +48,10 @@ interface SBConfig { "preview-interaction": PreviewBarOption, "selfpromo": PreviewBarOption, "preview-selfpromo": PreviewBarOption, + "intermission": PreviewBarOption, + "preview-intermission": PreviewBarOption "music_offtopic": PreviewBarOption, - "preview-music_offtopic": PreviewBarOption + "preview-music_offtopic": PreviewBarOption, } } @@ -196,6 +198,14 @@ var Config: SBObject = { color: "#bfbf35", opacity: "0.7" }, + "intermission": { + color: "#45a8ff", + opacity: "0.7" + }, + "preview-intermission": { + color: "#0066bf", + opacity: "0.7" + }, "music_offtopic": { color: "#ff9900", opacity: "0.7" @@ -398,6 +408,12 @@ function addDefaults() { for (const key in Config.defaults) { if(!Config.localConfig.hasOwnProperty(key)) { Config.localConfig[key] = Config.defaults[key]; + } else if (key === "barTypes") { + for (const key2 in Config.defaults[key]) { + if(!Config.localConfig[key].hasOwnProperty(key2)) { + Config.localConfig[key][key2] = Config.defaults[key][key2]; + } + } } } };