external/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2024-09-20 04:53:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix video labels showing all categories regardless of settings

Browse source
This commit is contained in:
Ajay 2023-04-17 20:29:52 -04:00
parent 8136a53981
commit a7aa4042ff
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/types.ts
View file

@ -31,6 +31,7 @@ export interface VideoDurationResponse {
}
export enum CategorySkipOption {
Disabled = -1,
ShowOverlay,
ManualSkip,
AutoSkip

4
src/utils.ts
View file

@ -1,5 +1,5 @@
import Config, { VideoDownvotes } from "./config";
import { CategorySelection, SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType } from "./types";
import { CategorySelection, SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType, CategorySkipOption } from "./types";
import { getHash, HashedValue } from "@ajayyy/maze-utils/lib/hash";
import * as CompileConfig from "../config.json";
@ -225,7 +225,7 @@ export default class Utils {
return selection;
}
}
return { name: "None", option: 0} as CategorySelection;
return { name: category, option: CategorySkipOption.Disabled} as CategorySelection;
}
/**

9
src/utils/videoLabels.ts
View file

@ -1,4 +1,4 @@
import { Category, VideoID } from "../types";
import { Category, CategorySkipOption, VideoID } from "../types";
import { getHash } from "@ajayyy/maze-utils/lib/hash";
import Utils from "../utils";
import { logWarn } from "./logger";
@ -58,7 +58,12 @@ export async function getVideoLabel(videoID: VideoID): Promise<Category | null>
const result = await getLabelHashBlock(prefix);
if (result) {
return result.videos[videoID] ?? null;
const category = result.videos[videoID];
if (category && utils.getCategorySelection(category).option !== CategorySkipOption.Disabled) {
return category;
} else {
return null;
}
}
return null;