Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-07 20:17:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed heigt of 2nd notice. Minor changes. Upvoting lets downvoted segment reappear

Browse Source
This commit is contained in:
FlorianZahn
2021-10-10 00:41:21 +02:00
parent 844567dcdf
commit a9cc43c586
2 changed files with 32 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/content.css
View File

@@ -217,7 +217,7 @@
/* if two are very close to eachother */ /* if two are very close to eachother */
.secondSkipNotice { .secondSkipNotice {
bottom: 250px; bottom: 290px;
} }
.noticeLeftIcon { .noticeLeftIcon {

100
src/components/SkipNoticeComponent.tsx
View File

@@ -235,10 +235,10 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
className="voteButton" className="voteButton"
style={{marginLeft: "5px"}} style={{marginLeft: "5px"}}
onClick={() => this.openEditingOptions()}> onClick={() => this.openEditingOptions()}>
<PencilSvg fill={(this.state.editing === true || <PencilSvg fill={this.state.editing === true
this.state.actionState === SkipNoticeAction.CopyDownvote || || this.state.actionState === SkipNoticeAction.CopyDownvote
this.state.choosingCategory === true) || this.state.choosingCategory === true
? this.selectedColor : this.unselectedColor} /> ? this.selectedColor : this.unselectedColor} />
</div> </div>
</td> </td>
@@ -257,7 +257,10 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
<button id={"sponsorTimesContinueVotingContainer" + this.idSuffix} <button id={"sponsorTimesContinueVotingContainer" + this.idSuffix}
className="sponsorSkipObject sponsorSkipNoticeButton" className="sponsorSkipObject sponsorSkipNoticeButton"
title={"Continue Voting"} title={"Continue Voting"}
onClick={() => this.resetStateToStart()}> onClick={() => this.setState({
thanksForVotingText: null,
messages: []
})}>
{chrome.i18n.getMessage("ContinueVoting")} {chrome.i18n.getMessage("ContinueVoting")}
</button> </button>
</td> </td>
@@ -279,7 +282,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
</tr>), </tr>),
/* Edit Segments Row */ /* Edit Segments Row */
(this.state.editing && (this.state.editing && !this.state.thanksForVotingText && !(this.state.choosingCategory || this.state.actionState === SkipNoticeAction.CopyDownvote) &&
<tr id={"sponsorSkipNoticeEditSegmentsRow" + this.idSuffix} <tr id={"sponsorSkipNoticeEditSegmentsRow" + this.idSuffix}
key={2}> key={2}>
<td id={"sponsorTimesEditSegmentsContainer" + this.idSuffix}> <td id={"sponsorTimesEditSegmentsContainer" + this.idSuffix}>
@@ -287,7 +290,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
{/* Copy Segment */} {/* Copy Segment */}
<button className="sponsorSkipObject sponsorSkipNoticeButton" <button className="sponsorSkipObject sponsorSkipNoticeButton"
title={chrome.i18n.getMessage("CopyDownvoteButtonInfo")} title={chrome.i18n.getMessage("CopyDownvoteButtonInfo")}
style={{color: (this.state.actionState === SkipNoticeAction.CopyDownvote && this.state.editing == true) ? this.selectedColor : this.unselectedColor}} //style={{color: (this.state.actionState === SkipNoticeAction.CopyDownvote && this.state.editing == true) ? this.selectedColor : this.unselectedColor}}
//style={{color: (this.state.editing == true) ? this.selectedColor : this.unselectedColor}}
onClick={() => this.prepAction(SkipNoticeAction.CopyDownvote)}> onClick={() => this.prepAction(SkipNoticeAction.CopyDownvote)}>
{chrome.i18n.getMessage("CopyAndDownvote")} {chrome.i18n.getMessage("CopyAndDownvote")}
</button> </button>
@@ -296,16 +300,15 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
<button className="sponsorSkipObject sponsorSkipNoticeButton" <button className="sponsorSkipObject sponsorSkipNoticeButton"
title={chrome.i18n.getMessage("ChangeCategoryTooltip")} title={chrome.i18n.getMessage("ChangeCategoryTooltip")}
style={{color: (this.state.actionState === SkipNoticeAction.CategoryVote && this.state.editing == true) ? this.selectedColor : this.unselectedColor}} style={{color: (this.state.actionState === SkipNoticeAction.CategoryVote && this.state.editing == true) ? this.selectedColor : this.unselectedColor}}
onClick={() => this.openCategoryChooser()}> onClick={() => this.resetStateToStart(SkipNoticeAction.CategoryVote, true, true)}>
{chrome.i18n.getMessage("incorrectCategory")} {chrome.i18n.getMessage("incorrectCategory")}
</button> </button>
</td> </td>
</tr> </tr>
), ),
/* Category Chooser Row */ /* Category Chooser Row */
(this.state.choosingCategory && (this.state.choosingCategory && !this.state.thanksForVotingText &&
<tr id={"sponsorSkipNoticeCategoryChooserRow" + this.idSuffix} <tr id={"sponsorSkipNoticeCategoryChooserRow" + this.idSuffix}
key={3}> key={3}>
<td> <td>
@@ -326,13 +329,12 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
{chrome.i18n.getMessage("submit")} {chrome.i18n.getMessage("submit")}
</button> </button>
} }
</td> </td>
</tr> </tr>
), ),
/* Segment Chooser Row */ /* Segment Chooser Row */
(this.state.actionState !== SkipNoticeAction.None && (this.state.actionState !== SkipNoticeAction.None && this.segments.length > 1 && !this.state.thanksForVotingText &&
<tr id={"sponsorSkipNoticeSubmissionOptionsRow" + this.idSuffix} <tr id={"sponsorSkipNoticeSubmissionOptionsRow" + this.idSuffix}
key={4}> key={4}>
<td id={"sponsorTimesSubmissionOptionsContainer" + this.idSuffix}> <td id={"sponsorTimesSubmissionOptionsContainer" + this.idSuffix}>
@@ -364,11 +366,13 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
getSubmissionChooser(): JSX.Element[] { getSubmissionChooser(): JSX.Element[] {
const elements: JSX.Element[] = []; const elements: JSX.Element[] = [];
const isUpvote = this.state.actionState === SkipNoticeAction.Upvote;
const isDownvote = this.state.actionState == SkipNoticeAction.Downvote;
const isCopyDownvote = this.state.actionState == SkipNoticeAction.CopyDownvote;
for (let i = 0; i < this.segments.length; i++) { for (let i = 0; i < this.segments.length; i++) {
const shouldBeGray: boolean= ((this.state.actionState == SkipNoticeAction.Upvote && this.state.voted[i] == SkipNoticeAction.Upvote) || const shouldBeGray: boolean= isUpvote && this.state.voted[i] == SkipNoticeAction.Upvote ||
(this.state.actionState == SkipNoticeAction.Downvote && this.state.voted[i] == SkipNoticeAction.Downvote )) || isDownvote && this.state.voted[i] == SkipNoticeAction.Downvote ||
(this.state.actionState == SkipNoticeAction.CopyDownvote && this.state.copied[i] == SkipNoticeAction.CopyDownvote ); isCopyDownvote && this.state.copied[i] == SkipNoticeAction.CopyDownvote;
const opacity = shouldBeGray ? 0.35 : 1; const opacity = shouldBeGray ? 0.35 : 1;
elements.push( elements.push(
<button className="sponsorSkipObject sponsorSkipNoticeButton" <button className="sponsorSkipObject sponsorSkipNoticeButton"
@@ -474,11 +478,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
this.SkipNoticeActionUnskip(index); this.SkipNoticeActionUnskip(index);
break; break;
default: default:
this.setState({ this.resetStateToStart();
actionState: SkipNoticeAction.None,
editing: false,
choosingCategory: false
});
break; break;
} }
} }
@@ -487,40 +487,23 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
this.setState({ this.setState({
voted: utils.replaceArrayElement(this.state.voted, SkipNoticeAction.None, index) voted: utils.replaceArrayElement(this.state.voted, SkipNoticeAction.None, index)
}) })
return;
} }
SkipNoticeActionUpvote(index: number): void { SkipNoticeActionUpvote(index: number): void {
this.contentContainer().vote(1, this.segments[index].UUID, undefined, this); this.contentContainer().vote(1, this.segments[index].UUID, undefined, this);
if (this.segments.length === 1) this.resetStateToStart();
this.segments[index].hidden = SponsorHideType.Visible; // This doesnt work D:
this.contentContainer().updatePreviewBar();
this.setState({
actionState: SkipNoticeAction.None,
editing: false,
choosingCategory: false
});
} }
SkipNoticeActionDownvote(index: number): void { SkipNoticeActionDownvote(index: number): void {
this.contentContainer().vote(0, this.segments[index].UUID, undefined, this); this.contentContainer().vote(0, this.segments[index].UUID, undefined, this);
this.setState({ if (this.segments.length === 1) this.resetStateToStart();
actionState: SkipNoticeAction.None,
editing: false,
choosingCategory: false
});
} }
SkipNoticeActionCategoryVote(index: number): void { SkipNoticeActionCategoryVote(index: number): void {
this.contentContainer().vote(undefined, this.segments[index].UUID, this.categoryOptionRef.current.value as Category, this) this.contentContainer().vote(undefined, this.segments[index].UUID, this.categoryOptionRef.current.value as Category, this)
this.setState({ //this.resetStateToStart();
actionState: SkipNoticeAction.None,
editing: false,
choosingCategory: false
});
} }
skipNoticeActionCopyDownvote(index: number): void { skipNoticeActionCopyDownvote(index: number): void {
@@ -541,41 +524,18 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
this.props.contentContainer().updateEditButtonsOnPlayer(); this.props.contentContainer().updateEditButtonsOnPlayer();
this.contentContainer().vote(0, this.segments[index].UUID, undefined, this); this.contentContainer().vote(0, this.segments[index].UUID, undefined, this);
//this.resetStateToStart();
this.setState({ this.setState({
actionState: SkipNoticeAction.None,
editing: false,
choosingCategory: false,
copied: utils.replaceArrayElement(this.state.copied, SkipNoticeAction.CopyDownvote, index) copied: utils.replaceArrayElement(this.state.copied, SkipNoticeAction.CopyDownvote, index)
}); });
} }
SkipNoticeActionUnskip(index: number): void { SkipNoticeActionUnskip(index: number): void {
this.state.skipButtonCallback(index); this.state.skipButtonCallback(index);
this.setState({
actionState: SkipNoticeAction.None,
editing: false,
choosingCategory: false
});
} }
openEditingOptions(): void { openEditingOptions(): void {
this.setState({ this.resetStateToStart(undefined, true);
editing: true,
choosingCategory: false,
actionState: SkipNoticeAction.None
});
}
openCategoryChooser(): void {
this.setState({
choosingCategory: true
}, () => {
if (this.segments.length > 1) {
// Use the action selectors as a submit button
this.prepAction(SkipNoticeAction.CategoryVote);
}
});
} }
getCategoryOptions(): React.ReactElement[] { getCategoryOptions(): React.ReactElement[] {
@@ -650,7 +610,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
} }
afterVote(segment: SponsorTime, type: number, category: Category): void { afterVote(segment: SponsorTime, type: number, category: Category): void {
const index = this.segments.findIndex(x => x.UUID === segment.UUID); const index = utils.getSponsorIndexFromUUID(this.segments, segment.UUID);
const wikiLinkText = Config.config.wikiPages.get(segment.category); const wikiLinkText = Config.config.wikiPages.get(segment.category);
switch (type) { switch (type) {
case 0: case 0:
@@ -671,13 +631,15 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
break; break;
} }
this.addVoteButtonInfo(chrome.i18n.getMessage("voted")); this.addVoteButtonInfo(chrome.i18n.getMessage("voted"));
// Change the sponsor locally // Change the sponsor locally
if (segment) { if (segment) {
if (type === 0) { if (type === 0) {
segment.hidden = SponsorHideType.Downvoted; segment.hidden = SponsorHideType.Downvoted;
} else if (category) { } else if (category) {
segment.category = category; segment.category = category; // This is the actual segment on the video page
this.segments[index].category = category; //this is the segment inside the skip notice.
} else if (type === 1) {
segment.hidden = SponsorHideType.Visible;
} }
this.contentContainer().updatePreviewBar(); this.contentContainer().updatePreviewBar();
} }