Fix full video saving old times

Fix #1198

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "4.1.3",
+    "version": "4.1.4",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

package-lock.json

@@ -6301,9 +6301,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true,
       "funding": [
         {
@@ -18854,9 +18854,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true
     },
     "forever-agent": {

public/options/options.html

@@ -90,7 +90,7 @@
 					</div>
 				</div>
 				
-				<div option-type="toggle" data-sync="fullVideoSegments">
+				<div data-type="toggle" data-sync="fullVideoSegments">
 					<div class="switch-container">
 						<label class="switch">
 							<input id="fullVideoSegments" type="checkbox" checked>

src/components/SponsorTimeEditComponent.tsx

@@ -381,21 +381,21 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         }
 
         const sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
-        this.handleReplacingLostTimes(event.target.value as Category, sponsorTime.actionType);
+        this.handleReplacingLostTimes(event.target.value as Category, sponsorTime.actionType, sponsorTime);
         this.saveEditTimes();
     }
 
     actionTypeSelectionChange(event: React.ChangeEvent<HTMLSelectElement>): void {
         const sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
 
-        this.handleReplacingLostTimes(sponsorTime.category, event.target.value as ActionType);
+        this.handleReplacingLostTimes(sponsorTime.category, event.target.value as ActionType, sponsorTime);
         this.saveEditTimes();
     }
 
-    private handleReplacingLostTimes(category: Category, actionType: ActionType): void {
+    private handleReplacingLostTimes(category: Category, actionType: ActionType, segment: SponsorTime): void {
         if (CompileConfig.categorySupport[category]?.includes(ActionType.Poi)) {
             if (this.previousSkipType !== ActionType.Poi) {
-                this.timesBeforeChanging = [null, utils.getFormattedTimeToSeconds(this.state.sponsorTimeEdits[1])];
+                this.timesBeforeChanging = [null, segment.segment[1]];
             }
 
             this.setTimeTo(1, null);
@@ -410,12 +410,13 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         } else if (CompileConfig.categorySupport[category]?.length === 1 
                 && CompileConfig.categorySupport[category]?.[0] === ActionType.Full) {
             if (this.previousSkipType !== ActionType.Full) {
-                this.timesBeforeChanging = [utils.getFormattedTimeToSeconds(this.state.sponsorTimeEdits[0]), utils.getFormattedTimeToSeconds(this.state.sponsorTimeEdits[1])];
+                this.timesBeforeChanging = [...segment.segment];
             }
 
             this.previousSkipType = ActionType.Full;
-        } else if (CompileConfig.categorySupport[category]?.includes(ActionType.Skip) 
-                && ![ActionType.Poi, ActionType.Full].includes(this.getNextActionType(category, actionType)) && this.previousSkipType !== ActionType.Skip) {
+        } else if ((category === "chooseACategory" || (CompileConfig.categorySupport[category]?.includes(ActionType.Skip) 
+                        && ![ActionType.Poi, ActionType.Full].includes(this.getNextActionType(category, actionType))))
+                    && this.previousSkipType !== ActionType.Skip) {
             if (this.timesBeforeChanging[0]) {
                 this.setTimeTo(0, this.timesBeforeChanging[0]);
             }

src/content.ts

@@ -756,7 +756,7 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
         // Hide all submissions smaller than the minimum duration
         if (Config.config.minDuration !== 0) {
             for (const segment of sponsorTimes) {
-                const duration = segment[1] - segment[0];
+                const duration = segment.segment[1] - segment.segment[0];
                 if (duration > 0 && duration < Config.config.minDuration) {
                     segment.hidden = SponsorHideType.MinimumDuration;
                 }
@@ -1934,6 +1934,11 @@ async function sendSubmitMessage() {
         sponsorTimesSubmitting = [];
 
         updatePreviewBar();
+
+        const fullVideoSegment = sponsorTimes.filter((time) => time.actionType === ActionType.Full)[0];
+        if (fullVideoSegment) {
+            categoryPill?.setSegment(fullVideoSegment);
+        }
     } else {
         // Show that the upload failed
         playerButtons.submit.button.style.animation = "unset";