2 files changed, 18 insertions, 3 deletions

diff --git a/client/src/app/+stats/video/video-stats.component.ts b/client/src/app/+stats/video/video-stats.component.ts
index 14db31ecf..8200661c3 100644
--- a/client/src/app/+stats/video/video-stats.component.ts
+++ b/client/src/app/+stats/video/video-stats.component.ts
@@ -316,7 +316,7 @@ export class VideoStatsComponent implements OnInit {
               const { min, max } = chart.scales.x
 
               const startDate = rawData.data[min].date
-              const endDate = rawData.data[max].date
+              const endDate = this.buildZoomEndDate(rawData.groupInterval, rawData.data[max].date)
 
               this.peertubeRouter.silentNavigate([], { startDate, endDate })
             }
@@ -449,4 +449,19 @@ export class VideoStatsComponent implements OnInit {
       }
     }
   }
+
+  private buildZoomEndDate (groupInterval: string, last: string) {
+    const date = new Date(last)
+
+    // Remove parts of the date we don't need
+    if (groupInterval.endsWith(' day') || groupInterval.endsWith(' days')) {
+      date.setHours(23, 59, 59)
+    } else if (groupInterval.endsWith(' hour') || groupInterval.endsWith(' hours')) {
+      date.setMinutes(59, 59)
+    } else {
+      date.setSeconds(59)
+    }
+
+    return date.toISOString()
+  }
 }
diff --git a/client/src/assets/player/shared/peertube/peertube-plugin.ts b/client/src/assets/player/shared/peertube/peertube-plugin.ts
index 8b65903f9..a29a0921f 100644
--- a/client/src/assets/player/shared/peertube/peertube-plugin.ts
+++ b/client/src/assets/player/shared/peertube/peertube-plugin.ts
@@ -159,7 +159,7 @@ class PeerTubePlugin extends Plugin {
     })
 
     this.player.one('ended', () => {
-      const currentTime = Math.floor(this.player.duration())
+      const currentTime = Math.round(this.player.duration())
       lastCurrentTime = currentTime
 
       this.notifyUserIsWatching(currentTime, lastViewEvent)
@@ -168,7 +168,7 @@ class PeerTubePlugin extends Plugin {
     })
 
     this.videoViewInterval = setInterval(() => {
-      const currentTime = Math.floor(this.player.currentTime())
+      const currentTime = Math.round(this.player.currentTime())
 
       // No need to update
       if (currentTime === lastCurrentTime) return