Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy segments into your unsubmitted and SkipNotice changes #988

Merged
merged 38 commits into from
Oct 15, 2021
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
93f0287
copy segments basics done
FlorianZahn Oct 6, 2021
84924b6
Update SkipNoticeComponent.tsx
FlorianZahn Oct 6, 2021
51aab00
Update config.ts
FlorianZahn Oct 6, 2021
988905c
Update config.ts
FlorianZahn Oct 6, 2021
4afc2c1
Restart Voting button. Wiki links. SkipNotice Improvements
FlorianZahn Oct 6, 2021
08558bf
Merge branch 'copySegment' of https://github.com/FlorianZahn/SponsorB…
FlorianZahn Oct 6, 2021
edd1011
margin in ContinueVoting
FlorianZahn Oct 6, 2021
44f9ab9
changed let to const
FlorianZahn Oct 6, 2021
907bd68
Buttons now change color depending on state. Added colorPalette confi…
FlorianZahn Oct 9, 2021
52ed4f7
SkipNotice now remembers what has already been voted. Also nicer high…
FlorianZahn Oct 9, 2021
844567d
Lit fixes
FlorianZahn Oct 9, 2021
a9cc43c
Changed heigt of 2nd notice. Minor changes. Upvoting lets downvoted s…
FlorianZahn Oct 9, 2021
d9f703d
Vip warning added when downvoting. sry that it is in the same branch,…
FlorianZahn Oct 10, 2021
d72d5dc
Lint fixes
FlorianZahn Oct 10, 2021
b927ebb
Lint fixes
FlorianZahn Oct 10, 2021
aa8ee02
Added colored text if a category is locked for submitting and changin…
FlorianZahn Oct 11, 2021
60ef51b
I forgot to change the 24h countdown back to 24h instead of 1 seconds
FlorianZahn Oct 11, 2021
caeb347
Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into …
FlorianZahn Oct 13, 2021
77ce943
removed response.ok for response === 200
FlorianZahn Oct 13, 2021
af66a77
Fixed logic mistake if undovotes are ever implemented
FlorianZahn Oct 14, 2021
93e4403
Removed console.log and redundancy
FlorianZahn Oct 14, 2021
ff5fa4c
Move config values and close notice
ajayyy Oct 14, 2021
3e3e979
syntax error
FlorianZahn Oct 14, 2021
9b9174a
Simplify vip info fetching
ajayyy Oct 14, 2021
2bdfd3f
Merge branch 'copySegment' of https://github.com/florianzahn/sponsorb…
ajayyy Oct 14, 2021
45274f5
Wait for vip info to be fetched
ajayyy Oct 14, 2021
27f5997
Add return types to vip fetching functions
ajayyy Oct 14, 2021
fc7fc69
Fix getting locked category
ajayyy Oct 14, 2021
738868d
Merge branch 'master' into copySegment
FlorianZahn Oct 14, 2021
7698be8
Remove merge mistake
FlorianZahn Oct 14, 2021
a457a80
SkipNotice countdown now updates again on config update
FlorianZahn Oct 14, 2021
d82ef63
fix loading text not displaying upon voting
FlorianZahn Oct 14, 2021
fcbeeb9
Remove extra segment lookup and use lockbyhash lookup
ajayyy Oct 15, 2021
598da2a
Merge branch 'copySegment' of https://github.com/florianzahn/sponsorb…
ajayyy Oct 15, 2021
fe5499e
Code style fixes and react errors
ajayyy Oct 15, 2021
d375a97
Vip Warning also in popup
FlorianZahn Oct 15, 2021
8aea741
only change color if user isVip
FlorianZahn Oct 15, 2021
0863061
Fix indentation in manifest
ajayyy Oct 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions config.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,17 @@
"preview": ["skip"],
"music_offtopic": ["skip"],
"poi_highlight": ["skip"]
},
"wikiLinks": {
"sponsor": "https://wiki.sponsor.ajay.app/w/Sponsor",
"selfpromo": "https://wiki.sponsor.ajay.app/w/Unpaid/Self_Promotion",
"interaction": "https://wiki.sponsor.ajay.app/w/Interaction_Reminder_(Subscribe)",
"intro": "https://wiki.sponsor.ajay.app/w/Intermission/Intro_Animation",
"outro": "https://wiki.sponsor.ajay.app/w/Endcards/Credits",
"preview": "https://wiki.sponsor.ajay.app/w/Preview/Recap",
"music_offtopic": "https://wiki.sponsor.ajay.app/w/Music:_Non-Music_Section",
"poi_highlight": "https://wiki.sponsor.ajay.app/w/Highlight",
"guidelines": "https://wiki.sponsor.ajay.app/w/Guidelines",
"mute": "https://wiki.sponsor.ajay.app/w/Mute_Segment"
}
}
17 changes: 16 additions & 1 deletion public/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@
"message": "Incorrect/Wrong Timing"
},
"incorrectCategory": {
"message": "Wrong Category"
"message": "Change Category"
},
"nonMusicCategoryOnMusic": {
"message": "This video is categorized as music. Are you sure this has a sponsor? If this is actually a \"Non-Music segment\", open up the extension options and enable this category. Then, you can submit this segment as \"Non-Music\" instead of sponsor. Please read the guidelines if you are confused."
Expand Down Expand Up @@ -810,6 +810,21 @@
},
"LearnMore": {
"message": "Learn More"
},
"CopyDownvoteButtonInfo": {
"message": "Downvotes and creates a local copy for you to resubmit"
},
"OpenCategoryWikiPage": {
"message": "Open this category's wiki page."
},
"CopyAndDownvote": {
"message": "Copy and downvote"
},
"ContinueVoting": {
"message": "Continue Voting"
},
"ChangeCategoryTooltip": {
"message": "This will instantly apply to your segments"
},
"SponsorTimeEditScrollNewFeature": {
"message": "Use your mousewheel while hovering over the edit box to quickly adjust the time. Combinations of the ctrl or shift key can be used to fine tune the changes."
Expand Down
16 changes: 13 additions & 3 deletions public/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@

/* if two are very close to eachother */
.secondSkipNotice {
bottom: 250px;
bottom: 290px;
}

.noticeLeftIcon {
Expand Down Expand Up @@ -254,12 +254,16 @@

.sponsorTimesVoteButtonsContainer {
float: left;

vertical-align:middle;
padding: 2px 5px;

margin-right: 4px;
}

.sponsorTimesVoteButtonsContainer div{
display: inline-block;
}

.sponsorSkipNoticeRightSection {
right: 0;
position: absolute;
Expand Down Expand Up @@ -330,7 +334,8 @@
}

.voteButton {
height: 17px;
height: 24px;
width: 24px;
cursor: pointer;
}
.voteButton:hover {
Expand Down Expand Up @@ -556,6 +561,10 @@ input::-webkit-inner-spin-button {
border-color: rgba(28, 28, 28, 0.7) transparent transparent transparent;
}

.sponsorBlockLockedColor {
color: #ffc83d;
}

.sponsorBlockRectangleTooltip {
position: absolute;
border-radius: 5px;
Expand All @@ -565,3 +574,4 @@ input::-webkit-inner-spin-button {
white-space: normal;
line-height: 1.5em;
}

Loading