From 8337b54a44ad2acf9f9d7d28d12406ca6b786948 Mon Sep 17 00:00:00 2001
From: Maciej Wilk <73193760+wilkmaciej@users.noreply.github.com>
Date: Fri, 14 May 2021 14:32:32 +0200
Subject: telemetry sending and counting on manual skip
---
src/content.ts | 49 +++++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/content.ts b/src/content.ts
index e4e3cb4f..071d284c 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -982,6 +982,23 @@ function previewTime(time: number, unpause = true) {
}
}
+//send telemetry and count skip
+function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped: number, fullSkip: boolean) {
+ let counted = false
+ for (const segment of skippingSegments) {
+ const index = sponsorTimes.indexOf(segment);
+ if (index !== -1 && !sponsorSkipped[index]) {
+ if (!counted) {
+ Config.config.minutesSaved = Config.config.minutesSaved + secondsSkipped / 60;
+ Config.config.skipCount = Config.config.skipCount + 1;
+ counted = true
+ }
+ if (fullSkip) utils.asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID);
+ sponsorSkipped[index] = true;
+ }
+ }
+}
+
//skip from the start time to the end time for a certain index sponsor time
function skipToTime(v: HTMLVideoElement, skipTime: number[], skippingSegments: SponsorTime[], openNotice: boolean) {
// There will only be one submission if it is manual skip
@@ -1005,29 +1022,7 @@ function skipToTime(v: HTMLVideoElement, skipTime: number[], skippingSegments: S
}
//send telemetry that a this sponsor was skipped
- if (Config.config.trackViewCount && autoSkip) {
- let alreadySkipped = false;
- let isPreviewSegment = false;
-
- for (const segment of skippingSegments) {
- const index = sponsorTimes.indexOf(segment);
- if (index !== -1 && !sponsorSkipped[index]) {
- utils.asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID);
-
- sponsorSkipped[index] = true;
- } else if (sponsorSkipped[index]) {
- alreadySkipped = true;
- }
-
- if (index === -1) isPreviewSegment = true;
- }
-
- // Count this as a skip
- if (!alreadySkipped && !isPreviewSegment) {
- Config.config.minutesSaved = Config.config.minutesSaved + (skipTime[1] - skipTime[0]) / 60;
- Config.config.skipCount = Config.config.skipCount + 1;
- }
- }
+ if (Config.config.trackViewCount && autoSkip) sendTelemetryAndCount(skippingSegments, skipTime[1] - skipTime[0], true)
}
function unskipSponsorTime(segment: SponsorTime) {
@@ -1037,9 +1032,15 @@ function unskipSponsorTime(segment: SponsorTime) {
}
}
+// value determining when to count segment as skipped and send telemetry to server (percent based)
+let manualSkipPercentCount = 0.5;
+
function reskipSponsorTime(segment: SponsorTime) {
+ let skippedTime = segment.segment[1] - video.currentTime;
+ let segmentDuration = segment.segment[1] - segment.segment[0];
+ let fullSkip = skippedTime / segmentDuration > manualSkipPercentCount ? true : false
video.currentTime = segment.segment[1];
-
+ sendTelemetryAndCount([segment], skippedTime, fullSkip)
startSponsorSchedule(true, segment.segment[1], false);
}
--
cgit v1.2.3
From f18aa1917205a691cb0003e51fe4658c37f42ea4 Mon Sep 17 00:00:00 2001
From: Maciej Wilk <73193760+wilkmaciej@users.noreply.github.com>
Date: Fri, 14 May 2021 19:23:58 +0200
Subject: updated help changed few confusing names deleted auto upvote
information fixed minor typos
---
public/help/index_en.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/help/index_en.html b/public/help/index_en.html
index 7eaabf6a..80c13c04 100644
--- a/public/help/index_en.html
+++ b/public/help/index_en.html
@@ -42,12 +42,12 @@
- Videos will automatically be skipped if they are found in the database. You can open the popup by clicking the extension icon to get a preview of what they are.
+ Video segments will automatically be skipped if they are found in the database. You can open the popup by clicking the extension icon to get a preview of what they are.
- Whenever you skip a video, you will get a notice report that submission. If the timing seems wrong, report it! You can also vote in the popup. The extension auto upvotes it if you don't report it, so make sure to report when necessary (this can be disabled in the options).
+ Whenever you skip a segment, you will get notification. If the timing seems wrong vote down by clicking down vote! You can also vote in the popup.
@@ -81,8 +81,8 @@
This is too slow
- There are hotkeys if you want to use them. You must be focused on the YouTube player to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the appostrophe to submit.
- These can be changed in the options. If you don't use QWERTY, you should probably change the keybinds.
+ There are hotkeys if you want to use them. You must be focused on the YouTube player to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the apostrophe to submit.
+ These can be changed in the options. If you don't use QWERTY, you should probably change the keybinding.
I hate these buttons, they are so ugly
--
cgit v1.2.3
From bd44c4721bbb1321ced511bff9740d4667fa5105 Mon Sep 17 00:00:00 2001
From: Maciej Wilk
Date: Sat, 15 May 2021 00:10:30 +0200
Subject: Update public/help/index_en.html
Co-authored-by: Ajay Ramachandran
---
public/help/index_en.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/help/index_en.html b/public/help/index_en.html
index 80c13c04..5e4bcef0 100644
--- a/public/help/index_en.html
+++ b/public/help/index_en.html
@@ -47,7 +47,7 @@
- Whenever you skip a segment, you will get notification. If the timing seems wrong vote down by clicking down vote! You can also vote in the popup.
+ Whenever you skip a segment, you will get notice. If the timing seems wrong vote down by clicking downvote! You can also vote in the popup.
