Fix player play exception on chromium

client/src/assets/player/peertube-videojs-plugin.ts

@@ -235,9 +235,7 @@ const peertubePlugin = function (options: PeertubePluginOptions) {
         if (err) return handleError(err)
 
         this.renderer = renderer
-        player.play()
+        player.play().then(done)
-
-        return done()
       })
     })
 
@@ -323,10 +321,14 @@ const peertubePlugin = function (options: PeertubePluginOptions) {
       player.updateVideoFile()
     } else {
       player.one('play', () => {
-        // Pause, we wait the video to load before
+        // On firefox, we need to wait to load the video before playing
-        player.pause()
+        if (navigator.userAgent.toLowerCase().indexOf('firefox') !== -1) {
+          player.pause()
+          player.updateVideoFile(undefined, () => player.play())
+          return
+        }
 
-        player.updateVideoFile(undefined, () => player.play())
+        player.updateVideoFile(undefined)
       })
     }
 

server/helpers/custom-validators/activitypub/videos.ts

@@ -43,8 +43,6 @@ function isActivityPubVideoDurationValid (value: string) {
 }
 
 function isVideoTorrentObjectValid (video: any) {
-  console.log(video)
-
   return video.type === 'Video' &&
     isActivityPubUrlValid(video.id) &&
     isVideoNameValid(video.name) &&

server/lib/activitypub/process/process-follow.ts

@@ -62,5 +62,5 @@ async function follow (actor: ActorModel, targetActorURL: string) {
     return sendAccept(actorFollow, t)
   })
 
-  logger.info('Actor %s is followed by actor %s.', actor.url, targetActorURL)
+  logger.info('Actor %s is followed by actor %s.', targetActorURL, actor.url)
 }

server/middlewares/activitypub.ts

@@ -34,7 +34,6 @@ async function checkSignature (req: Request, res: Response, next: NextFunction)
 function executeIfActivityPub (fun: RequestHandler | RequestHandler[]) {
   return (req: Request, res: Response, next: NextFunction) => {
     const accepted = req.accepts(ACCEPT_HEADERS)
-    console.log(accepted)
     if (accepted === false || ACTIVITY_PUB.POTENTIAL_ACCEPT_HEADERS.indexOf(accepted) === -1) {
       return next()
     }