fix: track changes due to skip and snip times (#136)

cdrani · Sep 30, 2023 · 1884ed1 · 1884ed1
1 parent bab5142
commit 1884ed1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/models/video/video.js b/src/models/video/video.js
@@ -7,7 +7,6 @@ export default class VideoElement {
     constructor(video) {
         this._video = video
         this._currentTrackId = null
-        this.#listenForTrackChange()
         this._active = sessionStorage.getItem('enabled') == 'true'
 
         this._videoOverride = new VideoOverride(this)
@@ -98,18 +97,13 @@ export default class VideoElement {
             return
         } else if (isSnip || isShared) {
             this._video.currentTime = { source: 'chorus', value: startTime }
+            this._video.play()
         } else {
             this._video.play()
         }
         this._currentTrackId = trackId
     }
 
-    #listenForTrackChange() {
-        this._video.addEventListener('loadeddata', async () => {
-            await this.#handleTrackChange()
-        })
-    }
-
     get #muteButton() {
         return document.querySelector('[data-testid="volume-bar-toggle-mute-button"]')
     }

diff --git a/src/observers/current-time/song-tracker.js b/src/observers/current-time/song-tracker.js
@@ -46,7 +46,7 @@ export default class SongTracker {
                 if (this.#isMuted) this.#toggleMuteIfMuted()
                 this.#handleSongEnd(songStateData)
             }
-        }, 500)
+        }, 1000)
     }
 
     #setVideoTime(timeObject) {
@@ -75,7 +75,7 @@ export default class SongTracker {
     }
 
     #atSongEnd(endTime) {
-        return parseInt(this._video.currentTime, 10) >= parseInt(endTime, 10) + 1
+        return parseInt(this._video.currentTime, 10) >= parseInt(endTime, 10) - 1
     }
 
     #handleSongEnd({ endTime, startTime }) {