aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-05-10 14:23:59 +0200
committerChocobozzz <me@florianbigard.com>2023-05-10 14:23:59 +0200
commit7815dc450ea9f8fd63e2234b6215013a132e6229 (patch)
treefaee269ef011930dd71d52035cdd2af8e6f2b004
parentbc3bd960e3d240a1a02bbda7530659424ad70685 (diff)
downloadPeerTube-7815dc450ea9f8fd63e2234b6215013a132e6229.tar.gz
PeerTube-7815dc450ea9f8fd63e2234b6215013a132e6229.tar.zst
PeerTube-7815dc450ea9f8fd63e2234b6215013a132e6229.zip
Prevent invalid end watch section warnings
-rw-r--r--client/e2e/src/utils/mock-smtp.ts2
-rw-r--r--client/src/app/+login/login.component.ts2
-rw-r--r--client/src/app/shared/shared-share-modal/video-share.component.ts2
-rw-r--r--client/src/assets/player/shared/peertube/peertube-plugin.ts6
-rw-r--r--server/lib/views/shared/video-viewer-stats.ts7
-rw-r--r--shared/server-commands/server/servers-command.ts1
6 files changed, 10 insertions, 10 deletions
diff --git a/client/e2e/src/utils/mock-smtp.ts b/client/e2e/src/utils/mock-smtp.ts
index be6f8b259..77691e981 100644
--- a/client/e2e/src/utils/mock-smtp.ts
+++ b/client/e2e/src/utils/mock-smtp.ts
@@ -24,8 +24,6 @@ class MockSMTPServer {
24 24
25 this.maildev.on('new', email => { 25 this.maildev.on('new', email => {
26 this.emails.push(email) 26 this.emails.push(email)
27
28 console.log('pushed email', email)
29 }) 27 })
30 28
31 this.maildev.listen(err => { 29 this.maildev.listen(err => {
diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts
index c03af38f2..ba0d412d6 100644
--- a/client/src/app/+login/login.component.ts
+++ b/client/src/app/+login/login.component.ts
@@ -197,8 +197,6 @@ The link will expire within 1 hour.`
197 } 197 }
198 198
199 private handleError (err: any) { 199 private handleError (err: any) {
200 console.log(err)
201
202 if (this.authService.isOTPMissingError(err)) { 200 if (this.authService.isOTPMissingError(err)) {
203 this.otpStep = true 201 this.otpStep = true
204 202
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.ts b/client/src/app/shared/shared-share-modal/video-share.component.ts
index 43229c330..1b69aa2d0 100644
--- a/client/src/app/shared/shared-share-modal/video-share.component.ts
+++ b/client/src/app/shared/shared-share-modal/video-share.component.ts
@@ -203,8 +203,6 @@ export class VideoShareComponent {
203 // --------------------------------------------------------------------------- 203 // ---------------------------------------------------------------------------
204 204
205 async onUpdate () { 205 async onUpdate () {
206 console.log('on update')
207
208 if (this.playlist) { 206 if (this.playlist) {
209 this.playlistUrl = await this.getPlaylistUrl() 207 this.playlistUrl = await this.getPlaylistUrl()
210 this.playlistEmbedUrl = await this.getPlaylistEmbedUrl() 208 this.playlistEmbedUrl = await this.getPlaylistEmbedUrl()
diff --git a/client/src/assets/player/shared/peertube/peertube-plugin.ts b/client/src/assets/player/shared/peertube/peertube-plugin.ts
index cf96b33ba..af2147749 100644
--- a/client/src/assets/player/shared/peertube/peertube-plugin.ts
+++ b/client/src/assets/player/shared/peertube/peertube-plugin.ts
@@ -180,8 +180,10 @@ class PeerTubePlugin extends Plugin {
180 }) 180 })
181 181
182 this.player.on('seeked', () => { 182 this.player.on('seeked', () => {
183 // Don't take into account small seek events 183 const diff = Math.floor(this.player.currentTime()) - lastCurrentTime
184 if (Math.abs(this.player.currentTime() - lastCurrentTime) < 3) return 184
185 // Don't take into account small forwards
186 if (diff > 0 && diff < 3) return
185 187
186 lastViewEvent = 'seek' 188 lastViewEvent = 'seek'
187 }) 189 })
diff --git a/server/lib/views/shared/video-viewer-stats.ts b/server/lib/views/shared/video-viewer-stats.ts
index 39e34fb90..ebd963e59 100644
--- a/server/lib/views/shared/video-viewer-stats.ts
+++ b/server/lib/views/shared/video-viewer-stats.ts
@@ -106,7 +106,12 @@ export class VideoViewerStats {
106 const lastSection = stats.watchSections[stats.watchSections.length - 1] 106 const lastSection = stats.watchSections[stats.watchSections.length - 1]
107 107
108 if (lastSection.start > currentTime) { 108 if (lastSection.start > currentTime) {
109 logger.warn('Invalid end watch section %d. Last start record was at %d.', currentTime, lastSection.start) 109 logger.debug('Invalid end watch section %d. Last start record was at %d. Starting a new section.', currentTime, lastSection.start)
110
111 stats.watchSections.push({
112 start: currentTime,
113 end: currentTime
114 })
110 } else { 115 } else {
111 lastSection.end = currentTime 116 lastSection.end = currentTime
112 } 117 }
diff --git a/shared/server-commands/server/servers-command.ts b/shared/server-commands/server/servers-command.ts
index f174a2aa0..19645cb93 100644
--- a/shared/server-commands/server/servers-command.ts
+++ b/shared/server-commands/server/servers-command.ts
@@ -44,7 +44,6 @@ export class ServersCommand extends AbstractCommand {
44 44
45 await copy(origin, join('artifacts', destname)) 45 await copy(origin, join('artifacts', destname))
46 } 46 }
47 console.log(this.server.parallel)
48 47
49 if (this.server.parallel) { 48 if (this.server.parallel) {
50 const promise = saveGithubLogsIfNeeded() 49 const promise = saveGithubLogsIfNeeded()