Add channel skip profiles

public/options/options.css

@@ -116,14 +116,26 @@ html, body {
     color: white;
 }
 
-.option-group > div {
+.option-group > div, .extraOptionGroup {
     min-height: 50px;
     padding: 15px 0;
-    border-bottom: 1px solid var(--border-color);
     border-image: linear-gradient(to right, var(--border-color), #00000000 80%)  1;
 }
+.option-group > div {
+    border-bottom: 1px solid var(--border-color);
+}
+.extraOptionGroup {
+    border-top: 1px solid var(--border-color);
+}
+.extraOptionGroup tr:not(:last-child) {
+    padding-bottom: 15px;
+    display: block;
+}
+#category-type {
+    padding: 0;
+}
 
-.categoryExtraOptions {
+.categoryChooserTable .categoryExtraOptions {
     padding-bottom: 15px;
 }
 
@@ -364,6 +376,11 @@ input[type='number'] {
     padding: 4px;
 }
 
+.sb-number-input {
+    margin-left: 4px;
+    margin-right: 4px;
+}
+
 .switch-label {
     width: inherit;
 }
@@ -744,4 +761,40 @@ svg {
 .advanced-config-help-message {
     margin-bottom: 10px;
     transition: none;
+}
+
+.categoryChooserTopRow {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    margin-bottom: 10px;
+}
+
+.partiallyHidden {
+    opacity: 0.5;
+}
+
+.partiallyHidden:hover {
+    opacity: 1;
+}
+
+.reset-button svg {
+    margin-left: 5px;
+    width: 10px;
+    fill: var(--white);
+
+    cursor: pointer;
+}
+
+.skipProfileMenu {
+    position: absolute;
+}
+
+.configurationInfo > *:not(:last-child) {
+    margin-bottom: 10px;
+}
+
+.configurationInfo .option-text-box {
+    width: 100%;
 }

public/options/options.html

@@ -80,66 +80,6 @@
                     </a>
 				</div>
 
-				<div data-type="toggle" data-sync="muteSegments">
-					<div class="switch-container">
-						<label class="switch">
-							<input id="muteSegments" type="checkbox" checked>
-							<span class="slider round"></span>
-						</label>
-						<label class="switch-label" for="muteSegments">
-							__MSG_muteSegments__
-						</label>
-					</div>
-				</div>
-				
-				<div data-type="toggle" data-sync="fullVideoSegments" class="no-bottom-border">
-					<div class="switch-container">
-						<label class="switch">
-							<input id="fullVideoSegments" type="checkbox" checked>
-							<span class="slider round"></span>
-						</label>
-						<label class="switch-label" for="fullVideoSegments">
-							__MSG_fullVideoSegments__
-						</label>
-					</div>
-				</div>
-
-				<div data-type="toggle" data-sync="fullVideoLabelsOnThumbnails" 
-						data-dependent-on="fullVideoSegments">
-					<div class="switch-container">
-						<label class="switch">
-							<input id="fullVideoLabelsOnThumbnails" type="checkbox" checked>
-							<span class="slider round"></span>
-						</label>
-						<label class="switch-label" for="fullVideoLabelsOnThumbnails">
-							__MSG_fullVideoLabelsOnThumbnails__
-						</label>
-					</div>
-				</div>
-
-				<div data-type="number-change" data-sync="minDuration">
-					<label class="number-container">
-						<span class="optionLabel">__MSG_minDuration__</span>
-						<input type="number" step="0.1" min="0">
-					</label>
-	
-					<div class="small-description">__MSG_minDurationDescription__</div>
-				</div>
-				
-				<div data-type="toggle" data-sync="manualSkipOnFullVideo">
-					<div class="switch-container">
-						<label class="switch">
-							<input id="manualSkipOnFullVideo" type="checkbox" checked>
-							<span class="slider round"></span>
-						</label>
-						<label class="switch-label" for="manualSkipOnFullVideo">
-							__MSG_enableManualSkipOnFullVideo__
-						</label>
-					</div>
-	
-					<div class="small-description">__MSG_whatManualSkipOnFullVideo__</div>
-				</div>
-
 				<div data-type="react-AdvancedSkipOptionsComponent"></div>
 
 				<div data-type="toggle" data-sync="forceChannelCheck">

public/popup.css

@@ -277,8 +277,8 @@
   border-radius: 8px;
   background-color: var(--sb-grey-bg-color);
   justify-content: space-evenly;
-  overflow: hidden;
   display: flex;
+  position: relative;
 }
 .sbControlsMenu-item {
   display: flex;
@@ -627,4 +627,62 @@
 .sbPopupButton {
   width: 16px;
   fill: var(--sb-main-fg-color);
+}
+
+#skipProfileMenu {
+  position: absolute;
+  top: 80px;
+  left: 50%;
+
+  background-color: #292828;
+  border-radius: 10px;
+  padding: 10px;
+
+  transform: translateX(-50%);
+}
+
+#skipProfileActions {
+  padding-top: 10px;
+}
+
+.skipOptionAction {
+  transition: border-color 0.2s ease-in-out, background-color 0.2s ease-in-out;
+  font-size: 14px;
+  padding: 5px;
+  margin: 5px;
+
+  background-color: #222;
+  border-radius: 5px;
+
+  cursor: help;
+  user-select: none;
+
+  border-color: transparent;
+  border-width: 2px;
+  border-style: solid;
+}
+.skipOptionAction:not(.highlighted, .disabled):hover {
+  background-color: var(--sb-grey-bg-color);
+}
+.skipOptionAction.selected {
+  border-color: var(--sb-red-bg-color);
+}
+.skipOptionAction.highlighted {
+  border-color: rgb(127, 0, 0);
+}
+.skipOptionAction:not(.highlighted, .disabled) {
+  cursor: pointer;
+}
+.skipOptionAction.disabled {
+  color: #808080
+}
+
+.optionsSelector {
+    background-color: #c00000;
+    color: white;
+    
+    border: none;
+    font-size: 14px;
+    padding: 5px;
+    border-radius: 5px;
 }

src/components/options/CategoryChooserComponent.tsx

@@ -1,30 +1,160 @@
 import * as React from "react";
 
 import * as CompileConfig from "../../../config.json";
-import { Category } from "../../types";
+import { Category, CategorySelection, CategorySkipOption } from "../../types";
-import CategorySkipOptionsComponent from "./CategorySkipOptionsComponent";
+import { CategorySkipOptionsComponent, ExtraOptionComponent, ToggleOption } from "./CategorySkipOptionsComponent";
+import { SelectOptionComponent } from "./SelectOptionComponent";
+import Config, { ConfigurationID, CustomConfiguration } from "../../config";
+import { generateUserID } from "../../../maze-utils/src/setup";
 
-export interface CategoryChooserProps { 
+let forceUpdateSkipProfilesTimeout: NodeJS.Timeout | null = null;
+let forceUpdateSkipProfileIDsTimeout: NodeJS.Timeout | null = null;
 
-}
+export function CategoryChooserComponent() {
+    const [configurations, setConfigurations] = React.useState(Config.local!.skipProfiles);
+    const [selectedConfigurationID, setSelectedConfigurationID] = React.useState<ConfigurationID | null>(null);
+    const [channelListText, setChannelListText] = React.useState("");
 
-export interface CategoryChooserState {
+    const [configurationName, setConfigurationName] = React.useState("");
+    const [selections, setSelections] = React.useState<CategorySelection[]>([]);
 
-}
+    React.useEffect(() => {
+        setConfigurationName(getConfigurationValue(selectedConfigurationID, "name", ""));
 
-class CategoryChooserComponent extends React.Component<CategoryChooserProps, CategoryChooserState> {
+        updateChannelList(setChannelListText, selectedConfigurationID!);
+        setSelections(getConfigurationValue<CategorySelection[]>(selectedConfigurationID, "categorySelections"));
+    }, [selectedConfigurationID]);
 
-    constructor(props: CategoryChooserProps) {
+    const createNewConfig = () => {
-        super(props);
+        let newID = generateUserID().substring(0, 5);
-
+        while (Config.local.skipProfiles[newID]) {
-        // Setup state
+            newID = generateUserID().substring(0, 5);
-        this.state = {
-            
         }
-    }
 
-    render(): React.ReactElement {
+        const newConfiguration: CustomConfiguration = {
-        return (
+            name: `${chrome.i18n.getMessage("NewConfiguration")} ${Object.keys(Config.local.skipProfiles).length}`,
+            categorySelections: [],
+            showAutogeneratedChapters: null,
+            autoSkipOnMusicVideos: null,
+            skipNonMusicOnlyOnYoutubeMusic: null,
+            muteSegments: null,
+            fullVideoSegments: null,
+            manualSkipOnFullVideo: null,
+            minDuration: null
+        };
+
+        Config.local!.skipProfiles[newID] = newConfiguration;
+        forceUpdateConfigurations();
+        setConfigurations(Config.local!.skipProfiles);
+        setSelectedConfigurationID(newID as ConfigurationID);
+
+        updateChannelList(setChannelListText, newID as ConfigurationID);
+    };
+    React.useEffect(() => {
+        if (window.location.hash === "#newProfile") {
+            createNewConfig();
+        }
+    }, []);
+
+    return (
+        <>
+            <div className="categoryChooserTopRow">
+                <SelectOptionComponent
+                    id="channelProfiles"
+                    onChange={(value) => {
+                        if (value === "null") value = null;
+
+                        setSelectedConfigurationID(value as ConfigurationID);
+                        updateChannelList(setChannelListText, value as ConfigurationID);
+                    }}
+                    value={selectedConfigurationID!}
+                    options={[{
+                        value: "null",
+                        label: chrome.i18n.getMessage("DefaultConfiguration")
+                    }].concat(Object.entries(configurations).map(([key, value]) => ({
+                        value: key,
+                        label: value.name
+                    })))}
+                />
+
+                <div 
+                    className="option-button trigger-button"
+                    onClick={() => createNewConfig()}>
+                    {chrome.i18n.getMessage("NewConfiguration")}
+                </div>
+            </div>
+
+            {
+                selectedConfigurationID &&
+                <div className="configurationInfo">
+                    <input 
+                        type="text"
+                        id="configurationName"
+                        value={configurationName}
+                        placeholder={chrome.i18n.getMessage("ConfigurationName")}
+                        onChange={(e) => {
+                            const newName = e.target.value;
+                            getConfig(selectedConfigurationID)!.name = newName;
+                            setConfigurationName(newName);
+
+                            forceUpdateConfigurations();
+                            setConfigurations(Config.local!.skipProfiles);
+                        }}/>
+
+                    <div>
+                        {chrome.i18n.getMessage("ChannelListInstructionsSB")}
+                    </div>
+                
+                    <textarea 
+                        className="option-text-box" 
+                        rows={10} 
+                        value={channelListText}
+                        onChange={(e) => {
+                            const newText = e.target.value;
+                            setChannelListText(newText);
+
+                            const channels = newText.split("\n").map((channel) => channel.trim()).filter((channel) => channel !== "");
+                            if (channels.length > 0) {
+                                for (const [channelID, id] of Object.entries(Config.local!.channelSkipProfileIDs)) {
+                                    if (id === selectedConfigurationID) {
+                                        if (!channels.includes(channelID)) {
+                                            delete Config.local!.channelSkipProfileIDs[channelID];
+                                        }
+                                    }
+                                }
+
+                                for (const channel of channels) {
+                                    Config.local!.channelSkipProfileIDs[channel] = selectedConfigurationID;
+                                }
+                            }
+
+                            forceUpdateConfigurationIDs();
+                        }}/>
+                    
+                    <div 
+                        className="option-button trigger-button"
+                        onClick={() => {
+                            if (confirm(chrome.i18n.getMessage("areYouSureDeleteConfig"))) {
+                                delete Config.local.skipProfiles[selectedConfigurationID];
+                                forceUpdateConfigurations();
+
+                                for (const [channelID, id] of Object.entries(Config.local.channelSkipProfileIDs)) {
+                                    if (id === selectedConfigurationID) {
+                                        delete Config.local.channelSkipProfileIDs[channelID];
+                                    }
+                                }
+                                forceUpdateConfigurationIDs();
+
+                                setConfigurations(Config.local!.skipProfiles);
+                                const newID = Object.keys(Config.local!.skipProfiles)[0] as ConfigurationID;
+                                setSelectedConfigurationID(newID);
+                            }
+                        }}>
+                        {chrome.i18n.getMessage("DeleteConfiguration")}
+                    </div>
+                </div>
+            }
+
             <table id="categoryChooserTable"
                 className="categoryChooserTable"> 
                 <tbody>
@@ -51,25 +181,170 @@ class CategoryChooserComponent extends React.Component<CategoryChooserProps, Cat
                         </th>
                     </tr>
 
-                    {this.getCategorySkipOptions()}
+                    <CategorySkipOptions
+                        selectedConfigurationID={selectedConfigurationID}
+                        selections={selections}
+                        setSelections={setSelections}
+                    />
                 </tbody> 
             </table>
+
+            <ExtraOptionsComponent
+                selectedConfigurationID={selectedConfigurationID!}/>
+        </>
+    );
+}
+
+function CategorySkipOptions({ selectedConfigurationID, selections, setSelections}: { selectedConfigurationID: ConfigurationID | null;
+        selections: CategorySelection[]; setSelections: (s: CategorySelection[]) => void; }): JSX.Element {
+    const elements: JSX.Element[] = [];
+    const defaultSkipOption = selectedConfigurationID === null ? CategorySkipOption.Disabled : CategorySkipOption.FallbackToDefault;
+
+    for (const category of CompileConfig.categoryList) {
+        elements.push(
+            <CategorySkipOptionsComponent
+                category={category as Category}
+                selection={selections.find(selection => selection.name === category)?.option ?? defaultSkipOption}
+                updateSelection={(option: CategorySkipOption) => {
+                    const existingSelection = selections.find(selection => selection.name === category);
+                    const deletingSelection = (option === CategorySkipOption.Disabled && selectedConfigurationID === null)
+                        || (option === CategorySkipOption.FallbackToDefault && selectedConfigurationID !== null);
+                    if (existingSelection) {
+                        existingSelection.option = option;
+
+                        if (deletingSelection) {
+                            selections.splice(selections.indexOf(existingSelection), 1);
+                        }
+                    } else if (!deletingSelection) {
+                        selections.push({
+                            name: category as Category,
+                            option: option
+                        });
+                    }
+
+                    // Clone so React notices the change
+                    selections = [...selections];
+
+                    updateConfigurationValue(selectedConfigurationID, "categorySelections", selections, setSelections);
+                }}
+                isDefaultConfig={selectedConfigurationID === null}
+                selectedConfigurationID={selectedConfigurationID}
+                key={category}>
+            </CategorySkipOptionsComponent>
         );
     }
 
-    getCategorySkipOptions(): JSX.Element[] {
+    return <>
-        const elements: JSX.Element[] = [];
+        {elements}
+    </>;
+}
 
-        for (const category of CompileConfig.categoryList) {
+function forceUpdateConfigurations() {
-            elements.push(
+    if (forceUpdateSkipProfilesTimeout) {
-                <CategorySkipOptionsComponent category={category as Category}
+        clearTimeout(forceUpdateSkipProfilesTimeout);
-                    key={category}>
+    }
-                </CategorySkipOptionsComponent>
+
-            );
+    forceUpdateSkipProfilesTimeout = setTimeout(() => {
+        Config.forceLocalUpdate("skipProfiles");
+    }, 50);
+}
+
+function forceUpdateConfigurationIDs() {
+    if (forceUpdateSkipProfileIDsTimeout) {
+        clearTimeout(forceUpdateSkipProfileIDsTimeout);
+    }
+
+    forceUpdateSkipProfileIDsTimeout = setTimeout(() => {
+        Config.forceLocalUpdate("channelSkipProfileIDs");
+    }, 50);
+}
+
+function updateChannelList(setChannelListText: (value: string) => void, selectedConfigurationID: ConfigurationID) {
+    setChannelListText(Object.entries(Config.local!.channelSkipProfileIDs)
+        .filter(([, id]) => id === selectedConfigurationID)
+        .map(([channelID]) => channelID).join("\n"))
+}
+
+function getConfig(selectedConfigurationID: ConfigurationID | null) {
+    return selectedConfigurationID ? Config.local!.skipProfiles[selectedConfigurationID] : null;
+}
+
+export function getConfigurationValue<T>(selectedConfigurationID: ConfigurationID | null, option: string, defaultValue?: T): T {
+    if (selectedConfigurationID === null) {
+        if (defaultValue !== undefined) {
+            return defaultValue;
+        } else {
+            return Config.config[option];
         }
-
+    } else {
-        return elements;
+        return getConfig(selectedConfigurationID)[option];
     }
 }
 
-export default CategoryChooserComponent;
+export function updateConfigurationValue(selectedConfigurationID: ConfigurationID | null, option: string, value: unknown, setFunction?: (value: unknown) => void) {
+     if (selectedConfigurationID === null) {
+        Config.config[option] = value;
+    } else {
+        const config = getConfig(selectedConfigurationID);
+        if (value !== null) {
+            config[option] = value;
+        } else {
+            delete config[option];
+        }
+
+        forceUpdateConfigurations();
+    }
+
+    if (setFunction) setFunction(value);
+}
+
+function ExtraOptionsComponent(props: {selectedConfigurationID: ConfigurationID}): JSX.Element {
+    const options: ToggleOption[][] = [[{
+        configKey: "muteSegments",
+        label: chrome.i18n.getMessage("muteSegments"),
+        type: "toggle"
+    }], [{
+        configKey: "fullVideoSegments",
+        label: chrome.i18n.getMessage("fullVideoSegments"),
+        type: "toggle"
+    }, {
+        configKey: "fullVideoLabelsOnThumbnails",
+        label: chrome.i18n.getMessage("fullVideoLabelsOnThumbnails"),
+        type: "toggle",
+        dontShowOnCustomConfigs: true
+    }, {
+        configKey: "manualSkipOnFullVideo",
+        label: chrome.i18n.getMessage("enableManualSkipOnFullVideo"),
+        description: chrome.i18n.getMessage("whatManualSkipOnFullVideo"),
+        type: "toggle"
+    }], [{
+        configKey: "minDuration",
+        label: chrome.i18n.getMessage("minDuration"),
+        description: chrome.i18n.getMessage("minDurationDescription"),
+        type: "number"
+    }]];
+
+    const result: JSX.Element[] = [];
+
+    for (const optionGroup of options) {
+        const groupResult: JSX.Element[] = [];
+        for (const option of optionGroup) {
+            groupResult.push(
+                <ExtraOptionComponent
+                    option={option}
+                    selectedConfigurationID={props.selectedConfigurationID}
+                    key={option.configKey}/>
+            );
+        }
+
+        result.push(
+            <div className="extraOptionGroup" key={optionGroup.map(o => o.configKey).join("-")}>
+                {groupResult}
+            </div>
+        );
+    }
+
+    return (<>
+        {result}
+    </>);
+}

src/components/options/CategorySkipOptionsComponent.tsx

@@ -1,256 +1,295 @@
 import * as React from "react";
 
-import Config from "../../config"
+import Config, { ConfigurationID } from "../../config"
 import * as CompileConfig from "../../../config.json";
 import { Category, CategorySkipOption } from "../../types";
 
 import { getCategorySuffix } from "../../utils/categoryUtils";
-import ToggleOptionComponent from "./ToggleOptionComponent";
+import { ToggleOptionComponent } from "./ToggleOptionComponent";
+import { getConfigurationValue, updateConfigurationValue } from "./CategoryChooserComponent";
+import { NumberInputOptionComponent } from "./NumberInputOptionComponent";
 
 export interface CategorySkipOptionsProps { 
     category: Category;
+    selection: CategorySkipOption;
+    updateSelection(selection: CategorySkipOption): void;
+    isDefaultConfig: boolean;
+    selectedConfigurationID: ConfigurationID;
     defaultColor?: string;
     defaultPreviewColor?: string;
     children?: React.ReactNode;
 }
 
-export interface CategorySkipOptionsState {
-    color: string;
-    previewColor: string;
-}
-
 export interface ToggleOption {
     configKey: string;
     label: string;
+    type: "toggle" | "number";
+    description?: string;
     dontDisable?: boolean;
+    dontShowOnCustomConfigs?: boolean;
 }
 
-class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsProps, CategorySkipOptionsState> {
+export function CategorySkipOptionsComponent(props: CategorySkipOptionsProps): React.ReactElement {
-    setBarColorTimeout: NodeJS.Timeout;
+    const [color, setColor] = React.useState(props.defaultColor || Config.config.barTypes[props.category]?.color);
+    const [previewColor, setPreviewColor] = React.useState(props.defaultPreviewColor || Config.config.barTypes["preview-" + props.category]?.color);
 
-    constructor(props: CategorySkipOptionsProps) {
+    const selectedOption = React.useMemo(() => {
-        super(props);
+        switch (props.selection) {
+            case CategorySkipOption.ShowOverlay:
+                return "showOverlay";
+            case CategorySkipOption.ManualSkip:
+                return "manualSkip";
+            case CategorySkipOption.AutoSkip:
+                return "autoSkip";
+            case CategorySkipOption.FallbackToDefault:
+                return "fallbackToDefault";
+            default:
+                return "disable";
+        }
+    }, [props.selection]);
 
-        // Setup state
+    const setBarColorTimeout = React.useRef<NodeJS.Timeout | null>(null);
-        this.state = {
-            color: props.defaultColor || Config.config.barTypes[this.props.category]?.color,
-            previewColor: props.defaultPreviewColor || Config.config.barTypes["preview-" + this.props.category]?.color
-        };
-    }
 
-    render(): React.ReactElement {
+    return (
-        let defaultOption = "disable";
+        <>
-        // Set the default opton properly
+            <tr id={props.category + "OptionsRow"}
-        for (const categorySelection of Config.config.categorySelections) {
+                className={`categoryTableElement`} >
-            if (categorySelection.name === this.props.category) {
+                <td id={props.category + "OptionName"}
-                switch (categorySelection.option) {
+                    className="categoryTableLabel">
-                    case CategorySkipOption.ShowOverlay:
+                        {chrome.i18n.getMessage("category_" + props.category)}
-                        defaultOption = "showOverlay";
+                </td>
-                        break;
+
-                    case CategorySkipOption.ManualSkip:
+                <td id={props.category + "SkipOption"}
-                        defaultOption = "manualSkip";
+                    className="skipOption">
-                        break;
+                    <select
-                    case CategorySkipOption.AutoSkip:
+                        className="optionsSelector"
-                        defaultOption = "autoSkip";
+                        value={selectedOption}
-                        break;
+                        onChange={(e) => skipOptionSelected(e, props.category, props.updateSelection)}>
+                            {getCategorySkipOptions(props.category, props.isDefaultConfig)}
+                    </select>
+                </td>
+
+                {props.category !== "chapter" &&
+                    <td id={props.category + "ColorOption"}
+                        className="colorOption">
+                        <input
+                            className="categoryColorTextBox option-text-box"
+                            type="color"
+                            disabled={!props.isDefaultConfig}
+                            onChange={(event) => {
+                                if (setBarColorTimeout.current) {
+                                    clearTimeout(setBarColorTimeout.current);
+                                }
+
+                                setColor(event.currentTarget.value);
+                                Config.config.barTypes[props.category].color = event.currentTarget.value;
+
+                                // Make listener get called
+                                setBarColorTimeout.current = setTimeout(() => {
+                                    Config.config.barTypes = Config.config.barTypes;
+                                }, 50);
+                            }}
+                            value={color} />
+                    </td>
                 }
 
-                break;
+                {!["chapter", "exclusive_access"].includes(props.category) &&
+                    <td id={props.category + "PreviewColorOption"}
+                        className="previewColorOption">
+                        <input
+                            className="categoryColorTextBox option-text-box"
+                            type="color"
+                            disabled={!props.isDefaultConfig}
+                            onChange={(event) => {
+                                if (setBarColorTimeout.current) {
+                                    clearTimeout(setBarColorTimeout.current);
+                                }
+
+                                setPreviewColor(event.currentTarget.value);
+                                Config.config.barTypes["preview-" + props.category].color = event.currentTarget.value;
+
+                                // Make listener get called
+                                setBarColorTimeout.current = setTimeout(() => {
+                                    Config.config.barTypes = Config.config.barTypes;
+                                }, 50);
+                            }}
+                            value={previewColor} />
+                    </td>
+                }
+
+            </tr>
+
+            <tr id={props.category + "DescriptionRow"}
+                className={`small-description categoryTableDescription`}>
+                    <td
+                        colSpan={2}>
+                        {chrome.i18n.getMessage("category_" + props.category + "_description")}
+                        {' '}
+                        <a href={CompileConfig.wikiLinks[props.category]} target="_blank" rel="noreferrer">
+                            {`${chrome.i18n.getMessage("LearnMore")}`}
+                        </a>
+                    </td>
+            </tr>
+            
+            <ExtraOptionComponents
+                category={props.category}
+                selectedConfigurationID={props.selectedConfigurationID}
+            />
+        </>
+    );
+}
+
+function skipOptionSelected(event: React.ChangeEvent<HTMLSelectElement>,
+        category: Category, updateSelection: (selection: CategorySkipOption) => void): void {
+    let option: CategorySkipOption;
+    switch (event.target.value) {
+        case "fallbackToDefault":
+            option = CategorySkipOption.FallbackToDefault;
+            break;
+        case "disable":
+            option = CategorySkipOption.Disabled;
+            break;
+        case "showOverlay":
+            option = CategorySkipOption.ShowOverlay;
+            break;
+        case "manualSkip":
+            option = CategorySkipOption.ManualSkip;
+            break;
+        case "autoSkip":
+            option = CategorySkipOption.AutoSkip;
+
+            if (category === "filler" && !Config.config.isVip) {
+                if (!confirm(chrome.i18n.getMessage("FillerWarning"))) {
+                    event.target.value = "disable";
+                }
             }
-        }
 
-        return (
+            break;
-            <>
+    }
-                <tr id={this.props.category + "OptionsRow"}
-                    className={`categoryTableElement`} >
-                    <td id={this.props.category + "OptionName"}
-                        className="categoryTableLabel">
-                            {chrome.i18n.getMessage("category_" + this.props.category)}
-                    </td>
 
-                    <td id={this.props.category + "SkipOption"}
+    updateSelection(option);
-                        className="skipOption">
+}
-                        <select
-                            className="optionsSelector"
-                            defaultValue={defaultOption}
-                            onChange={this.skipOptionSelected.bind(this)}>
-                                {this.getCategorySkipOptions()}
-                        </select>
-                    </td>
 
-                    {this.props.category !== "chapter" &&
+function getCategorySkipOptions(category: Category, isDefaultConfig: boolean): JSX.Element[] {
-                        <td id={this.props.category + "ColorOption"}
+    const elements: JSX.Element[] = [];
-                            className="colorOption">
-                            <input
-                                className="categoryColorTextBox option-text-box"
-                                type="color"
-                                onChange={(event) => this.setColorState(event, false)}
-                                value={this.state.color} />
-                        </td>
-                    }
 
-                    {!["chapter", "exclusive_access"].includes(this.props.category) &&
+    let optionNames = ["disable", "showOverlay", "manualSkip", "autoSkip"];
-                        <td id={this.props.category + "PreviewColorOption"}
+    if (category === "chapter") optionNames = ["disable", "showOverlay"]
-                            className="previewColorOption">
+    else if (category === "exclusive_access") optionNames = ["disable", "showOverlay"];
-                            <input
-                                className="categoryColorTextBox option-text-box"
-                                type="color"
-                                onChange={(event) => this.setColorState(event, true)}
-                                value={this.state.previewColor} />
-                        </td>
-                    }
 
-                </tr>
+    if (!isDefaultConfig) {
+        optionNames = ["fallbackToDefault"].concat(optionNames);
+    }
 
-                <tr id={this.props.category + "DescriptionRow"}
+    for (const optionName of optionNames) {
-                    className={`small-description categoryTableDescription`}>
+        elements.push(
-                        <td
+            <option key={optionName} value={optionName}>
-                            colSpan={2}>
+                {chrome.i18n.getMessage(optionName !== "disable" ? optionName + getCategorySuffix(category)
-                            {chrome.i18n.getMessage("category_" + this.props.category + "_description")}
+                                                                    : optionName) || chrome.i18n.getMessage(optionName)}
-                            {' '}
+            </option>
-                            <a href={CompileConfig.wikiLinks[this.props.category]} target="_blank" rel="noreferrer">
-                                {`${chrome.i18n.getMessage("LearnMore")}`}
-                            </a>
-                        </td>
-                </tr>
-                
-                {this.getExtraOptionComponents(this.props.category)}
-
-            </>
         );
     }
 
-    skipOptionSelected(event: React.ChangeEvent<HTMLSelectElement>): void {
+    return elements;
-        let option: CategorySkipOption;
-
-        switch (event.target.value) {
-            case "disable":
-                Config.config.categorySelections = Config.config.categorySelections.filter(
-                    categorySelection => categorySelection.name !== this.props.category);
-                return;
-            case "showOverlay":
-                option = CategorySkipOption.ShowOverlay;
-
-                break;
-            case "manualSkip":
-                option = CategorySkipOption.ManualSkip;
-
-                break;
-            case "autoSkip":
-                option = CategorySkipOption.AutoSkip;
-
-                if (this.props.category === "filler" && !Config.config.isVip) {
-                    if (!confirm(chrome.i18n.getMessage("FillerWarning"))) {
-                        event.target.value = "disable";
-                    }
-                }
-
-                break;
-        }
-
-        const existingSelection = Config.config.categorySelections.find(selection => selection.name === this.props.category);
-        if (existingSelection) {
-            existingSelection.option = option;
-        } else {
-            Config.config.categorySelections.push({
-                name: this.props.category,
-                option: option
-            });
-        }
-
-        Config.forceSyncUpdate("categorySelections");
-    }
-
-    getCategorySkipOptions(): JSX.Element[] {
-        const elements: JSX.Element[] = [];
-
-        let optionNames = ["disable", "showOverlay", "manualSkip", "autoSkip"];
-        if (this.props.category === "chapter") optionNames = ["disable", "showOverlay"]
-        else if (this.props.category === "exclusive_access") optionNames = ["disable", "showOverlay"];
-
-        for (const optionName of optionNames) {
-            elements.push(
-                <option key={optionName} value={optionName}>
-                    {chrome.i18n.getMessage(optionName !== "disable" ? optionName + getCategorySuffix(this.props.category) 
-                                                                     : optionName)}
-                </option>
-            );
-        }
-
-        return elements;
-    }
-
-    setColorState(event: React.FormEvent<HTMLInputElement>, preview: boolean): void {
-        clearTimeout(this.setBarColorTimeout);
-
-        if (preview) {
-            this.setState({
-                previewColor: event.currentTarget.value
-            });
-
-            Config.config.barTypes["preview-" + this.props.category].color = event.currentTarget.value;
-
-        } else {
-            this.setState({
-                color: event.currentTarget.value
-            });
-
-            Config.config.barTypes[this.props.category].color = event.currentTarget.value;
-        }
-
-        // Make listener get called
-        this.setBarColorTimeout = setTimeout(() => {
-            Config.config.barTypes = Config.config.barTypes;
-        }, 50);
-    }
-
-    getExtraOptionComponents(category: string): JSX.Element[] {
-        const result = [];
-        for (const option of this.getExtraOptions(category)) {
-            result.push(
-                <tr key={option.configKey}>
-                    <td id={`${category}_${option.configKey}`} className="categoryExtraOptions">
-                        <ToggleOptionComponent 
-                            configKey={option.configKey} 
-                            label={option.label}
-                            style={{width: "inherit"}}
-                        />
-                    </td>
-                </tr>
-            )
-        }
-
-        return result;
-    }
-
-    getExtraOptions(category: string): ToggleOption[] {
-        switch (category) {
-            case "chapter":
-                return [{
-                    configKey: "renderSegmentsAsChapters",
-                    label: chrome.i18n.getMessage("renderAsChapters"),
-                    dontDisable: true
-                }, {
-                    configKey: "showSegmentNameInChapterBar",
-                    label: chrome.i18n.getMessage("showSegmentNameInChapterBar"),
-                    dontDisable: true
-                }, {
-                    configKey: "showAutogeneratedChapters",
-                    label: chrome.i18n.getMessage("showAutogeneratedChapters"),
-                    dontDisable: true
-                }];
-            case "music_offtopic":
-                return [{
-                    configKey: "autoSkipOnMusicVideos",
-                    label: chrome.i18n.getMessage("autoSkipOnMusicVideos"),
-                }, {
-                    configKey: "skipNonMusicOnlyOnYoutubeMusic",
-                    label: chrome.i18n.getMessage("skipNonMusicOnlyOnYoutubeMusic"),
-                }];
-            default:
-                return [];
-        }
-    }
 }
 
-export default CategorySkipOptionsComponent;
+
+function ExtraOptionComponents(props: {category: string; selectedConfigurationID: ConfigurationID}): JSX.Element {
+    const result = [];
+    for (const option of getExtraOptions(props.category)) {
+        result.push(
+            <ExtraOptionComponent
+                key={option.configKey}
+                option={option}
+                selectedConfigurationID={props.selectedConfigurationID}
+            />
+        )
+    }
+
+    return (
+    <>
+        {result}
+    </>);
+}
+
+export function ExtraOptionComponent({option, selectedConfigurationID}: {option: ToggleOption; selectedConfigurationID: ConfigurationID}): JSX.Element {
+    const [value, setValue] = React.useState(getConfigurationValue(selectedConfigurationID, option.configKey));
+    React.useEffect(() => {
+        setValue(getConfigurationValue(selectedConfigurationID, option.configKey));
+    }, [selectedConfigurationID]);
+
+    return (
+        <tr key={option.configKey} className={`${option.dontShowOnCustomConfigs && selectedConfigurationID !== null ? "hidden" : ""}`}>
+            <td id={`${option.configKey}`} className="categoryExtraOptions">
+                {
+                    option.type === "toggle" ?
+                        <ToggleOptionComponent 
+                            checked={value ?? Config.config[option.configKey]}
+                            partiallyHidden={value === null}
+                            showResetButton={value !== null && selectedConfigurationID !== null}
+                            onChange={(checked) => {
+                                updateConfigurationValue(selectedConfigurationID, option.configKey, checked, setValue);
+                            }}
+                            onReset={() => {
+                                updateConfigurationValue(selectedConfigurationID, option.configKey, null, setValue);
+                            }}
+                            label={option.label}
+                            description={option.description}
+                            style={{width: "inherit"}}
+                        />
+                    :
+                        <NumberInputOptionComponent 
+                            value={value ?? Config.config[option.configKey]}
+                            partiallyHidden={value === null}
+                            showResetButton={value !== null && selectedConfigurationID !== null}
+                            onChange={(value) => {
+                                updateConfigurationValue(selectedConfigurationID, option.configKey, value, setValue);
+                            }}
+                            onReset={() => {
+                                updateConfigurationValue(selectedConfigurationID, option.configKey, null, setValue);
+                            }}
+                            label={option.label}
+                            description={option.description}
+                            style={{width: "inherit"}}
+                        />
+                }
+            </td>
+        </tr>
+    );
+}
+
+function getExtraOptions(category: string): ToggleOption[] {
+    switch (category) {
+        case "chapter":
+            return [{
+                configKey: "renderSegmentsAsChapters",
+                label: chrome.i18n.getMessage("renderAsChapters"),
+                type: "toggle",
+                dontDisable: true,
+                dontShowOnCustomConfigs: true
+            }, {
+                configKey: "showSegmentNameInChapterBar",
+                label: chrome.i18n.getMessage("showSegmentNameInChapterBar"),
+                type: "toggle",
+                dontDisable: true,
+                dontShowOnCustomConfigs: true
+            }, {
+                configKey: "showAutogeneratedChapters",
+                label: chrome.i18n.getMessage("showAutogeneratedChapters"),
+                type: "toggle",
+                dontDisable: true
+            }];
+        case "music_offtopic":
+            return [{
+                configKey: "autoSkipOnMusicVideos",
+                label: chrome.i18n.getMessage("autoSkipOnMusicVideos"),
+                type: "toggle"
+            }, {
+                configKey: "skipNonMusicOnlyOnYoutubeMusic",
+                label: chrome.i18n.getMessage("skipNonMusicOnlyOnYoutubeMusic"),
+                type: "toggle"
+            }];
+        default:
+            return [];
+    }
+}

src/components/options/NumberInputOptionComponent.tsx

@@ -0,0 +1,52 @@
+import * as React from "react";
+import ResetIcon from "../../svg-icons/resetIcon";
+
+export interface NumberInputOptionProps { 
+    label: string;
+    description?: string;
+    disabled?: boolean;
+    style?: React.CSSProperties;
+    value: number;
+    onChange(value: number): void;
+    partiallyHidden?: boolean;
+    showResetButton?: boolean;
+    onReset?(): void;
+}
+
+export function NumberInputOptionComponent(props: NumberInputOptionProps): React.ReactElement {
+    return (
+        <div className={`sb-number-option ${props.disabled ? "disabled" : ""} ${props.partiallyHidden ? "partiallyHidden" : ""}`}>
+            <div style={props.style}>
+                <label className="number-container">
+                    <span className="optionLabel">
+                        {props.label}
+                    </span>
+                    <input id={props.label} 
+                        className="sb-number-input"
+                        type="number"
+                        step="0.1"
+                        min="0"
+                        value={props.value}
+                        disabled={props.disabled} 
+                        onChange={(e) => props.onChange(Number(e.target.value))}/>
+                </label>
+
+                {
+                    props.showResetButton &&
+                        <span className="reset-button sb-switch-label" title={chrome.i18n.getMessage("fallbackToDefault")} onClick={() => {
+                            props.onReset?.();
+                        }}>
+                            <ResetIcon/>
+                        </span>
+                }
+            </div>
+
+            {
+                props.description &&
+                    <div className="small-description">
+                        {props.description}
+                    </div>
+            }
+        </div>
+    );
+}

src/components/options/SelectOptionComponent.tsx

@@ -0,0 +1,60 @@
+import * as React from "react";
+import ResetIcon from "../../svg-icons/resetIcon";
+
+export interface SelectOption {
+    value: string;
+    label: string;
+}
+
+export interface SelectOptionComponentProps {
+    id: string;
+    onChange: (value: string) => void;
+    value: string;
+    label?: string;
+    title?: string;
+    options: SelectOption[];
+    style?: React.CSSProperties;
+    className?: string;
+    showResetButton?: boolean;
+    onReset?: () => void;
+    applyFormattingToOptions?: boolean;
+}
+
+export const SelectOptionComponent = (props: SelectOptionComponentProps) => {
+    return (
+        <div className={`sb-optionContainer ${props.className ?? ""}`} style={props.style}>
+            {
+                props.label &&
+                    <label className="sb-optionLabel" htmlFor={props.id}>
+                        {props.label}
+                    </label>
+            }
+            <select id={props.id}
+                className="sb-selector-element optionsSelector"
+                value={props.value}
+                title={props.title}
+                onChange={(e) => {
+                    props.onChange(e.target.value);
+                }}>
+                {getOptions(props.options)}
+            </select>
+
+            {
+                props.showResetButton &&
+                <div className="reset-button" onClick={() => {
+                    props.onReset?.();
+                }}>
+                    <ResetIcon/>
+                </div>
+            }
+        </div>
+    );
+};
+
+function getOptions(options: SelectOption[]): React.ReactNode[] {
+    return options.map((option) => {
+        return (
+            <option value={option.value} key={option.value}>{option.label}</option>
+        );
+    });
+}

src/components/options/ToggleOptionComponent.tsx

@@ -1,57 +1,50 @@
 import * as React from "react";
-
+import ResetIcon from "../../svg-icons/resetIcon";
-import Config from "../../config";
 
 export interface ToggleOptionProps { 
-    configKey: string;
     label: string;
+    description?: string;
     disabled?: boolean;
     style?: React.CSSProperties;
+    checked: boolean | null;
+    onChange(checked: boolean): void;
+    partiallyHidden?: boolean;
+    showResetButton?: boolean;
+    onReset?(): void;
 }
 
-export interface ToggleOptionState {
+export function ToggleOptionComponent(props: ToggleOptionProps): React.ReactElement {
-    enabled: boolean;
+    return (
-}
+        <div className={`sb-toggle-option ${props.disabled ? "disabled" : ""} ${props.partiallyHidden ? "partiallyHidden" : ""}`}>
+            <div className="switch-container" style={props.style}>
+                <label className="switch">
+                    <input id={props.label} 
+                        type="checkbox" 
+                        checked={props.checked} 
+                        disabled={props.disabled} 
+                        onChange={(e) => props.onChange(e.target.checked)}/>
+                    <span className="slider round"></span>
+                </label>
+                <label className="switch-label" htmlFor={props.label}>
+                    {props.label}
+                </label>
 
-class ToggleOptionComponent extends React.Component<ToggleOptionProps, ToggleOptionState> {
+                {
-
+                    props.showResetButton &&
-    constructor(props: ToggleOptionProps) {
+                        <div className="reset-button sb-switch-label" title={chrome.i18n.getMessage("fallbackToDefault")} onClick={() => {
-        super(props);
+                            props.onReset?.();
-
+                        }}>
-        // Setup state
+                            <ResetIcon/>
-        this.state = {
+                        </div>
-            enabled: Config.config[props.configKey]
+                }
-        }
-    }
-
-    render(): React.ReactElement {
-        return (
-            <div className={`sb-toggle-option ${this.props.disabled ? "disabled" : ""}`}>
-                <div className="switch-container" style={this.props.style}>
-                    <label className="switch">
-                        <input id={this.props.configKey} 
-                            type="checkbox" 
-                            checked={this.state.enabled} 
-                            disabled={this.props.disabled} 
-                            onChange={(e) => this.clicked(e)}/>
-                        <span className="slider round"></span>
-                    </label>
-                    <label className="switch-label" htmlFor={this.props.configKey}>
-                        {this.props.label}
-                    </label>
-                </div>
             </div>
-        );
-    }
 
-    clicked(event: React.ChangeEvent<HTMLInputElement>): void {
+            {
-        Config.config[this.props.configKey] = event.target.checked;
+                props.description &&
-
+                    <div className="small-description">
-        this.setState({
+                        {props.description}
-            enabled: event.target.checked
+                    </div>
-        });
+            }
-    }
+        </div>
-
+    );
-}
+}
-
-export default ToggleOptionComponent;

src/config.ts

@@ -11,7 +11,6 @@ interface SBConfig {
     permissions: Record<Category, Permission>;
     defaultCategory: Category;
     renderSegmentsAsChapters: boolean;
-    whitelistedChannels: string[];
     forceChannelCheck: boolean;
     minutesSaved: number;
     skipCount: number;
@@ -138,6 +137,20 @@ interface SBConfig {
 
 export type VideoDownvotes = { segments: { uuid: HashedValue; hidden: SponsorHideType }[]; lastAccess: number };
 
+export type ConfigurationID = string & { __configurationID: never };
+
+export interface CustomConfiguration {
+    name: string;
+    categorySelections: CategorySelection[];
+    showAutogeneratedChapters: boolean | null;
+    autoSkipOnMusicVideos: boolean | null;
+    skipNonMusicOnlyOnYoutubeMusic: boolean | null;
+    muteSegments: boolean | null;
+    fullVideoSegments: boolean | null;
+    manualSkipOnFullVideo: boolean | null;
+    minDuration: number | null;
+}
+
 interface SBStorage {
     /* VideoID prefixes to UUID prefixes */
     downvotedSegments: Record<VideoID & HashedValue, VideoDownvotes>;
@@ -149,6 +162,10 @@ interface SBStorage {
     /* Contains unsubmitted segments that the user has created. */
     unsubmittedSegments: Record<string, SponsorTime[]>;
 
+    channelSkipProfileIDs: Record<string, ConfigurationID>;
+    skipProfileTemp: { time: number; configID: ConfigurationID } | null;
+    skipProfiles: Record<ConfigurationID, CustomConfiguration>;
+
     skipRules: AdvancedSkipRuleSet[];
 }
 
@@ -168,7 +185,38 @@ class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
     }
 }
 
-function migrateOldSyncFormats(config: SBConfig) {
+function migrateOldSyncFormats(config: SBConfig, local: SBStorage) {
+    if (config["whitelistedChannels"]) {
+        // convert to skipProfiles
+        const whitelistedChannels = config["whitelistedChannels"] as string[];
+        const skipProfileID: ConfigurationID = "default-whitelist" as ConfigurationID;
+
+        local.skipProfiles[skipProfileID] = {
+            name: chrome.i18n.getMessage("WhitelistedChannels"),
+            categorySelections: config.categorySelections
+                .filter((s) => !["exclusive_access", "chapter"].includes(s.name))
+                .map(s => ({
+                    name: s.name,
+                    option: CategorySkipOption.ShowOverlay
+            })),
+            showAutogeneratedChapters: null,
+            autoSkipOnMusicVideos: null,
+            skipNonMusicOnlyOnYoutubeMusic: null,
+            muteSegments: null,
+            fullVideoSegments: null,
+            manualSkipOnFullVideo: null,
+            minDuration: null
+        };
+        local.skipProfiles = local.skipProfiles;
+
+        for (const channelID of whitelistedChannels) {
+            local.channelSkipProfileIDs[channelID] = skipProfileID;
+        }
+        local.channelSkipProfileIDs = local.channelSkipProfileIDs;     
+
+        chrome.storage.sync.remove("whitelistedChannels");
+    }
+
     if (!config["changeChapterColor"]) {
         config.barTypes["chapter"].color = "#ffd983";
         config["changeChapterColor"] = true;
@@ -290,7 +338,6 @@ const syncDefaults = {
     permissions: {},
     defaultCategory: "chooseACategory" as Category,
     renderSegmentsAsChapters: false,
-    whitelistedChannels: [],
     forceChannelCheck: false,
     minutesSaved: 0,
     skipCount: 0,
@@ -506,7 +553,11 @@ const localDefaults = {
     alreadyInstalled: false,
 
     unsubmittedSegments: {},
-    skipRules: []
+    skipRules: [],
+
+    channelSkipProfileIDs: {},
+    skipProfiles: {},
+    skipProfileTemp: null
 };
 
 const Config = new ConfigClass(syncDefaults, localDefaults, migrateOldSyncFormats);
@@ -529,7 +580,7 @@ export function generateDebugDetails(): string {
     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;
+    output.config.skipRules = output.config.skipRules.length;
 
     return JSON.stringify(output, null, 4);
 }

src/content.ts

@@ -3,7 +3,6 @@ import {
     ActionType,
     Category,
     CategorySkipOption,
-    ChannelIDInfo,
     ChannelIDStatus,
     ContentContainer,
     ScheduledTime,
@@ -53,6 +52,7 @@ import { defaultPreviewTime } from "./utils/constants";
 import { onVideoPage } from "../maze-utils/src/pageInfo";
 import { getSegmentsForVideo } from "./utils/segmentData";
 import { getCategoryDefaultSelection, getCategorySelection } from "./utils/skipRule";
+import { getSkipProfileBool, getSkipProfileIDForTab, hideTooShortSegments, setCurrentTabSkipProfile } from "./utils/skipProfiles";
 
 cleanPage();
 
@@ -146,7 +146,6 @@ let lastCheckVideoTime = -1;
 // To determine if a video resolution change is happening
 let firstPlay = true;
 
-//is this channel whitelised from getting sponsors skipped
 let channelWhitelisted = false;
 
 let previewBar: PreviewBar = null;
@@ -227,7 +226,9 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
                 onMobileYouTube: isOnMobileYouTube(),
                 videoID: getVideoID(),
                 loopedChapter: loopedChapter?.UUID,
-                channelWhitelisted
+                channelID: getChannelIDInfo().id,
+                channelAuthor: getChannelIDInfo().author,
+                currentTabSkipProfileID: getSkipProfileIDForTab()
             });
 
             if (!request.updating && popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
@@ -355,6 +356,10 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
                 warn: window["SBLogs"].warn
             });
             break;
+        case "setCurrentTabSkipProfile":
+            setCurrentTabSkipProfile(request.configID);
+            channelIDChange();
+            break;
     }
 
     sendResponse({});
@@ -372,7 +377,7 @@ function contentConfigUpdateListener(changes: StorageChangesObject) {
                 updateVisibilityOfPlayerControlsButton()
                 break;
             case "categorySelections":
-                sponsorsLookup(true, true);
+                channelIDChange();
                 break;
             case "barTypes":
                 setCategoryColorCSSVariables();
@@ -384,11 +389,26 @@ function contentConfigUpdateListener(changes: StorageChangesObject) {
         }
     }
 }
+function contentLocalConfigUpdateListener(changes: StorageChangesObject) {
+    for (const key in changes) {
+        switch(key) {
+            case "channelSkipProfileIDs":
+            case "skipProfiles":
+            case "skipProfileTemp":
+                channelIDChange();
+                break;
+        }
+    }
+}
 
 if (!Config.configSyncListeners.includes(contentConfigUpdateListener)) {
     Config.configSyncListeners.push(contentConfigUpdateListener);
 }
 
+if (!Config.configLocalListeners.includes(contentLocalConfigUpdateListener)) {
+    Config.configLocalListeners.push(contentLocalConfigUpdateListener);
+}
+
 function resetValues() {
     lastCheckTime = 0;
     lastCheckVideoTime = -1;
@@ -465,7 +485,8 @@ function videoIDChange(): void {
     chrome.runtime.sendMessage({
         message: "videoChanged",
         videoID: getVideoID(),
-        whitelisted: channelWhitelisted
+        channelID: getChannelIDInfo().id,
+        channelAuthor: getChannelIDInfo().author
     });
 
     sponsorsLookup();
@@ -1209,16 +1230,6 @@ async function sponsorsLookup(keepOldSubmissions = true, ignoreCache = false) {
             sponsorTimes = receivedSegments;
             existingChaptersImported = false;
 
-            // Hide all submissions smaller than the minimum duration
-            if (Config.config.minDuration !== 0) {
-                for (const segment of sponsorTimes) {
-                    const duration = segment.segment[1] - segment.segment[0];
-                    if (duration > 0 && duration < Config.config.minDuration) {
-                        segment.hidden = SponsorHideType.MinimumDuration;
-                    }
-                }
-            }
-
             if (keepOldSubmissions) {
                 for (const segment of oldSegments) {
                     const otherSegment = sponsorTimes.find((other) => segment.UUID === other.UUID);
@@ -1243,6 +1254,8 @@ async function sponsorsLookup(keepOldSubmissions = true, ignoreCache = false) {
                 }
             }
 
+            hideTooShortSegments(sponsorTimes);
+
             if (!getVideo()) {
                 //there is still no video here
                 await waitForVideo();
@@ -1275,7 +1288,9 @@ function notifyPopupOfSegments(): void {
         onMobileYouTube: isOnMobileYouTube(),
         videoID: getVideoID(),
         loopedChapter: loopedChapter?.UUID,
-        channelWhitelisted
+        channelID: getChannelIDInfo().id,
+        channelAuthor: getChannelIDInfo().author,
+        currentTabSkipProfileID: getSkipProfileIDForTab()
     });
 }
 
@@ -1303,7 +1318,7 @@ function importExistingChapters(wait: boolean) {
                     }
                 }).catch(() => { importingChaptersWaiting = false; });
 
-            if (!Config.config.showAutogeneratedChapters) {
+            if (!getSkipProfileBool("showAutogeneratedChapters")) {
                 waitFor(() => hasAutogeneratedChapters(), wait ? 15000 : 0, 400).then(() => {
                     updateActiveSegment(getCurrentTime());
                 }).catch(() => { }); // eslint-disable-line @typescript-eslint/no-empty-function
@@ -1312,6 +1327,12 @@ function importExistingChapters(wait: boolean) {
     }
 }
 
+function handleExistingChaptersChannelChange() {
+    if (existingChaptersImported && hasAutogeneratedChapters() && !getSkipProfileBool("showAutogeneratedChapters")) {
+        sponsorTimes = sponsorTimes.filter((segment) => segment.source !== SponsorSourceType.Autogenerated);
+    }
+}
+
 async function lockedCategoriesLookup(): Promise<void> {
     const hashPrefix = (await getHash(getVideoID(), 1)).slice(0, 4);
     const response = await asyncRequestToServer("GET", "/api/lockCategories/" + hashPrefix);
@@ -1377,13 +1398,6 @@ function startSkipScheduleCheckingForStartSponsors() {
             }
         }
 
-        const fullVideoSegment = sponsorTimes.filter((time) => time.actionType === ActionType.Full)[0];
-        if (fullVideoSegment) {
-            waitFor(() => categoryPill).then(() => {
-                categoryPill?.setSegment(fullVideoSegment);
-            });
-        }
-
         if (startingSegmentTime !== -1) {
             startSponsorSchedule(undefined, startingSegmentTime);
         } else {
@@ -1455,20 +1469,24 @@ function updatePreviewBar(): void {
     }
 }
 
-//checks if this channel is whitelisted, should be done only after the channelID has been loaded
+function updateCategoryPill() {
-async function channelIDChange(channelIDInfo: ChannelIDInfo) {
+    const fullVideoSegment = sponsorTimes.filter((time) => time.actionType === ActionType.Full)[0];
-    const whitelistedChannels = Config.config.whitelistedChannels;
+    if (fullVideoSegment && getSkipProfileBool("fullVideoSegments")) {
-
+        categoryPill?.setSegment(fullVideoSegment);
-    //see if this is a whitelisted channel
+    } else {
-    if (whitelistedChannels != undefined &&
+        categoryPill?.setVisibility(false);
-            channelIDInfo.status === ChannelIDStatus.Found && whitelistedChannels.includes(channelIDInfo.id)) {
-        channelWhitelisted = true;
     }
+}
 
+//checks if this channel is whitelisted, should be done only after the channelID has been loaded
+async function channelIDChange() {
     // check if the start of segments were missed
     if (Config.config.forceChannelCheck && sponsorTimes?.length > 0) startSkipScheduleCheckingForStartSponsors();
 
+    hideTooShortSegments(sponsorTimes);
+    handleExistingChaptersChannelChange();
     updatePreviewBar();
+    updateCategoryPill();
     notifyPopupOfSegments();
 }
 
@@ -1934,9 +1952,9 @@ function shouldAutoSkip(segment: SponsorTime): boolean {
         return false;
     }
 
-    return (!Config.config.manualSkipOnFullVideo || !sponsorTimes?.some((s) => s.category === segment.category && s.actionType === ActionType.Full))
+    return (!getSkipProfileBool("manualSkipOnFullVideo") || !sponsorTimes?.some((s) => s.category === segment.category && s.actionType === ActionType.Full))
         && (getCategorySelection(segment)?.option === CategorySkipOption.AutoSkip ||
-            (Config.config.autoSkipOnMusicVideos && canSkipNonMusic && sponsorTimes?.some((s) => s.category === "music_offtopic")
+            (getSkipProfileBool("autoSkipOnMusicVideos") && canSkipNonMusic && sponsorTimes?.some((s) => s.category === "music_offtopic")
                 && segment.actionType === ActionType.Skip)
             || sponsorTimesSubmitting.some((s) => s.segment === segment.segment))
         || isLoopedChapter(segment);
@@ -1945,7 +1963,7 @@ function shouldAutoSkip(segment: SponsorTime): boolean {
 function shouldSkip(segment: SponsorTime): boolean {
     return segment.hidden === SponsorHideType.Visible && (segment.actionType !== ActionType.Full
             && getCategorySelection(segment)?.option > CategorySkipOption.ShowOverlay)
-            || (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic")
+            || (getSkipProfileBool("autoSkipOnMusicVideos") && sponsorTimes?.some((s) => s.category === "music_offtopic")
                 && segment.actionType === ActionType.Skip)
             || isLoopedChapter(segment);
 }
@@ -2508,11 +2526,7 @@ async function sendSubmitMessage(): Promise<boolean> {
         sponsorTimesSubmitting = [];
 
         updatePreviewBar();
-
+        updateCategoryPill();
-        const fullVideoSegment = sponsorTimes.filter((time) => time.actionType === ActionType.Full)[0];
-        if (fullVideoSegment) {
-            categoryPill?.setSegment(fullVideoSegment);
-        }
 
         return true;
     } else {

src/js-components/previewBar.ts

@@ -15,6 +15,7 @@ import { hasAutogeneratedChapters, isVisible } from "../utils/pageUtils";
 import { isVorapisInstalled } from "../utils/compatibility";
 import { isOnYTTV } from "../../maze-utils/src/video";
 import { getCategorySelection } from "../utils/skipRule";
+import { getSkipProfileBool } from "../utils/skipProfiles";
 
 const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
 const MIN_CHAPTER_SIZE = 0.003;
@@ -185,7 +186,7 @@ class PreviewBar {
             }
 
             const hasAYouTubeChapterRemoved = this.hasYouTubeChapters
-                || (!Config.config.showAutogeneratedChapters && hasAutogeneratedChapters());
+                || (!getSkipProfileBool("showAutogeneratedChapters") && hasAutogeneratedChapters());
             if (hasAYouTubeChapterRemoved) {
                 // Hide original tooltip if some chapter has been filtered out
                 originalTooltip.style.display = "none";
@@ -461,7 +462,7 @@ class PreviewBar {
             || (!Config.config.renderSegmentsAsChapters
                 && segments.every((segment) => segment.actionType !== ActionType.Chapter
                     || [SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(segment.source))))
-            && !(hasAutogeneratedChapters() && !Config.config.showAutogeneratedChapters)) {
+            && !(hasAutogeneratedChapters() && !getSkipProfileBool("showAutogeneratedChapters"))) {
 
             if (this.customChaptersBar) this.customChaptersBar.style.display = "none";
             this.originalChapterBar.style.removeProperty("display");
@@ -488,7 +489,7 @@ class PreviewBar {
             this.chapterGroups = this.unfilteredChapterGroups;
         }
 
-        if (this.chapterGroups.length === 0 && !Config.config.showAutogeneratedChapters && hasAutogeneratedChapters()) {
+        if (this.chapterGroups.length === 0 && !getSkipProfileBool("showAutogeneratedChapters") && hasAutogeneratedChapters()) {
             // Add placeholder chapter group for whole video
             this.chapterGroups = [{
                 segment: [0, this.videoDuration],
@@ -890,7 +891,7 @@ class PreviewBar {
         if (!Config.config.showSegmentNameInChapterBar
                 || Config.config.disableSkipping
                 || ((!segments || segments.length <= 0) && submittingSegments?.length <= 0 
-                    && (Config.config.showAutogeneratedChapters || !hasAutogeneratedChapters()))) {
+                    && (getSkipProfileBool("showAutogeneratedChapters") || !hasAutogeneratedChapters()))) {
             const chaptersContainer = this.getChaptersContainer();
             if (chaptersContainer) {
                 chaptersContainer.querySelector(".sponsorChapterText")?.remove();
@@ -992,7 +993,7 @@ class PreviewBar {
                 } else {
                     this.chapterVote.setVisibility(false);
                 }
-            } else if (!Config.config.showAutogeneratedChapters && hasAutogeneratedChapters()) {
+            } else if (!getSkipProfileBool("showAutogeneratedChapters") && hasAutogeneratedChapters()) {
                 // Keep original hidden
                 chaptersContainer.querySelector(".sponsorChapterText")?.remove();
                 const chapterTitle = chaptersContainer.querySelector(".ytp-chapter-title-content") as HTMLDivElement;

src/messageTypes.ts

@@ -2,6 +2,7 @@
 // Message and Response Types
 //
 
+import { ConfigurationID } from "./config";
 import { SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "./types";
 
 interface BaseMessage {
@@ -73,7 +74,12 @@ interface KeyDownMessage {
     metaKey: boolean;
 }
 
-export type Message = BaseMessage & (DefaultMessage | BoolValueMessage | IsInfoFoundMessage | SkipMessage | SubmitVoteMessage | HideSegmentMessage | CopyToClipboardMessage | ImportSegmentsMessage | KeyDownMessage | LoopChapterMessage);
+interface SetCurrentTabSkipProfileResponse {
+    message: "setCurrentTabSkipProfile";
+    configID: ConfigurationID | null;
+}
+
+export type Message = BaseMessage & (DefaultMessage | BoolValueMessage | IsInfoFoundMessage | SkipMessage | SubmitVoteMessage | HideSegmentMessage | CopyToClipboardMessage | ImportSegmentsMessage | KeyDownMessage | LoopChapterMessage | SetCurrentTabSkipProfileResponse);
 
 export interface IsInfoFoundMessageResponse {
     found: boolean;
@@ -83,7 +89,9 @@ export interface IsInfoFoundMessageResponse {
     onMobileYouTube: boolean;
     videoID: VideoID;
     loopedChapter: SegmentUUID | null;
-    channelWhitelisted: boolean;
+    channelID: string;
+    channelAuthor: string;
+    currentTabSkipProfileID: ConfigurationID | null;
 }
 
 interface GetVideoIdResponse {
@@ -151,7 +159,8 @@ export type InfoUpdatedMessage = IsInfoFoundMessageResponse & {
 export interface VideoChangedPopupMessage {
     message: "videoChanged";
     videoID: string;
-    whitelisted: boolean;
+    channelID: string;
+    channelAuthor: string;
 }
 
 export type PopupMessage = TimeUpdateMessage | InfoUpdatedMessage | VideoChangedPopupMessage;

src/options.ts

@@ -414,7 +414,7 @@ async function shouldHideOption(element: Element): Promise<boolean> {
 /**
  * Called when the config is updated
  */
-function optionsConfigUpdateListener(changes: StorageChangesObject) {
+function optionsConfigUpdateListener() {
     const optionsContainer = document.getElementById("options");
     const optionsElements = optionsContainer.querySelectorAll("*");
 
@@ -425,12 +425,6 @@ function optionsConfigUpdateListener(changes: StorageChangesObject) {
                 break;
         }
     }
-
-    if (changes.categorySelections || changes.payments) {
-        for (const chooser of categoryChoosers) {
-            chooser.update();
-        }
-    }
 }
 
 function optionsLocalConfigUpdateListener(changes: StorageChangesObject) {

src/popup/PopupComponent.tsx

@@ -1,16 +1,17 @@
 import * as React from "react";
 import { YourWorkComponent } from "./YourWorkComponent";
-// import { ToggleOptionComponent } from "./ToggleOptionComponent";
-// import { FormattingOptionsComponent } from "./FormattingOptionsComponent";
 import { isSafari } from "../../maze-utils/src/config";
 import { showDonationLink } from "../utils/configUtils";
-import Config, { generateDebugDetails } from "../config";
+import Config, { ConfigurationID, generateDebugDetails } from "../config";
-import { GetChannelIDResponse, IsInfoFoundMessageResponse, LogResponse, Message, MessageResponse, PopupMessage } from "../messageTypes";
+import { IsInfoFoundMessageResponse, LogResponse, Message, MessageResponse, PopupMessage } from "../messageTypes";
 import { AnimationUtils } from "../../maze-utils/src/animationUtils";
 import { SegmentListComponent } from "./SegmentListComponent";
 import { ActionType, SegmentUUID, SponsorSourceType, SponsorTime } from "../types";
 import { SegmentSubmissionComponent } from "./SegmentSubmissionComponent";
 import { copyToClipboardPopup } from "./popupUtils";
+import { getSkipProfileID, getSkipProfileIDForChannel, getSkipProfileIDForTab, getSkipProfileIDForTime, getSkipProfileIDForVideo, setCurrentTabSkipProfile } from "../utils/skipProfiles";
+import { SelectOptionComponent } from "../components/options/SelectOptionComponent";
+import * as Video from "../../maze-utils/src/video";
 
 export enum LoadingStatus {
     Loading,
@@ -26,6 +27,40 @@ export interface LoadingData {
     code?: number;
 }
 
+type SkipProfileAction = "forJustThisVideo" | "forThisChannel" | "forThisTab" | "forAnHour" | null;
+interface SkipProfileOption {
+    name: SkipProfileAction;
+    active: () => boolean;
+}
+
+interface SegmentsLoadedProps {
+    setStatus: (status: LoadingData) => void;
+    setVideoID: (videoID: string | null) => void;
+    setCurrentTime: (time: number) => void;
+    setSegments: (segments: SponsorTime[]) => void;
+    setLoopedChapter: (loopedChapter: SegmentUUID | null) => void;
+}
+
+interface LoadSegmentsProps extends SegmentsLoadedProps {
+    updating: boolean;
+}
+
+interface SkipProfileRadioButtonsProps {
+    selected: SkipProfileAction;
+    setSelected: (s: SkipProfileAction, updateConfig: boolean) => void;
+
+    disabled: boolean;
+}
+
+interface SkipOptionActionComponentProps {
+    selected: boolean;
+    setSelected: (s: boolean) => void;
+    highlighted: boolean;
+    disabled: boolean;
+    overridden: boolean;
+    label: string;
+}
+
 let loadRetryCount = 0;
 
 export const PopupComponent = () => {
@@ -33,7 +68,6 @@ export const PopupComponent = () => {
         status: LoadingStatus.Loading
     });
     const [extensionEnabled, setExtensionEnabled] = React.useState(!Config.config!.disableSkipping);
-    const [channelWhitelisted, setChannelWhitelisted] = React.useState<boolean | null>(null);
     const [showForceChannelCheckWarning, setShowForceChannelCheckWarning] = React.useState(false);
     const [showNoticeButton, setShowNoticeButton] = React.useState(Config.config!.dontShowNotice);
 
@@ -47,7 +81,6 @@ export const PopupComponent = () => {
         loadSegments({
             updating: false,
             setStatus,
-            setChannelWhitelisted,
             setVideoID,
             setCurrentTime,
             setSegments,
@@ -56,7 +89,6 @@ export const PopupComponent = () => {
 
         setupComPort({
             setStatus,
-            setChannelWhitelisted,
             setVideoID,
             setCurrentTime,
             setSegments,
@@ -107,7 +139,6 @@ export const PopupComponent = () => {
                     loadSegments({
                         updating: true,
                         setStatus,
-                        setChannelWhitelisted,
                         setVideoID,
                         setCurrentTime,
                         setSegments,
@@ -129,54 +160,10 @@ export const PopupComponent = () => {
 
             {/* Toggle Box */}
             <div className="sbControlsMenu">
-                {/* github: mbledkowski/toggle-switch */}
+                <SkipProfileButton
-                {channelWhitelisted !== null && (
+                    videoID={videoID}
-                    <label id="whitelistButton" htmlFor="whitelistToggle" className="toggleSwitchContainer sbControlsMenu-item" role="button" tabIndex={0}>
+                    setShowForceChannelCheckWarning={setShowForceChannelCheckWarning}
-                        <input type="checkbox" 
+                />
-                            style={{ "display": "none" }} 
-                            id="whitelistToggle" 
-                            checked={channelWhitelisted}
-                            onChange={async (e) => {
-                                const response = await sendMessage({ message: 'getChannelID' }) as GetChannelIDResponse;
-                                if (!response.channelID) {
-                                    if (response.isYTTV) {
-                                        alert(chrome.i18n.getMessage("yttvNoChannelWhitelist"));
-                                    } else {
-                                        alert(chrome.i18n.getMessage("channelDataNotFound") + " https://github.com/ajayyy/SponsorBlock/issues/753");
-                                    }
-
-                                    return;
-                                }
-
-                                const whitelistedChannels = Config.config.whitelistedChannels ?? [];
-                                if (e.target.checked) {
-                                    whitelistedChannels.splice(whitelistedChannels.indexOf(response.channelID), 1);
-                                } else {
-                                    whitelistedChannels.push(response.channelID);
-                                }
-                                Config.config.whitelistedChannels = whitelistedChannels;
-
-                                setChannelWhitelisted(!e.target.checked);
-                                if (!Config.config.forceChannelCheck) setShowForceChannelCheckWarning(true);
-
-                                // Send a message to the client
-                                sendMessage({
-                                    message: 'whitelistChange',
-                                    value: !e.target.checked
-                                });
-
-                            }}/>
-                        <svg viewBox="0 0 24 24" width="23" height="23" className={"SBWhitelistIcon sbControlsMenu-itemIcon " + (channelWhitelisted ? " rotated" : "")}>
-                            <path d="M24 10H14V0h-4v10H0v4h10v10h4V14h10z" />
-                        </svg>
-                        <span id="whitelistChannel" className={channelWhitelisted ? " hidden" : ""}>
-                            {chrome.i18n.getMessage("whitelistChannel")}
-                        </span>
-                        <span id="unwhitelistChannel" className={!channelWhitelisted ? " hidden" : ""}>
-                            {chrome.i18n.getMessage("removeFromWhitelist")}
-                        </span>
-                    </label>
-                )}
                 <label id="disableExtension" htmlFor="toggleSwitch" className="toggleSwitchContainer sbControlsMenu-item" role="button" tabIndex={0}>
                     <span className="toggleSwitchContainer-switch">
                         <input type="checkbox" 
@@ -310,19 +297,6 @@ function getVideoStatusText(status: LoadingData): string {
     }
 }
 
-interface SegmentsLoadedProps {
-    setStatus: (status: LoadingData) => void;
-    setChannelWhitelisted: (whitelisted: boolean | null) => void;
-    setVideoID: (videoID: string | null) => void;
-    setCurrentTime: (time: number) => void;
-    setSegments: (segments: SponsorTime[]) => void;
-    setLoopedChapter: (loopedChapter: SegmentUUID | null) => void;
-}
-
-interface LoadSegmentsProps extends SegmentsLoadedProps {
-    updating: boolean;
-}
-
 async function loadSegments(props: LoadSegmentsProps): Promise<void> {
     const response = await sendMessage({ message: "isInfoFound", updating: props.updating }) as IsInfoFoundMessageResponse;
 
@@ -367,8 +341,10 @@ function segmentsLoaded(response: IsInfoFoundMessageResponse, props: SegmentsLoa
 
     
     props.setVideoID(response.videoID);
+    Video.setVideoID(response.videoID as Video.VideoID);
     props.setCurrentTime(response.time);
-    props.setChannelWhitelisted(response.channelWhitelisted);
+    Video.setChanelIDInfo(response.channelID, response.channelAuthor);
+    setCurrentTabSkipProfile(response.currentTabSkipProfileID);
     props.setSegments((response.sponsorTimes || [])
         .filter((segment) => segment.source === SponsorSourceType.Server)
         .sort((a, b) => b.segment[1] - a.segment[1])
@@ -390,16 +366,13 @@ function sendMessage(request: Message): Promise<MessageResponse> {
     });
 }
 
-interface ComPortProps extends SegmentsLoadedProps {
+function setupComPort(props: SegmentsLoadedProps): void {
-}
-
-function setupComPort(props: ComPortProps): void {
     const port = chrome.runtime.connect({ name: "popup" });
     port.onDisconnect.addListener(() => setupComPort(props));
     port.onMessage.addListener((msg) => onMessage(props, msg));
 }
 
-function onMessage(props: ComPortProps, msg: PopupMessage) {
+function onMessage(props: SegmentsLoadedProps, msg: PopupMessage) {
     switch (msg.message) {
         case "time":
             props.setCurrentTime(msg.time);
@@ -412,7 +385,8 @@ function onMessage(props: ComPortProps, msg: PopupMessage) {
                 status: LoadingStatus.StillLoading
             });
             props.setVideoID(msg.videoID);
-            props.setChannelWhitelisted(msg.whitelisted);
+            Video.setVideoID(msg.videoID as Video.VideoID);
+            Video.setChanelIDInfo(msg.channelID, msg.channelAuthor);
             props.setSegments([]);
             break;
     }
@@ -457,4 +431,259 @@ window.addEventListener("message", async (e): Promise<void> => {
         style.textContent = e.data.css;
         document.head.appendChild(style);
     }
-});
+});
+
+function SkipProfileButton(props: {videoID: string; setShowForceChannelCheckWarning: (v: boolean) => void}): JSX.Element {
+    const [menuOpen, setMenuOpen] = React.useState(false);
+    const skipProfileSet = getSkipProfileIDForChannel() !== null;
+
+    return (
+        <>
+            <label id="skipProfileButton" 
+                    htmlFor="skipProfileToggle"
+                    className="toggleSwitchContainer sbControlsMenu-item"
+                    role="button"
+                    tabIndex={0}
+                    onClick={() => {
+                        if (menuOpen && !Config.config.forceChannelCheck && getSkipProfileID() !== null) {
+                            props.setShowForceChannelCheckWarning(true);
+                        }
+
+                        setMenuOpen(!menuOpen);
+                    }}>
+                <svg viewBox="0 0 24 24" width="23" height="23" className={"SBWhitelistIcon sbControlsMenu-itemIcon " + (menuOpen ? " rotated" : "")}>
+                    <path d="M24 10H14V0h-4v10H0v4h10v10h4V14h10z" />
+                </svg>
+                <span id="whitelistChannel" className={(menuOpen || skipProfileSet) ? " hidden" : ""}>
+                    {chrome.i18n.getMessage("addChannelToSkipProfile")}
+                </span>
+                <span id="whitelistChannel" className={(menuOpen || !skipProfileSet) ? " hidden" : ""}>
+                    {chrome.i18n.getMessage("editChannelsSkipProfile")}
+                </span>
+                <span id="unwhitelistChannel" className={!menuOpen ? " hidden" : ""}>
+                    {chrome.i18n.getMessage("closeSkipProfileMenu")}
+                </span>
+            </label>
+
+            {
+                props.videoID &&
+                <SkipProfileMenu open={menuOpen} />
+            }
+        </>
+    );
+}
+
+const skipProfileOptions: SkipProfileOption[] = [{
+        name: "forAnHour",
+        active: () => getSkipProfileIDForTime() !== null
+    }, {
+        name: "forThisTab",
+        active: () => getSkipProfileIDForTab() !== null
+    }, {
+        name: "forJustThisVideo",
+        active: () => getSkipProfileIDForVideo() !== null
+    }, {
+        name: "forThisChannel",
+        active: () => getSkipProfileIDForChannel() !== null
+    }];
+
+function SkipProfileMenu(props: {open: boolean}): JSX.Element {
+    const [configID, setConfigID] = React.useState<ConfigurationID | null>(null);
+    const [selectedSkipProfileAction, setSelectedSkipProfileAction] = React.useState<SkipProfileAction>(null);
+    const [allSkipProfiles, setAllSkipProfiles] = React.useState(Object.entries(Config.local!.skipProfiles));
+
+    React.useEffect(() => {
+        if (props.open) {
+            const channelInfo = Video.getChannelIDInfo();
+            if (!channelInfo) {
+                if (Video.isOnYTTV()) {
+                    alert(chrome.i18n.getMessage("yttvNoChannelWhitelist"));
+                } else {
+                    alert(chrome.i18n.getMessage("channelDataNotFound") + " https://github.com/ajayyy/SponsorBlock/issues/753");
+                }
+            }
+
+            setConfigID(getSkipProfileID());
+        }
+    }, [props.open]);
+
+    React.useEffect(() => {
+        Config.configLocalListeners.push(() => {
+            setAllSkipProfiles(Object.entries(Config.local!.skipProfiles));
+        });
+    }, []);
+
+    return (
+        <div id="skipProfileMenu" className={`${!props.open ? " hidden" : ""}`}
+            aria-label={chrome.i18n.getMessage("SkipProfileMenu")}>
+            <div style={{position: "relative"}}>
+                <SelectOptionComponent
+                    id="sbSkipProfileSelection"
+                    title={chrome.i18n.getMessage("SelectASkipProfile")}
+                    onChange={(value) => {
+                        if (value === "new") {
+                            chrome.runtime.sendMessage({ message: "openConfig", hash: "newProfile" });
+                            return;
+                        }
+                        
+                        const configID = value === "null" ? null : value as ConfigurationID;
+                        setConfigID(configID);
+                        if (configID === null) {
+                            setSelectedSkipProfileAction(null);
+                        }
+
+                        if (selectedSkipProfileAction) {
+                            updateSkipProfileSetting(selectedSkipProfileAction, configID);
+
+                            if (configID === null) {
+                                for (const option of skipProfileOptions) {
+                                    if (option.name !== selectedSkipProfileAction && option.active()) {
+                                        updateSkipProfileSetting(option.name, null);
+                                    }
+                                }
+                            }
+                        }
+                    }}
+                    value={configID ?? "null"}
+                    options={[{
+                        value: "null",
+                        label: chrome.i18n.getMessage("DefaultConfiguration")
+                    }].concat(allSkipProfiles.map(([key, value]) => ({
+                        value: key,
+                        label: value.name
+                    }))).concat([{
+                        value: "new",
+                        label: chrome.i18n.getMessage("CreateNewConfiguration")
+                    }])}
+                />
+
+                <SkipProfileRadioButtons
+                    selected={selectedSkipProfileAction}
+                    setSelected={(s, updateConfig) => {
+                        if (updateConfig) {
+                            if (s === null) {
+                                updateSkipProfileSetting(selectedSkipProfileAction, null);
+                            } else {
+                                updateSkipProfileSetting(s, configID);
+                            }
+                        } else if (s !== null) {
+                            setConfigID(getSkipProfileID());
+                        }
+
+                        setSelectedSkipProfileAction(s);
+                    }}
+                    disabled={configID === null}
+                />
+            </div>
+        </div>
+    );
+}
+
+function SkipProfileRadioButtons(props: SkipProfileRadioButtonsProps): JSX.Element {
+    const result: JSX.Element[] = [];
+
+    React.useEffect(() => {
+        if (props.selected === null) {
+            for (const option of skipProfileOptions) {
+                if (option.active()) {
+                    props.setSelected(option.name, false);
+                    return;
+                }
+            }
+        }
+    }, [props.selected]);
+
+    let alreadySelected = false;
+    for (const option of skipProfileOptions) {
+        const highlighted = option.active() && props.selected !== option.name;
+        const overridden = !highlighted && alreadySelected;
+        result.push(
+            <SkipOptionActionComponent
+                highlighted={highlighted}
+                label={chrome.i18n.getMessage(`skipProfile_${option.name}`)}
+                selected={props.selected === option.name}
+                overridden={overridden}
+                disabled={props.disabled || overridden}
+                key={option.name}
+                setSelected={(s) => {
+                    props.setSelected(s ? option.name : null, true);
+                }}/>
+        );
+
+        if (props.selected === option.name) {
+            alreadySelected = true;
+        }
+    }
+
+    return <div id="skipProfileActions">
+        {result}
+    </div>
+}
+
+function SkipOptionActionComponent(props: SkipOptionActionComponentProps): JSX.Element {
+    let title = "";
+    if (props.selected) {
+        title = chrome.i18n.getMessage("clickToNotApplyThisProfile");
+    } else if ((props.highlighted && !props.disabled) || props.overridden) {
+        title = chrome.i18n.getMessage("skipProfileBeingOverriddenByHigherPriority");
+    } else if (!props.highlighted && !props.disabled) {
+        title = chrome.i18n.getMessage("clickToApplyThisProfile");
+    } else if (props.disabled) {
+        title = chrome.i18n.getMessage("selectASkipProfileFirst");
+    }
+
+    return (
+        <div className={`skipOptionAction ${props.selected ? "selected" : ""} ${props.highlighted ? "highlighted" : ""} ${props.disabled ? "disabled" : ""}`}
+            title={title}
+            role="button"
+            tabIndex={0}
+            aria-pressed={props.selected}
+            onClick={() => {
+                // Need to uncheck or disable a higher priority option first
+                if (!props.disabled && !props.highlighted) {
+                    props.setSelected(!props.selected);
+                }
+            }}>
+            {props.label}
+        </div>
+    );
+}
+
+function updateSkipProfileSetting(action: SkipProfileAction, configID: ConfigurationID | null) {
+    switch (action) {
+        case "forAnHour":
+            Config.local!.skipProfileTemp = configID ? { time: Date.now(), configID } : null;
+            break;
+        case "forThisTab":
+            setCurrentTabSkipProfile(configID);
+
+            sendMessage({
+                message: "setCurrentTabSkipProfile",
+                configID
+            });
+            break;
+        case "forJustThisVideo":
+            if (configID) {
+                Config.local!.channelSkipProfileIDs[Video.getVideoID()!] = configID;
+            } else {
+                delete Config.local!.channelSkipProfileIDs[Video.getVideoID()!];
+            }
+
+            Config.forceLocalUpdate("channelSkipProfileIDs");
+            break;
+        case "forThisChannel": {
+            const channelInfo = Video.getChannelIDInfo();
+
+            if (configID) {
+                Config.local!.channelSkipProfileIDs[channelInfo.id] = configID;
+                delete Config.local!.channelSkipProfileIDs[channelInfo.author];
+            } else {
+                delete Config.local!.channelSkipProfileIDs[channelInfo.id];
+                delete Config.local!.channelSkipProfileIDs[channelInfo.author];
+            }
+
+            Config.forceLocalUpdate("channelSkipProfileIDs");
+            break;
+        }
+    }
+}

src/render/CategoryChooser.tsx

@@ -1,24 +1,16 @@
 import * as React from "react";
 import { createRoot } from 'react-dom/client';
 
-import CategoryChooserComponent from "../components/options/CategoryChooserComponent";
+import { CategoryChooserComponent } from "../components/options/CategoryChooserComponent";
 
 class CategoryChooser {
 
-    ref: React.RefObject<CategoryChooserComponent>;
-
     constructor(element: Element) {
-        this.ref = React.createRef();
-
         const root = createRoot(element);
         root.render(
-            <CategoryChooserComponent ref={this.ref} />
+            <CategoryChooserComponent />
         );
     }
-
-    update(): void {
-        this.ref.current?.forceUpdate();
-    }
 }
 
 export default CategoryChooser;

src/render/CategoryPill.tsx

@@ -121,7 +121,7 @@ export class CategoryPill {
     async setSegment(segment: SponsorTime): Promise<void> {
         await waitFor(() => this.ref.current);
 
-        if (this.ref.current?.state?.segment !== segment) {
+        if (this.ref.current?.state?.segment !== segment || !this.ref.current?.state?.show) {
             const newState = {
                 segment,
                 show: true,

src/svg-icons/resetIcon.tsx

@@ -0,0 +1,32 @@
+import * as React from "react";
+
+export interface AddIconProps {
+  style?: React.CSSProperties;
+  className?: string;
+  onClick?: () => void;
+}
+
+const ResetIcon = ({
+  className = "",
+  style = {},
+  onClick
+}: AddIconProps): JSX.Element => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+    className={className}
+    style={style}
+    onClick={onClick} >
+    <path
+      d="M 23.993883,23.993883 H 0.006117 V 0.006117 h 23.987766 z"
+      fill="none"
+      id="path2"
+      style={{strokeWidth: 0.99949}} />
+    <path
+      d="m 3.508834,3.5213414 c -2.1778668,2.1778667 -3.52964574,5.1668007 -3.52964574,8.4861686 0,6.638738 5.37707764,12.000795 12.01581474,12.000795 6.638737,0 12.015814,-5.362057 12.015814,-12.000795 0,-5.6023732 -3.830041,-10.273521 -9.011861,-11.61028034 V 3.5213414 c 3.499607,1.2316209 6.007907,4.5660093 6.007907,8.4861686 0,4.971544 -4.040317,9.011861 -9.01186,9.011861 -4.9715438,0 -9.0118611,-4.040317 -9.0118611,-9.011861 0,-2.4932821 1.0363647,-4.7162068 2.6735186,-6.3383421 L 10.493026,10.505534 V -0.00830443 H -0.02081174 Z"
+      id="path4"
+      style={{strokeWidth: 1.50198}} />
+  </svg>
+);
+
+export default ResetIcon;

src/types.ts

@@ -30,6 +30,7 @@ export interface VideoDurationResponse {
 }
 
 export enum CategorySkipOption {
+    FallbackToDefault = -2,
     Disabled = -1,
     ShowOverlay,
     ManualSkip,

src/utils/pageUtils.ts

@@ -1,6 +1,6 @@
 import { ActionType, Category, SponsorSourceType, SponsorTime, VideoID } from "../types";
 import { getFormattedTimeToSeconds } from "../../maze-utils/src/formating";
-import Config from "../config";
+import { getSkipProfileBool } from "./skipProfiles";
 
 export function getControls(): HTMLElement {
     const controlsSelectors = [
@@ -70,7 +70,7 @@ export function getExistingChapters(currentVideoID: VideoID, duration: number):
     if (title?.textContent?.includes("Key moment")) return [];
 
     const autogenerated = hasAutogeneratedChapters();
-    if (!Config.config.showAutogeneratedChapters && autogenerated) return [];
+    if (!getSkipProfileBool("showAutogeneratedChapters") && autogenerated) return [];
 
     const chapters: SponsorTime[] = [];
     // .ytp-timed-markers-container indicates that key-moments are present, which should not be divided

src/utils/segmentData.ts

@@ -2,7 +2,7 @@ import { DataCache } from "../../maze-utils/src/cache";
 import { getHash, HashedValue } from "../../maze-utils/src/hash";
 import Config, {  } from "../config";
 import * as CompileConfig from "../../config.json";
-import { ActionType, ActionTypes, SponsorSourceType, SponsorTime, VideoID } from "../types";
+import { ActionTypes, SponsorSourceType, SponsorTime, VideoID } from "../types";
 import { getHashParams } from "./pageUtils";
 import { asyncRequestToServer } from "./requests";
 import { extensionUserAgent } from "../../maze-utils/src";
@@ -60,12 +60,9 @@ async function fetchSegmentsForVideo(videoID: VideoID): Promise<SegmentResponse>
     });
 
     if (response.ok) {
-        const enabledActionTypes = getEnabledActionTypes();
-
         const receivedSegments: SponsorTime[] = JSON.parse(response.responseText)
                     ?.filter((video) => video.videoID === videoID)
                     ?.map((video) => video.segments)?.[0]
-                    ?.filter((segment) => enabledActionTypes.includes(segment.actionType))
                     ?.map((segment) => ({
                         ...segment,
                         source: SponsorSourceType.Server
@@ -90,16 +87,4 @@ async function fetchSegmentsForVideo(videoID: VideoID): Promise<SegmentResponse>
         segments: null,
         status: response.status
     };
-}
-
-function getEnabledActionTypes(forceFullVideo = false): ActionType[] {
-    const actionTypes = [ActionType.Skip, ActionType.Poi, ActionType.Chapter];
-    if (Config.config.muteSegments) {
-        actionTypes.push(ActionType.Mute);
-    }
-    if (Config.config.fullVideoSegments || forceFullVideo) {
-        actionTypes.push(ActionType.Full);
-    }
-
-    return actionTypes;
 }

src/utils/skipProfiles.ts

@@ -0,0 +1,97 @@
+import { getChannelIDInfo, getVideoID } from "../../maze-utils/src/video";
+import Config, { ConfigurationID, CustomConfiguration } from "../config";
+import { SponsorHideType, SponsorTime } from "../types";
+
+let currentTabSkipProfile: ConfigurationID = null;
+
+export function getSkipProfileIDForTime(): ConfigurationID | null {
+    if (Config.local.skipProfileTemp !== null && Config.local.skipProfileTemp.time > Date.now() - 60 * 60 * 1000) {
+        return Config.local.skipProfileTemp.configID;
+    } else {
+        return null;
+    }
+}
+
+export function getSkipProfileIDForTab(): ConfigurationID | null {
+    return currentTabSkipProfile;
+}
+
+export function setCurrentTabSkipProfile(configID: ConfigurationID | null) {
+    currentTabSkipProfile = configID ?? null;
+}
+
+export function getSkipProfileIDForVideo(): ConfigurationID | null {
+    return Config.local.channelSkipProfileIDs[getVideoID()] ?? null;
+}
+
+export function getSkipProfileIDForChannel(): ConfigurationID | null {
+    const channelInfo = getChannelIDInfo();
+
+    if (!channelInfo) {
+        return null;
+    }
+
+    return Config.local.channelSkipProfileIDs[channelInfo.id]
+        ?? Config.local.channelSkipProfileIDs[channelInfo.author]
+       ?? null;
+}
+
+export function getSkipProfileID(): ConfigurationID | null {
+    const configID =
+        getSkipProfileIDForTime()
+        ?? getSkipProfileIDForTab()
+        ?? getSkipProfileIDForVideo()
+        ?? getSkipProfileIDForChannel();
+    
+    return configID ?? null;
+}
+
+export function getSkipProfile(): CustomConfiguration | null {
+    const configID = getSkipProfileID();
+    
+    if (configID) {
+        return Config.local.skipProfiles[configID];
+    }
+
+    return null;
+}
+
+type SkipProfileBoolKey =
+    "showAutogeneratedChapters"
+    | "autoSkipOnMusicVideos"
+    | "skipNonMusicOnlyOnYoutubeMusic"
+    | "muteSegments"
+    | "fullVideoSegments"
+    | "manualSkipOnFullVideo";
+
+export function getSkipProfileBool(key: SkipProfileBoolKey): boolean {
+    return getSkipProfileValue<boolean>(key);
+}
+
+export function getSkipProfileNum(key: "minDuration"): number {
+    return getSkipProfileValue<number>(key);
+}
+
+function getSkipProfileValue<T>(key: keyof CustomConfiguration): T {
+    const profile = getSkipProfile();
+    if (profile && profile[key] !== undefined) {
+        return profile[key] as T;
+    }
+
+    return Config.config[key];
+}
+
+export function hideTooShortSegments(sponsorTimes: SponsorTime[]) {
+    const minDuration = getSkipProfileNum("minDuration");
+
+    if (minDuration !== 0) {
+        for (const segment of sponsorTimes) {
+            const duration = segment.segment[1] - segment.segment[0];
+            if (duration > 0 && duration < minDuration && (segment.hidden === SponsorHideType.Visible || SponsorHideType.MinimumDuration)) {
+                segment.hidden = SponsorHideType.MinimumDuration;
+            } else if (segment.hidden === SponsorHideType.MinimumDuration) {
+                segment.hidden = SponsorHideType.Visible;
+            }
+        }
+    }
+}

src/utils/skipRule.ts

@@ -2,6 +2,7 @@ import { getCurrentPageTitle } from "../../maze-utils/src/elements";
 import { getChannelIDInfo, getVideoDuration } from "../../maze-utils/src/video";
 import Config from "../config";
 import { CategorySelection, CategorySkipOption, SponsorSourceType, SponsorTime } from "../types";
+import { getSkipProfile, getSkipProfileBool } from "./skipProfiles";
 import { VideoLabelsCacheData } from "./videoLabels";
 
 export interface Permission {
@@ -53,12 +54,28 @@ export interface AdvancedSkipRuleSet {
 }
 
 export function getCategorySelection(segment: SponsorTime | VideoLabelsCacheData): CategorySelection {
+    // First check skip rules
     for (const ruleSet of Config.local.skipRules) {
         if (ruleSet.rules.every((rule) => isSkipRulePassing(segment, rule))) {
             return { name: segment.category, option: ruleSet.skipOption } as CategorySelection;
         }
     }
 
+    // Action type filters
+    if ("actionType" in segment && (segment as SponsorTime).actionType === "mute" && !getSkipProfileBool("muteSegments")) {
+        return { name: segment.category, option: CategorySkipOption.Disabled } as CategorySelection;
+    }
+
+    // Then check skip profile
+    const profile = getSkipProfile();
+    if (profile) {
+        const profileSelection = profile.categorySelections.find(selection => selection.name === segment.category);
+        if (profileSelection) {
+            return profileSelection;
+        }
+    }
+
+    // Then fallback to default
     for (const selection of Config.config.categorySelections) {
         if (selection.name === segment.category) {
             return selection;