mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-06 19:47:04 +03:00
Don't auto skip on music videos if non music category disabled
This commit is contained in:
@@ -1959,7 +1959,8 @@ function shouldAutoSkip(segment: SponsorTime): boolean {
|
|||||||
|
|
||||||
return (!getSkipProfileBool("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 ||
|
&& (getCategorySelection(segment)?.option === CategorySkipOption.AutoSkip ||
|
||||||
(getSkipProfileBool("autoSkipOnMusicVideos") && canSkipNonMusic && sponsorTimes?.some((s) => s.category === "music_offtopic")
|
(getSkipProfileBool("autoSkipOnMusicVideos") && canSkipNonMusic
|
||||||
|
&& sponsorTimes?.some((s) => s.category === "music_offtopic" && getCategorySelection(segment)?.option === CategorySkipOption.AutoSkip)
|
||||||
&& segment.actionType === ActionType.Skip)
|
&& segment.actionType === ActionType.Skip)
|
||||||
|| sponsorTimesSubmitting.some((s) => s.segment === segment.segment))
|
|| sponsorTimesSubmitting.some((s) => s.segment === segment.segment))
|
||||||
|| isLoopedChapter(segment);
|
|| isLoopedChapter(segment);
|
||||||
@@ -1968,7 +1969,8 @@ function shouldAutoSkip(segment: SponsorTime): boolean {
|
|||||||
function shouldSkip(segment: SponsorTime): boolean {
|
function shouldSkip(segment: SponsorTime): boolean {
|
||||||
return segment.hidden === SponsorHideType.Visible && (segment.actionType !== ActionType.Full
|
return segment.hidden === SponsorHideType.Visible && (segment.actionType !== ActionType.Full
|
||||||
&& getCategorySelection(segment)?.option > CategorySkipOption.ShowOverlay)
|
&& getCategorySelection(segment)?.option > CategorySkipOption.ShowOverlay)
|
||||||
|| (getSkipProfileBool("autoSkipOnMusicVideos") && sponsorTimes?.some((s) => s.category === "music_offtopic")
|
|| (getSkipProfileBool("autoSkipOnMusicVideos")
|
||||||
|
&& sponsorTimes?.some((s) => s.category === "music_offtopic" && getCategorySelection(segment)?.option === CategorySkipOption.AutoSkip)
|
||||||
&& segment.actionType === ActionType.Skip)
|
&& segment.actionType === ActionType.Skip)
|
||||||
|| isLoopedChapter(segment);
|
|| isLoopedChapter(segment);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user