Fix video upload and videos list

5 files changed, 13 insertions, 6 deletions

diff --git a/server/lib/activitypub/send-request.ts b/server/lib/activitypub/send-request.ts
index 1a6cebc03..1dad51828 100644
--- a/server/lib/activitypub/send-request.ts
+++ b/server/lib/activitypub/send-request.ts
@@ -11,6 +11,7 @@ import { signObject, activityPubContextify } from '../../helpers'
 import { Activity } from '../../../shared'
 import { VideoAbuseInstance } from '../../models/video/video-abuse-interface'
 import { getActivityPubUrl } from '../../helpers/activitypub'
+import { logger } from '../../helpers/logger'
 
 async function sendCreateVideoChannel (videoChannel: VideoChannelInstance, t: Sequelize.Transaction) {
   const videoChannelObject = videoChannel.toActivityPubObject()
@@ -100,7 +101,11 @@ export {
 // ---------------------------------------------------------------------------
 
 async function broadcastToFollowers (data: any, fromAccount: AccountInstance, t: Sequelize.Transaction) {
-  const result = await db.AccountFollow.listAcceptedFollowerUrlsForApi(fromAccount.id, 0)
+  const result = await db.AccountFollow.listAcceptedFollowerUrlsForApi(fromAccount.id)
+  if (result.data.length === 0) {
+    logger.info('Not broadcast because of 0 followers.')
+    return
+  }
 
   const jobPayload = {
     uris: result.data,
diff --git a/server/lib/jobs/http-request-job-scheduler/http-request-broadcast-handler.ts b/server/lib/jobs/http-request-job-scheduler/http-request-broadcast-handler.ts
index 2f1d9ee92..ccb008e4d 100644
--- a/server/lib/jobs/http-request-job-scheduler/http-request-broadcast-handler.ts
+++ b/server/lib/jobs/http-request-job-scheduler/http-request-broadcast-handler.ts
@@ -22,8 +22,9 @@ function onError (err: Error, jobId: number) {
   return Promise.resolve()
 }
 
-async function onSuccess (jobId: number) {
+function onSuccess (jobId: number) {
   logger.info('Job %d is a success.', jobId)
+  return Promise.resolve()
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/lib/jobs/http-request-job-scheduler/http-request-unicast-handler.ts b/server/lib/jobs/http-request-job-scheduler/http-request-unicast-handler.ts
index 3a1a7fabf..9e4e73891 100644
--- a/server/lib/jobs/http-request-job-scheduler/http-request-unicast-handler.ts
+++ b/server/lib/jobs/http-request-job-scheduler/http-request-unicast-handler.ts
@@ -20,8 +20,9 @@ function onError (err: Error, jobId: number) {
   return Promise.resolve()
 }
 
-async function onSuccess (jobId: number) {
+function onSuccess (jobId: number) {
   logger.info('Job %d is a success.', jobId)
+  return Promise.resolve()
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/lib/jobs/job-scheduler.ts b/server/lib/jobs/job-scheduler.ts
index b25bb7ab3..73c440279 100644
--- a/server/lib/jobs/job-scheduler.ts
+++ b/server/lib/jobs/job-scheduler.ts
@@ -9,7 +9,7 @@ import { error } from 'util'
 export interface JobHandler<P, T> {
   process (data: object, jobId: number): Promise<T>
   onError (err: Error, jobId: number)
-  onSuccess (jobId: number, jobResult: T, jobScheduler: JobScheduler<P, T>)
+  onSuccess (jobId: number, jobResult: T, jobScheduler: JobScheduler<P, T>): Promise<any>
 }
 type JobQueueCallback = (err: Error) => void
 
@@ -127,7 +127,7 @@ class JobScheduler<P, T> {
 
     try {
       await job.save()
-      jobHandler.onSuccess(job.id, jobResult, this)
+      await jobHandler.onSuccess(job.id, jobResult, this)
     } catch (err) {
       this.cannotSaveJobError(err)
     }
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts
index d3ee886e7..f6d9627a5 100644
--- a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts
+++ b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts
@@ -39,8 +39,8 @@ async function onSuccess (jobId: number, video: VideoInstance, jobScheduler: Job
   await sendAddVideo(video, undefined)
 
   const originalFileHeight = await videoDatabase.getOriginalFileHeight()
-  // Create transcoding jobs if there are enabled resolutions
 
+  // Create transcoding jobs if there are enabled resolutions
   const resolutionsEnabled = computeResolutionsToTranscode(originalFileHeight)
   logger.info(
     'Resolutions computed for video %s and origin file height of %d.', videoDatabase.uuid, originalFileHeight,