diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx index 8a96bede..f3627f06 100644 --- a/src/components/SkipNoticeComponent.tsx +++ b/src/components/SkipNoticeComponent.tsx @@ -116,6 +116,9 @@ class SkipNoticeComponent extends React.Component Config.config.skipNoticeDuration; + // Setup state this.state = { noticeTitle, @@ -123,8 +126,8 @@ class SkipNoticeComponent extends React.Component Config.config.skipNoticeDuration, - countdownTime: Config.config.skipNoticeDuration, + maxCountdownTime, + countdownTime: maxCountdownTime(), countdownText: null, skipButtonState: this.props.startReskip @@ -621,12 +624,8 @@ class SkipNoticeComponent extends React.Component { - const sponsorTime = this.segments[index]; - const duration = Math.round((sponsorTime.segment[1] - this.contentContainer().v.currentTime) * (1 / this.contentContainer().v.playbackRate)); - - return Math.max(duration, Config.config.skipNoticeDuration); - } : this.state.maxCountdownTime; + const maxCountdownTime = changeCountdown ? + this.getFullDurationCountdown(index) : this.state.maxCountdownTime; return { skipButtonState: skipButtonState, @@ -637,6 +636,15 @@ class SkipNoticeComponent extends React.Component number { + return () => { + const sponsorTime = this.segments[index]; + const duration = Math.round((sponsorTime.segment[1] - this.contentContainer().v.currentTime) * (1 / this.contentContainer().v.playbackRate)); + + return Math.max(duration, Config.config.skipNoticeDuration); + }; + } + afterVote(segment: SponsorTime, type: number, category: Category): void { const index = utils.getSponsorIndexFromUUID(this.segments, segment.UUID); const wikiLinkText = CompileConfig.wikiLinks[segment.category];