external/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2024-11-10 01:01:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #296 from ajayyy/experimental

Browse source 
Prevent manual skips from triggering a view and improved skip schedule for manual skip
This commit is contained in:
Ajay Ramachandran 2020-03-09 18:20:11 -04:00 committed by GitHub
commit ba575f6b8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/release.yml vendored
View file

@ -62,15 +62,15 @@ jobs:
# Upload each release asset
- name: Upload to release
uses: JasonEtco/upload-to-release@master
uses: Shopify/upload-to-release@master
with:
args: ./builds/ChromeExtension.zip
args: builds/ChromeExtension.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload to release
uses: JasonEtco/upload-to-release@master
uses: Shopify/upload-to-release@master
with:
args: ./builds/FirefoxExtension.zip
args: builds/FirefoxExtension.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

2
manifest/manifest.json
View file

@ -1,7 +1,7 @@
{
"name": "__MSG_fullName__",
"short_name": "__MSG_Name__",
"version": "1.2.19",
"version": "1.2.20",
"default_locale": "en",
"description": "__MSG_Description__",
"content_scripts": [{

14
src/content.ts
View file

@ -463,7 +463,7 @@ function startSponsorSchedule(currentTime?: number): void {
skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice);
}
startSponsorSchedule(skipTime[1]);
startSponsorSchedule(skipTime[0] + 0.001);
};
if (timeUntilSponsor <= 0) {
@ -848,16 +848,14 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
}
//send telemetry that a this sponsor was skipped
if (Config.config.trackViewCount && !sponsorSkipped[index]) {
if (Config.config.trackViewCount && !sponsorSkipped[index] && !Config.config.disableAutoSkip) {
utils.sendRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
if (!Config.config.disableAutoSkip) {
// Count this as a skip
Config.config.minutesSaved = Config.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
Config.config.skipCount = Config.config.skipCount + 1;
// Count this as a skip
Config.config.minutesSaved = Config.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
Config.config.skipCount = Config.config.skipCount + 1;
sponsorSkipped[index] = true;
}
sponsorSkipped[index] = true;
}
}
}