* Remove the unnecessary delay on video comment loading

FreeTubeApp · Apr 8, 2023 · 31d16a0 · 31d16a0
1 parent 56dec89
commit 31d16a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -27,7 +27,11 @@ export default defineComponent({
     channelThumbnail: {
       type: String,
       required: true
-    }
+    },
+    videoPlayerReady: {
+      type: Boolean,
+      required: true
+    },
   },
   data: function () {
     return {
@@ -78,6 +82,7 @@ export default defineComponent({
 
     observeVisibilityOptions: function() {
       if (!this.commentAutoLoadEnabled) { return false }
+      if (!this.videoPlayerReady) { return false }
 
       return {
         callback: (isVisible, _entry) => {
@@ -96,9 +101,6 @@ export default defineComponent({
           // Only when it intersects with N% above bottom
           rootMargin: '0% 0% 0% 0%',
         },
-        // The video player is minimized on startup for < about 1s
-        // `throttle` is needed to prevent unwanted autoload during that period
-        throttle: 1000,
         // Callback responsible for loading multiple comment pages
         once: false,
       }

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
@@ -55,6 +55,7 @@ export default defineComponent({
       isLoading: true,
       firstLoad: true,
       useTheatreMode: false,
+      videoPlayerReady: false,
       showDashPlayer: true,
       showLegacyPlayer: false,
       showYouTubeNoCookieEmbed: false,
@@ -98,7 +99,7 @@ export default defineComponent({
       timestamp: null,
       playNextTimeout: null,
       playNextCountDownIntervalId: null,
-      infoAreaSticky: true
+      infoAreaSticky: true,
     }
   },
   computed: {
@@ -182,7 +183,7 @@ export default defineComponent({
     },
     allowDashAv1Formats: function () {
       return this.$store.getters.getAllowDashAv1Formats
-    }
+    },
   },
   watch: {
     $route() {
@@ -928,6 +929,11 @@ export default defineComponent({
       this.updateLastViewedPlaylist(payload)
     },
 
+    handleVideoReady: function () {
+      this.videoPlayerReady = true
+      this.checkIfWatched()
+    },
+
     checkIfWatched: function () {
       const historyIndex = this.historyCache.findIndex((video) => {
         return video.videoId === this.videoId

diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
@@ -31,7 +31,7 @@
           :chapters="videoChapters"
           class="videoPlayer"
           :class="{ theatrePlayer: useTheatreMode }"
-          @ready="checkIfWatched"
+          @ready="handleVideoReady"
           @ended="handleVideoEnded"
           @error="handleVideoError"
           @store-caption-list="captionHybridList = $event"
@@ -144,6 +144,7 @@
         :class="{ theatreWatchVideo: useTheatreMode }"
         :channel-thumbnail="channelThumbnail"
         :channel-name="channelName"
+        :video-player-ready="videoPlayerReady"
         @timestamp-event="changeTimestamp"
       />
     </div>