20 files changed, 134 insertions, 633 deletions

diff --git a/server/lib/activitypub/index.ts b/server/lib/activitypub/index.ts
index 740800606..f8d56528a 100644
--- a/server/lib/activitypub/index.ts
+++ b/server/lib/activitypub/index.ts
@@ -1,3 +1,4 @@
 export * from './process-create'
 export * from './process-flag'
 export * from './process-update'
+export * from './send-request'
diff --git a/server/lib/activitypub/misc.ts b/server/lib/activitypub/misc.ts
index 05e77ebc3..2cf0c4fd1 100644
--- a/server/lib/activitypub/misc.ts
+++ b/server/lib/activitypub/misc.ts
@@ -8,7 +8,11 @@ import { VideoChannelInstance } from '../../models/video/video-channel-interface
 import { VideoFileAttributes } from '../../models/video/video-file-interface'
 import { VideoAttributes, VideoInstance } from '../../models/video/video-interface'
 
-async function videoActivityObjectToDBAttributes (videoChannel: VideoChannelInstance, videoObject: VideoTorrentObject, t: Sequelize.Transaction) {
+async function videoActivityObjectToDBAttributes (
+  videoChannel: VideoChannelInstance,
+  videoObject: VideoTorrentObject,
+  t: Sequelize.Transaction
+) {
   const videoFromDatabase = await db.Video.loadByUUIDOrURL(videoObject.uuid, videoObject.id, t)
   if (videoFromDatabase) throw new Error('Video with this UUID/Url already exists.')
 
diff --git a/server/lib/activitypub/process-flag.ts b/server/lib/activitypub/process-flag.ts
index 6fa862ee9..b562dce4d 100644
--- a/server/lib/activitypub/process-flag.ts
+++ b/server/lib/activitypub/process-flag.ts
@@ -5,7 +5,7 @@ import {
 } from '../../../shared'
 
 function processFlagActivity (activity: ActivityCreate) {
-  // empty
+  return Promise.resolve(undefined)
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/lib/activitypub/send-request.ts b/server/lib/activitypub/send-request.ts
index 6a31c226d..91101f5ad 100644
--- a/server/lib/activitypub/send-request.ts
+++ b/server/lib/activitypub/send-request.ts
@@ -1,5 +1,6 @@
 import * as Sequelize from 'sequelize'
 
+import { database as db } from '../../initializers'
 import {
   AccountInstance,
   VideoInstance,
@@ -13,54 +14,66 @@ function sendCreateVideoChannel (videoChannel: VideoChannelInstance, t: Sequeliz
   const videoChannelObject = videoChannel.toActivityPubObject()
   const data = createActivityData(videoChannel.url, videoChannel.Account, videoChannelObject)
 
-  return broadcastToFollowers(data, t)
+  return broadcastToFollowers(data, videoChannel.Account, t)
 }
 
 function sendUpdateVideoChannel (videoChannel: VideoChannelInstance, t: Sequelize.Transaction) {
   const videoChannelObject = videoChannel.toActivityPubObject()
   const data = updateActivityData(videoChannel.url, videoChannel.Account, videoChannelObject)
 
-  return broadcastToFollowers(data, t)
+  return broadcastToFollowers(data, videoChannel.Account, t)
 }
 
 function sendDeleteVideoChannel (videoChannel: VideoChannelInstance, t: Sequelize.Transaction) {
   const videoChannelObject = videoChannel.toActivityPubObject()
   const data = deleteActivityData(videoChannel.url, videoChannel.Account, videoChannelObject)
 
-  return broadcastToFollowers(data, t)
+  return broadcastToFollowers(data, videoChannel.Account, t)
 }
 
 function sendAddVideo (video: VideoInstance, t: Sequelize.Transaction) {
   const videoObject = video.toActivityPubObject()
   const data = addActivityData(video.url, video.VideoChannel.Account, video.VideoChannel.url, videoObject)
 
-  return broadcastToFollowers(data, t)
+  return broadcastToFollowers(data, video.VideoChannel.Account, t)
 }
 
 function sendUpdateVideo (video: VideoInstance, t: Sequelize.Transaction) {
   const videoObject = video.toActivityPubObject()
   const data = updateActivityData(video.url, video.VideoChannel.Account, videoObject)
 
-  return broadcastToFollowers(data, t)
+  return broadcastToFollowers(data, video.VideoChannel.Account, t)
 }
 
 function sendDeleteVideo (video: VideoInstance, t: Sequelize.Transaction) {
   const videoObject = video.toActivityPubObject()
   const data = deleteActivityData(video.url, video.VideoChannel.Account, videoObject)
 
-  return broadcastToFollowers(data, t)
+  return broadcastToFollowers(data, video.VideoChannel.Account, t)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-
+  sendCreateVideoChannel,
+  sendUpdateVideoChannel,
+  sendDeleteVideoChannel,
+  sendAddVideo,
+  sendUpdateVideo,
+  sendDeleteVideo
 }
 
 // ---------------------------------------------------------------------------
 
-function broadcastToFollowers (data: any, t: Sequelize.Transaction) {
-  return httpRequestJobScheduler.createJob(t, 'http-request', 'httpRequestBroadcastHandler', data)
+async function broadcastToFollowers (data: any, fromAccount: AccountInstance, t: Sequelize.Transaction) {
+  const result = await db.Account.listFollowerUrlsForApi(fromAccount.name, 0)
+
+  const jobPayload = {
+    uris: result.data,
+    body: data
+  }
+
+  return httpRequestJobScheduler.createJob(t, 'httpRequestBroadcastHandler', jobPayload)
 }
 
 function buildSignedActivity (byAccount: AccountInstance, data: Object) {
diff --git a/server/lib/cache/videos-preview-cache.ts b/server/lib/cache/videos-preview-cache.ts
index 791ad1cbf..776f647a0 100644
--- a/server/lib/cache/videos-preview-cache.ts
+++ b/server/lib/cache/videos-preview-cache.ts
@@ -3,9 +3,8 @@ import { join } from 'path'
 import { createWriteStream } from 'fs'
 
 import { database as db, CONFIG, CACHE } from '../../initializers'
-import { logger, unlinkPromise } from '../../helpers'
+import { logger, unlinkPromise, fetchRemoteVideoPreview } from '../../helpers'
 import { VideoInstance } from '../../models'
-import { fetchRemotePreview } from '../../lib'
 
 class VideosPreviewCache {
 
@@ -54,7 +53,7 @@ class VideosPreviewCache {
   }
 
   private saveRemotePreviewAndReturnPath (video: VideoInstance) {
-    const req = fetchRemotePreview(video)
+    const req = fetchRemoteVideoPreview(video)
 
     return new Promise<string>((res, rej) => {
       const path = join(CACHE.DIRECTORIES.PREVIEWS, video.getPreviewName())
diff --git a/server/lib/index.ts b/server/lib/index.ts
index bfb415ad2..d22ecb665 100644
--- a/server/lib/index.ts
+++ b/server/lib/index.ts
@@ -1,8 +1,6 @@
 export * from './activitypub'
 export * from './cache'
 export * from './jobs'
-export * from './request'
-export * from './friends'
 export * from './oauth-model'
 export * from './user'
 export * from './video-channel'
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 6b6946d02..799b86e1c 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
@@ -1,19 +1,28 @@
-import * as Bluebird from 'bluebird'
-
-import { database as db } from '../../../initializers/database'
 import { logger } from '../../../helpers'
+import { doRequest } from '../../../helpers/requests'
+import { HTTPRequestPayload } from './http-request-job-scheduler'
+
+async function process (payload: HTTPRequestPayload, jobId: number) {
+  logger.info('Processing broadcast in job %d.', jobId)
 
-async function process (data: { videoUUID: string }, jobId: number) {
+  const options = {
+    uri: '',
+    json: payload.body
+  }
 
+  for (const uri of payload.uris) {
+    options.uri = uri
+    await doRequest(options)
+  }
 }
 
 function onError (err: Error, jobId: number) {
-  logger.error('Error when optimized video file in job %d.', jobId, err)
+  logger.error('Error when broadcasting request in job %d.', jobId, err)
   return Promise.resolve()
 }
 
 async function onSuccess (jobId: number) {
-
+  logger.info('Job %d is a success.', jobId)
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/lib/jobs/http-request-job-scheduler/http-request-job-scheduler.ts b/server/lib/jobs/http-request-job-scheduler/http-request-job-scheduler.ts
index 42cb9139c..ad3349866 100644
--- a/server/lib/jobs/http-request-job-scheduler/http-request-job-scheduler.ts
+++ b/server/lib/jobs/http-request-job-scheduler/http-request-job-scheduler.ts
@@ -4,7 +4,11 @@ import * as httpRequestBroadcastHandler from './http-request-broadcast-handler'
 import * as httpRequestUnicastHandler from './http-request-unicast-handler'
 import { JobCategory } from '../../../../shared'
 
-const jobHandlers: { [ handlerName: string ]: JobHandler<any> } = {
+type HTTPRequestPayload = {
+  uris: string[]
+  body: any
+}
+const jobHandlers: { [ handlerName: string ]: JobHandler<HTTPRequestPayload, void> } = {
   httpRequestBroadcastHandler,
   httpRequestUnicastHandler
 }
@@ -13,5 +17,6 @@ const jobCategory: JobCategory = 'http-request'
 const httpRequestJobScheduler = new JobScheduler(jobCategory, jobHandlers)
 
 export {
+  HTTPRequestPayload,
   httpRequestJobScheduler
 }
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 6b6946d02..13451f042 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
@@ -1,19 +1,26 @@
-import * as Bluebird from 'bluebird'
-
-import { database as db } from '../../../initializers/database'
 import { logger } from '../../../helpers'
+import { doRequest } from '../../../helpers/requests'
+import { HTTPRequestPayload } from './http-request-job-scheduler'
+
+async function process (payload: HTTPRequestPayload, jobId: number) {
+  logger.info('Processing unicast in job %d.', jobId)
 
-async function process (data: { videoUUID: string }, jobId: number) {
+  const uri = payload.uris[0]
+  const options = {
+    uri,
+    json: payload.body
+  }
 
+  await doRequest(options)
 }
 
 function onError (err: Error, jobId: number) {
-  logger.error('Error when optimized video file in job %d.', jobId, err)
+  logger.error('Error when sending request in job %d.', jobId, err)
   return Promise.resolve()
 }
 
 async function onSuccess (jobId: number) {
-
+  logger.info('Job %d is a success.', jobId)
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/lib/jobs/job-scheduler.ts b/server/lib/jobs/job-scheduler.ts
index 89a4bca88..f10f745b3 100644
--- a/server/lib/jobs/job-scheduler.ts
+++ b/server/lib/jobs/job-scheduler.ts
@@ -1,28 +1,22 @@
 import { AsyncQueue, forever, queue } from 'async'
 import * as Sequelize from 'sequelize'
-
-import {
-  database as db,
-  JOBS_FETCHING_INTERVAL,
-  JOBS_FETCH_LIMIT_PER_CYCLE,
-  JOB_STATES
-} from '../../initializers'
+import { JobCategory } from '../../../shared'
 import { logger } from '../../helpers'
+import { database as db, JOB_STATES, JOBS_FETCH_LIMIT_PER_CYCLE, JOBS_FETCHING_INTERVAL } from '../../initializers'
 import { JobInstance } from '../../models'
-import { JobCategory } from '../../../shared'
 
-export interface JobHandler<T> {
-  process (data: object, jobId: number): T
+export interface JobHandler<P, T> {
+  process (data: object, jobId: number): Promise<T>
   onError (err: Error, jobId: number)
-  onSuccess (jobId: number, jobResult: T)
+  onSuccess (jobId: number, jobResult: T, jobScheduler: JobScheduler<P, T>)
 }
 type JobQueueCallback = (err: Error) => void
 
-class JobScheduler<T> {
+class JobScheduler<P, T> {
 
   constructor (
     private jobCategory: JobCategory,
-    private jobHandlers: { [ id: string ]: JobHandler<T> }
+    private jobHandlers: { [ id: string ]: JobHandler<P, T> }
   ) {}
 
   async activate () {
@@ -66,13 +60,14 @@ class JobScheduler<T> {
     )
   }
 
-  createJob (transaction: Sequelize.Transaction, category: JobCategory, handlerName: string, handlerInputData: object) {
+  createJob (transaction: Sequelize.Transaction, handlerName: string, handlerInputData: P) {
     const createQuery = {
       state: JOB_STATES.PENDING,
-      category,
+      category: this.jobCategory,
       handlerName,
       handlerInputData
     }
+
     const options = { transaction }
 
     return db.Job.create(createQuery, options)
@@ -95,7 +90,7 @@ class JobScheduler<T> {
     await job.save()
 
     try {
-      const result = await jobHandler.process(job.handlerInputData, job.id)
+      const result: T = await jobHandler.process(job.handlerInputData, job.id)
       await this.onJobSuccess(jobHandler, job, result)
     } catch (err) {
       logger.error('Error in job handler %s.', job.handlerName, err)
@@ -111,7 +106,7 @@ class JobScheduler<T> {
     callback(null)
   }
 
-  private async onJobError (jobHandler: JobHandler<any>, job: JobInstance, err: Error) {
+  private async onJobError (jobHandler: JobHandler<P, T>, job: JobInstance, err: Error) {
     job.state = JOB_STATES.ERROR
 
     try {
@@ -122,12 +117,12 @@ class JobScheduler<T> {
     }
   }
 
-  private async onJobSuccess (jobHandler: JobHandler<any>, job: JobInstance, jobResult: any) {
+  private async onJobSuccess (jobHandler: JobHandler<P, T>, job: JobInstance, jobResult: T) {
     job.state = JOB_STATES.SUCCESS
 
     try {
       await job.save()
-      jobHandler.onSuccess(job.id, jobResult)
+      jobHandler.onSuccess(job.id, jobResult, this)
     } catch (err) {
       this.cannotSaveJobError(err)
     }
diff --git a/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts b/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts
index d7c614fb8..c5efe8eeb 100644
--- a/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts
+++ b/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts
@@ -1,10 +1,14 @@
-import { JobScheduler, JobHandler } from '../job-scheduler'
-
+import { JobCategory } from '../../../../shared'
+import { JobHandler, JobScheduler } from '../job-scheduler'
 import * as videoFileOptimizer from './video-file-optimizer-handler'
 import * as videoFileTranscoder from './video-file-transcoder-handler'
-import { JobCategory } from '../../../../shared'
+import { VideoInstance } from '../../../models/video/video-interface'
 
-const jobHandlers: { [ handlerName: string ]: JobHandler<any> } = {
+type TranscodingJobPayload = {
+  videoUUID: string
+  resolution?: number
+}
+const jobHandlers: { [ handlerName: string ]: JobHandler<TranscodingJobPayload, VideoInstance> } = {
   videoFileOptimizer,
   videoFileTranscoder
 }
@@ -13,5 +17,6 @@ const jobCategory: JobCategory = 'transcoding'
 const transcodingJobScheduler = new JobScheduler(jobCategory, jobHandlers)
 
 export {
+  TranscodingJobPayload,
   transcodingJobScheduler
 }
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 f019c28bc..47603a66c 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
@@ -1,12 +1,13 @@
 import * as Bluebird from 'bluebird'
+import { computeResolutionsToTranscode, logger } from '../../../helpers'
 
 import { database as db } from '../../../initializers/database'
-import { logger, computeResolutionsToTranscode } from '../../../helpers'
 import { VideoInstance } from '../../../models'
-import { addVideoToFriends } from '../../friends'
+import { sendAddVideo } from '../../activitypub/send-request'
 import { JobScheduler } from '../job-scheduler'
+import { TranscodingJobPayload } from './transcoding-job-scheduler'
 
-async function process (data: { videoUUID: string }, jobId: number) {
+async function process (data: TranscodingJobPayload, jobId: number) {
   const video = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(data.videoUUID)
   // No video, maybe deleted?
   if (!video) {
@@ -24,7 +25,7 @@ function onError (err: Error, jobId: number) {
   return Promise.resolve()
 }
 
-async function onSuccess (jobId: number, video: VideoInstance) {
+async function onSuccess (jobId: number, video: VideoInstance, jobScheduler: JobScheduler<TranscodingJobPayload, VideoInstance>) {
   if (video === undefined) return undefined
 
   logger.info('Job %d is a success.', jobId)
@@ -34,10 +35,8 @@ async function onSuccess (jobId: number, video: VideoInstance) {
   // Video does not exist anymore
   if (!videoDatabase) return undefined
 
-  const remoteVideo = await videoDatabase.toAddRemoteJSON()
-
-  // Now we'll add the video's meta data to our friends
-  await addVideoToFriends(remoteVideo, null)
+  // Now we'll add the video's meta data to our followers
+  await sendAddVideo(video, undefined)
 
   const originalFileHeight = await videoDatabase.getOriginalFileHeight()
   // Create transcoding jobs if there are enabled resolutions
@@ -59,7 +58,7 @@ async function onSuccess (jobId: number, video: VideoInstance) {
             resolution
           }
 
-          const p = JobScheduler.Instance.createJob(t, 'videoFileTranscoder', dataInput)
+          const p = jobScheduler.createJob(t, 'videoFileTranscoder', dataInput)
           tasks.push(p)
         }
 
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts
index 397b95795..77e5d9f7f 100644
--- a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts
+++ b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts
@@ -1,8 +1,8 @@
-import { database as db } from '../../../initializers/database'
-import { updateVideoToFriends } from '../../friends'
+import { VideoResolution } from '../../../../shared'
 import { logger } from '../../../helpers'
+import { database as db } from '../../../initializers/database'
 import { VideoInstance } from '../../../models'
-import { VideoResolution } from '../../../../shared'
+import { sendUpdateVideo } from '../../activitypub/send-request'
 
 async function process (data: { videoUUID: string, resolution: VideoResolution }, jobId: number) {
   const video = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(data.videoUUID)
@@ -32,10 +32,7 @@ async function onSuccess (jobId: number, video: VideoInstance) {
   // Video does not exist anymore
   if (!videoDatabase) return undefined
 
-  const remoteVideo = videoDatabase.toUpdateRemoteJSON()
-
-  // Now we'll add the video's meta data to our friends
-  await updateVideoToFriends(remoteVideo, null)
+  await sendUpdateVideo(video, undefined)
 
   return undefined
 }
diff --git a/server/lib/request/abstract-request-scheduler.ts b/server/lib/request/abstract-request-scheduler.ts
deleted file mode 100644
index f838c47f2..000000000
--- a/server/lib/request/abstract-request-scheduler.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import { isEmpty } from 'lodash'
-import * as Bluebird from 'bluebird'
-
-import { database as db } from '../../initializers/database'
-import { logger, makeSecureRequest } from '../../helpers'
-import { AbstractRequestClass, AbstractRequestToPodClass, PodInstance } from '../../models'
-import {
-  API_VERSION,
-  REQUESTS_IN_PARALLEL,
-  REQUESTS_INTERVAL
-} from '../../initializers'
-
-interface RequestsObjects<U> {
-  [ id: string ]: {
-    toPod: PodInstance
-    endpoint: string
-    ids: number[] // ids
-    datas: U[]
-  }
-}
-
-abstract class AbstractRequestScheduler <T> {
-  requestInterval: number
-  limitPods: number
-  limitPerPod: number
-
-  protected lastRequestTimestamp: number
-  protected timer: NodeJS.Timer
-  protected description: string
-
-  constructor () {
-    this.lastRequestTimestamp = 0
-    this.timer = null
-    this.requestInterval = REQUESTS_INTERVAL
-  }
-
-  abstract getRequestModel (): AbstractRequestClass<T>
-  abstract getRequestToPodModel (): AbstractRequestToPodClass
-  abstract buildRequestsObjects (requestsGrouped: T): RequestsObjects<any>
-
-  activate () {
-    logger.info('Requests scheduler activated.')
-    this.lastRequestTimestamp = Date.now()
-
-    this.timer = setInterval(() => {
-      this.lastRequestTimestamp = Date.now()
-      this.makeRequests()
-    }, this.requestInterval)
-  }
-
-  deactivate () {
-    logger.info('Requests scheduler deactivated.')
-    clearInterval(this.timer)
-    this.timer = null
-  }
-
-  forceSend () {
-    logger.info('Force requests scheduler sending.')
-    this.makeRequests()
-  }
-
-  remainingMilliSeconds () {
-    if (this.timer === null) return -1
-
-    return REQUESTS_INTERVAL - (Date.now() - this.lastRequestTimestamp)
-  }
-
-  remainingRequestsCount () {
-    return this.getRequestModel().countTotalRequests()
-  }
-
-  flush () {
-    return this.getRequestModel().removeAll()
-  }
-
-  // ---------------------------------------------------------------------------
-
-  // Make a requests to friends of a certain type
-  protected async makeRequest (toPod: PodInstance, requestEndpoint: string, requestsToMake: any) {
-    const params = {
-      toPod: toPod,
-      method: 'POST' as 'POST',
-      path: '/api/' + API_VERSION + '/remote/' + requestEndpoint,
-      data: requestsToMake // Requests we need to make
-    }
-
-    // Make multiple retry requests to all of pods
-    // The function fire some useful callbacks
-    try {
-      const { response } = await makeSecureRequest(params)
-
-      // 400 because if the other pod is not up to date, it may not understand our request
-      if ([ 200, 201, 204, 400 ].indexOf(response.statusCode) === -1) {
-        throw new Error('Status code not 20x or 400 : ' + response.statusCode)
-      }
-    } catch (err) {
-      logger.error('Error sending secure request to %s pod.', toPod.host, err)
-
-      throw err
-    }
-  }
-
-    // Make all the requests of the scheduler
-  protected async makeRequests () {
-    let requestsGrouped: T
-
-    try {
-      requestsGrouped = await this.getRequestModel().listWithLimitAndRandom(this.limitPods, this.limitPerPod)
-    } catch (err) {
-      logger.error('Cannot get the list of "%s".', this.description, { error: err.stack })
-      throw err
-    }
-
-    // We want to group requests by destinations pod and endpoint
-    const requestsToMake = this.buildRequestsObjects(requestsGrouped)
-
-    // If there are no requests, abort
-    if (isEmpty(requestsToMake) === true) {
-      logger.info('No "%s" to make.', this.description)
-      return { goodPods: [], badPods: [] }
-    }
-
-    logger.info('Making "%s" to friends.', this.description)
-
-    const goodPods: number[] = []
-    const badPods: number[] = []
-
-    await Bluebird.map(Object.keys(requestsToMake), async hashKey => {
-      const requestToMake = requestsToMake[hashKey]
-      const toPod: PodInstance = requestToMake.toPod
-
-      try {
-        await this.makeRequest(toPod, requestToMake.endpoint, requestToMake.datas)
-        logger.debug('Removing requests for pod %s.', requestToMake.toPod.id, { requestsIds: requestToMake.ids })
-        goodPods.push(requestToMake.toPod.id)
-
-        this.afterRequestHook()
-
-        // Remove the pod id of these request ids
-        await this.getRequestToPodModel()
-          .removeByRequestIdsAndPod(requestToMake.ids, requestToMake.toPod.id)
-      } catch (err) {
-        badPods.push(requestToMake.toPod.id)
-        logger.info('Cannot make request to %s.', toPod.host, err)
-      }
-    }, { concurrency: REQUESTS_IN_PARALLEL })
-
-    this.afterRequestsHook()
-
-    // All the requests were made, we update the pods score
-    db.Pod.updatePodsScore(goodPods, badPods)
-  }
-
-  protected afterRequestHook () {
-   // Nothing to do, let children re-implement it
-  }
-
-  protected afterRequestsHook () {
-   // Nothing to do, let children re-implement it
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  AbstractRequestScheduler,
-  RequestsObjects
-}
diff --git a/server/lib/request/index.ts b/server/lib/request/index.ts
deleted file mode 100644
index 47d60e5b4..000000000
--- a/server/lib/request/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './abstract-request-scheduler'
-export * from './request-scheduler'
-export * from './request-video-event-scheduler'
-export * from './request-video-qadu-scheduler'
diff --git a/server/lib/request/request-scheduler.ts b/server/lib/request/request-scheduler.ts
deleted file mode 100644
index c3f7f6429..000000000
--- a/server/lib/request/request-scheduler.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import * as Sequelize from 'sequelize'
-
-import { database as db } from '../../initializers/database'
-import { AbstractRequestScheduler, RequestsObjects } from './abstract-request-scheduler'
-import { logger } from '../../helpers'
-import { REQUESTS_LIMIT_PODS, REQUESTS_LIMIT_PER_POD } from '../../initializers'
-import { RequestsGrouped } from '../../models'
-import { RequestEndpoint, RemoteVideoRequest } from '../../../shared'
-
-export type RequestSchedulerOptions = {
-  type: string
-  endpoint: RequestEndpoint
-  data: Object
-  toIds: number[]
-  transaction: Sequelize.Transaction
-}
-
-class RequestScheduler extends AbstractRequestScheduler<RequestsGrouped> {
-  constructor () {
-    super()
-
-    // We limit the size of the requests
-    this.limitPods = REQUESTS_LIMIT_PODS
-    this.limitPerPod = REQUESTS_LIMIT_PER_POD
-
-    this.description = 'requests'
-  }
-
-  getRequestModel () {
-    return db.Request
-  }
-
-  getRequestToPodModel () {
-    return db.RequestToPod
-  }
-
-  buildRequestsObjects (requestsGrouped: RequestsGrouped) {
-    const requestsToMakeGrouped: RequestsObjects<RemoteVideoRequest> = {}
-
-    for (const toPodId of Object.keys(requestsGrouped)) {
-      for (const data of requestsGrouped[toPodId]) {
-        const request = data.request
-        const pod = data.pod
-        const hashKey = toPodId + request.endpoint
-
-        if (!requestsToMakeGrouped[hashKey]) {
-          requestsToMakeGrouped[hashKey] = {
-            toPod: pod,
-            endpoint: request.endpoint,
-            ids: [], // request ids, to delete them from the DB in the future
-            datas: [] // requests data,
-          }
-        }
-
-        requestsToMakeGrouped[hashKey].ids.push(request.id)
-        requestsToMakeGrouped[hashKey].datas.push(request.request)
-      }
-    }
-
-    return requestsToMakeGrouped
-  }
-
-  async createRequest ({ type, endpoint, data, toIds, transaction }: RequestSchedulerOptions) {
-    // If there are no destination pods abort
-    if (toIds.length === 0) return undefined
-
-    const createQuery = {
-      endpoint,
-      request: {
-        type: type,
-        data: data
-      }
-    }
-
-    const dbRequestOptions: Sequelize.CreateOptions = {
-      transaction
-    }
-
-    const request = await db.Request.create(createQuery, dbRequestOptions)
-    await request.setPods(toIds, dbRequestOptions)
-  }
-
-  // ---------------------------------------------------------------------------
-
-  afterRequestsHook () {
-    // Flush requests with no pod
-    this.getRequestModel().removeWithEmptyTo()
-      .catch(err => logger.error('Error when removing requests with no pods.', err))
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  RequestScheduler
-}
diff --git a/server/lib/request/request-video-event-scheduler.ts b/server/lib/request/request-video-event-scheduler.ts
deleted file mode 100644
index 5f21287f0..000000000
--- a/server/lib/request/request-video-event-scheduler.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import * as Sequelize from 'sequelize'
-
-import { database as db } from '../../initializers/database'
-import { AbstractRequestScheduler, RequestsObjects } from './abstract-request-scheduler'
-import {
-  REQUESTS_VIDEO_EVENT_LIMIT_PODS,
-  REQUESTS_VIDEO_EVENT_LIMIT_PER_POD,
-  REQUEST_VIDEO_EVENT_ENDPOINT
-} from '../../initializers'
-import { RequestsVideoEventGrouped } from '../../models'
-import { RequestVideoEventType, RemoteVideoEventRequest, RemoteVideoEventType } from '../../../shared'
-
-export type RequestVideoEventSchedulerOptions = {
-  type: RequestVideoEventType
-  videoId: number
-  count?: number
-  transaction?: Sequelize.Transaction
-}
-
-class RequestVideoEventScheduler extends AbstractRequestScheduler<RequestsVideoEventGrouped> {
-  constructor () {
-    super()
-
-    // We limit the size of the requests
-    this.limitPods = REQUESTS_VIDEO_EVENT_LIMIT_PODS
-    this.limitPerPod = REQUESTS_VIDEO_EVENT_LIMIT_PER_POD
-
-    this.description = 'video event requests'
-  }
-
-  getRequestModel () {
-    return db.RequestVideoEvent
-  }
-
-  getRequestToPodModel () {
-    return db.RequestVideoEvent
-  }
-
-  buildRequestsObjects (eventRequests: RequestsVideoEventGrouped) {
-    const requestsToMakeGrouped: RequestsObjects<RemoteVideoEventRequest> = {}
-
-    /* Example:
-        {
-          pod1: {
-            video1: { views: 4, likes: 5 },
-            video2: { likes: 5 }
-          }
-        }
-    */
-    const eventsPerVideoPerPod: {
-      [ podId: string ]: {
-        [ videoUUID: string ]: {
-          views?: number
-          likes?: number
-          dislikes?: number
-        }
-      }
-    } = {}
-
-    // We group video events per video and per pod
-    // We add the counts of the same event types
-    for (const toPodId of Object.keys(eventRequests)) {
-      for (const eventToProcess of eventRequests[toPodId]) {
-        if (!eventsPerVideoPerPod[toPodId]) eventsPerVideoPerPod[toPodId] = {}
-
-        if (!requestsToMakeGrouped[toPodId]) {
-          requestsToMakeGrouped[toPodId] = {
-            toPod: eventToProcess.pod,
-            endpoint: REQUEST_VIDEO_EVENT_ENDPOINT,
-            ids: [], // request ids, to delete them from the DB in the future
-            datas: [] // requests data
-          }
-        }
-        requestsToMakeGrouped[toPodId].ids.push(eventToProcess.id)
-
-        const eventsPerVideo = eventsPerVideoPerPod[toPodId]
-        const uuid = eventToProcess.video.uuid
-        if (!eventsPerVideo[uuid]) eventsPerVideo[uuid] = {}
-
-        const events = eventsPerVideo[uuid]
-        if (!events[eventToProcess.type]) events[eventToProcess.type] = 0
-
-        events[eventToProcess.type] += eventToProcess.count
-      }
-    }
-
-    // Now we build our requests array per pod
-    for (const toPodId of Object.keys(eventsPerVideoPerPod)) {
-      const eventsForPod = eventsPerVideoPerPod[toPodId]
-
-      for (const uuid of Object.keys(eventsForPod)) {
-        const eventsForVideo = eventsForPod[uuid]
-
-        for (const eventType of Object.keys(eventsForVideo)) {
-          requestsToMakeGrouped[toPodId].datas.push({
-            data: {
-              uuid,
-              eventType: eventType as RemoteVideoEventType,
-              count: +eventsForVideo[eventType]
-            }
-          })
-        }
-      }
-    }
-
-    return requestsToMakeGrouped
-  }
-
-  createRequest ({ type, videoId, count, transaction }: RequestVideoEventSchedulerOptions) {
-    if (count === undefined) count = 1
-
-    const dbRequestOptions: Sequelize.CreateOptions = {}
-    if (transaction) dbRequestOptions.transaction = transaction
-
-    const createQuery = {
-      type,
-      count,
-      videoId
-    }
-
-    return db.RequestVideoEvent.create(createQuery, dbRequestOptions)
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  RequestVideoEventScheduler
-}
diff --git a/server/lib/request/request-video-qadu-scheduler.ts b/server/lib/request/request-video-qadu-scheduler.ts
deleted file mode 100644
index 24ee59d29..000000000
--- a/server/lib/request/request-video-qadu-scheduler.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import * as Sequelize from 'sequelize'
-
-import { database as db } from '../../initializers/database'
-import { AbstractRequestScheduler, RequestsObjects } from './abstract-request-scheduler'
-import { logger } from '../../helpers'
-import {
-  REQUESTS_VIDEO_QADU_LIMIT_PODS,
-  REQUESTS_VIDEO_QADU_LIMIT_PER_POD,
-  REQUEST_VIDEO_QADU_ENDPOINT,
-  REQUEST_VIDEO_QADU_TYPES
-} from '../../initializers'
-import { RequestsVideoQaduGrouped, PodInstance } from '../../models'
-import { RemoteQaduVideoRequest, RequestVideoQaduType } from '../../../shared'
-
-// We create a custom interface because we need "videos" attribute for our computations
-interface RequestsObjectsCustom<U> extends RequestsObjects<U> {
-  [ id: string ]: {
-    toPod: PodInstance
-    endpoint: string
-    ids: number[] // ids
-    datas: U[]
-
-    videos: {
-      [ uuid: string ]: {
-        uuid: string
-        likes?: number
-        dislikes?: number
-        views?: number
-      }
-    }
-  }
-}
-
-export type RequestVideoQaduSchedulerOptions = {
-  type: RequestVideoQaduType
-  videoId: number
-  transaction?: Sequelize.Transaction
-}
-
-class RequestVideoQaduScheduler extends AbstractRequestScheduler<RequestsVideoQaduGrouped> {
-  constructor () {
-    super()
-
-    // We limit the size of the requests
-    this.limitPods = REQUESTS_VIDEO_QADU_LIMIT_PODS
-    this.limitPerPod = REQUESTS_VIDEO_QADU_LIMIT_PER_POD
-
-    this.description = 'video QADU requests'
-  }
-
-  getRequestModel () {
-    return db.RequestVideoQadu
-  }
-
-  getRequestToPodModel () {
-    return db.RequestVideoQadu
-  }
-
-  buildRequestsObjects (requests: RequestsVideoQaduGrouped) {
-    const requestsToMakeGrouped: RequestsObjectsCustom<RemoteQaduVideoRequest> = {}
-
-    for (const toPodId of Object.keys(requests)) {
-      for (const data of requests[toPodId]) {
-        const request = data.request
-        const video = data.video
-        const pod = data.pod
-        const hashKey = toPodId
-
-        if (!requestsToMakeGrouped[hashKey]) {
-          requestsToMakeGrouped[hashKey] = {
-            toPod: pod,
-            endpoint: REQUEST_VIDEO_QADU_ENDPOINT,
-            ids: [], // request ids, to delete them from the DB in the future
-            datas: [], // requests data
-            videos: {}
-          }
-        }
-
-        // Maybe another attribute was filled for this video
-        let videoData = requestsToMakeGrouped[hashKey].videos[video.id]
-        if (!videoData) videoData = { uuid: null }
-
-        switch (request.type) {
-        case REQUEST_VIDEO_QADU_TYPES.LIKES:
-          videoData.likes = video.likes
-          break
-
-        case REQUEST_VIDEO_QADU_TYPES.DISLIKES:
-          videoData.dislikes = video.dislikes
-          break
-
-        case REQUEST_VIDEO_QADU_TYPES.VIEWS:
-          videoData.views = video.views
-          break
-
-        default:
-          logger.error('Unknown request video QADU type %s.', request.type)
-          return undefined
-        }
-
-        // Do not forget the uuid so the remote pod can identify the video
-        videoData.uuid = video.uuid
-        requestsToMakeGrouped[hashKey].ids.push(request.id)
-
-        // Maybe there are multiple quick and dirty update for the same video
-        // We use this hash map to dedupe them
-        requestsToMakeGrouped[hashKey].videos[video.id] = videoData
-      }
-    }
-
-    // Now we deduped similar quick and dirty updates, we can build our requests data
-    for (const hashKey of Object.keys(requestsToMakeGrouped)) {
-      for (const videoUUID of Object.keys(requestsToMakeGrouped[hashKey].videos)) {
-        const videoData = requestsToMakeGrouped[hashKey].videos[videoUUID]
-
-        requestsToMakeGrouped[hashKey].datas.push({
-          data: videoData
-        })
-      }
-
-      // We don't need it anymore, it was just to build our data array
-      delete requestsToMakeGrouped[hashKey].videos
-    }
-
-    return requestsToMakeGrouped
-  }
-
-  async createRequest ({ type, videoId, transaction }: RequestVideoQaduSchedulerOptions) {
-    const dbRequestOptions: Sequelize.BulkCreateOptions = {}
-    if (transaction) dbRequestOptions.transaction = transaction
-
-    // Send the update to all our friends
-    const podIds = await db.Pod.listAllIds(transaction)
-    const queries = []
-    for (const podId of podIds) {
-      queries.push({ type, videoId, podId })
-    }
-
-    await db.RequestVideoQadu.bulkCreate(queries, dbRequestOptions)
-    return undefined
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  RequestVideoQaduScheduler
-}
diff --git a/server/lib/user.ts b/server/lib/user.ts
index 57c653e55..1094c2401 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,6 +1,9 @@
+import * as Sequelize from 'sequelize'
+import { getActivityPubUrl } from '../helpers/activitypub'
+import { createPrivateAndPublicKeys } from '../helpers/peertube-crypto'
 import { database as db } from '../initializers'
+import { CONFIG } from '../initializers/constants'
 import { UserInstance } from '../models'
-import { addVideoAccountToFriends } from './friends'
 import { createVideoChannel } from './video-channel'
 
 async function createUserAccountAndChannel (user: UserInstance, validateUser = true) {
@@ -11,32 +14,46 @@ async function createUserAccountAndChannel (user: UserInstance, validateUser = t
     }
 
     const userCreated = await user.save(userOptions)
-    const accountInstance = db.Account.build({
-      name: userCreated.username,
-      podId: null, // It is our pod
-      userId: userCreated.id
-    })
-
-    const accountCreated = await accountInstance.save({ transaction: t })
-
-    const remoteVideoAccount = accountCreated.toAddRemoteJSON()
-
-    // Now we'll add the video channel's meta data to our friends
-    const account = await addVideoAccountToFriends(remoteVideoAccount, t)
+    const accountCreated = await createLocalAccount(user.username, user.id, null, t)
 
     const videoChannelInfo = {
       name: `Default ${userCreated.username} channel`
     }
     const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
 
-    return { account, videoChannel }
+    return { account: accountCreated, videoChannel }
   })
 
   return res
 }
 
+async function createLocalAccount (name: string, userId: number, applicationId: number, t: Sequelize.Transaction) {
+  const { publicKey, privateKey } = await createPrivateAndPublicKeys()
+  const url = getActivityPubUrl('account', name)
+
+  const accountInstance = db.Account.build({
+    name,
+    url,
+    publicKey,
+    privateKey,
+    followersCount: 0,
+    followingCount: 0,
+    inboxUrl: url + '/inbox',
+    outboxUrl: url + '/outbox',
+    sharedInboxUrl: CONFIG.WEBSERVER.URL + '/inbox',
+    followersUrl: url + '/followers',
+    followingUrl: url + '/following',
+    userId,
+    applicationId,
+    podId: null // It is our pod
+  })
+
+  return accountInstance.save({ transaction: t })
+}
+
 // ---------------------------------------------------------------------------
 
 export {
-  createUserAccountAndChannel
+  createUserAccountAndChannel,
+  createLocalAccount
 }
diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index f81383ce8..459d9d4a8 100644
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,10 +1,10 @@
 import * as Sequelize from 'sequelize'
 
-import { addVideoChannelToFriends } from './friends'
 import { database as db } from '../initializers'
 import { logger } from '../helpers'
 import { AccountInstance } from '../models'
 import { VideoChannelCreate } from '../../shared/models'
+import { sendCreateVideoChannel } from './activitypub/send-request'
 
 async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) {
   const videoChannelData = {
@@ -22,10 +22,7 @@ async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account
   // Do not forget to add Account information to the created video channel
   videoChannelCreated.Account = account
 
-  const remoteVideoChannel = videoChannelCreated.toAddRemoteJSON()
-
-  // Now we'll add the video channel's meta data to our friends
-  await addVideoChannelToFriends(remoteVideoChannel, t)
+  sendCreateVideoChannel(videoChannelCreated, t)
 
   return videoChannelCreated
 }