X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fserver%2Ffollows.ts;h=9fa6c34ba3315eb66fc144fff6bcab4a2f0571dd;hb=e65c0c5b1fab9c3d93f51721b2458cf5cf471f20;hp=4a0a44cd395f7959e0ec8433f5dffa8c107034b4;hpb=1ee48d19036199169eca061f1ecccd2f2c8fd359;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts
index 4a0a44cd3..9fa6c34ba 100644
--- a/server/controllers/api/server/follows.ts
+++ b/server/controllers/api/server/follows.ts
@@ -1,20 +1,23 @@
 import * as express from 'express'
 import { UserRight } from '../../../../shared/models/users'
-import { sanitizeHost } from '../../../helpers/core-utils'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
 import { logger } from '../../../helpers/logger'
 import { getFormattedObjects, getServerActor } from '../../../helpers/utils'
-import { loadActorUrlOrGetFromWebfinger } from '../../../helpers/webfinger'
-import { REMOTE_SCHEME, sequelizeTypescript, SERVER_ACTOR_NAME } from '../../../initializers'
-import { getOrCreateActorAndServerAndModel } from '../../../lib/activitypub/actor'
-import { sendFollow, sendUndoFollow } from '../../../lib/activitypub/send'
+import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../../../initializers'
+import { sendUndoFollow } from '../../../lib/activitypub/send'
 import {
-  asyncMiddleware, authenticate, ensureUserHasRight, paginationValidator, removeFollowingValidator, setBodyHostsPort, setDefaultSort,
-  setDefaultPagination
+  asyncMiddleware,
+  authenticate,
+  ensureUserHasRight,
+  paginationValidator,
+  removeFollowingValidator,
+  setBodyHostsPort,
+  setDefaultPagination,
+  setDefaultSort
 } from '../../../middlewares'
 import { followersSortValidator, followingSortValidator, followValidator } from '../../../middlewares/validators'
-import { ActorModel } from '../../../models/activitypub/actor'
 import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+import { JobQueue } from '../../../lib/job-queue'
+import { removeRedundancyOf } from '../../../lib/redundancy'
 
 const serverFollowsRouter = express.Router()
 serverFollowsRouter.get('/following',
@@ -30,7 +33,7 @@ serverFollowsRouter.post('/following',
   ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
   followValidator,
   setBodyHostsPort,
-  asyncMiddleware(followRetry)
+  asyncMiddleware(followInstance)
 )
 
 serverFollowsRouter.delete('/following/:host',
@@ -58,93 +61,65 @@ export {
 
 async function listFollowing (req: express.Request, res: express.Response, next: express.NextFunction) {
   const serverActor = await getServerActor()
-  const resultList = await ActorFollowModel.listFollowingForApi(serverActor.id, req.query.start, req.query.count, req.query.sort)
+  const resultList = await ActorFollowModel.listFollowingForApi(
+    serverActor.id,
+    req.query.start,
+    req.query.count,
+    req.query.sort,
+    req.query.search
+  )
 
   return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 
 async function listFollowers (req: express.Request, res: express.Response, next: express.NextFunction) {
   const serverActor = await getServerActor()
-  const resultList = await ActorFollowModel.listFollowersForApi(serverActor.id, req.query.start, req.query.count, req.query.sort)
+  const resultList = await ActorFollowModel.listFollowersForApi(
+    serverActor.id,
+    req.query.start,
+    req.query.count,
+    req.query.sort,
+    req.query.search
+  )
 
   return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 
-async function followRetry (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function followInstance (req: express.Request, res: express.Response, next: express.NextFunction) {
   const hosts = req.body.hosts as string[]
-  const fromActor = await getServerActor()
-
-  const tasks: Promise<any>[] = []
-  const actorName = SERVER_ACTOR_NAME
+  const follower = await getServerActor()
 
   for (const host of hosts) {
-    const sanitizedHost = sanitizeHost(host, REMOTE_SCHEME.HTTP)
-
-    // We process each host in a specific transaction
-    // First, we add the follow request in the database
-    // Then we send the follow request to other actor
-    const p = loadActorUrlOrGetFromWebfinger(actorName, sanitizedHost)
-      .then(actorUrl => getOrCreateActorAndServerAndModel(actorUrl))
-      .then(targetActor => {
-        const options = {
-          arguments: [ fromActor, targetActor ],
-          errorMessage: 'Cannot follow with many retries.'
-        }
-
-        return retryTransactionWrapper(follow, options)
-      })
-      .catch(err => logger.warn('Cannot follow server %s.', sanitizedHost, err))
-
-    tasks.push(p)
+    const payload = {
+      host,
+      name: SERVER_ACTOR_NAME,
+      followerActorId: follower.id
+    }
+
+    JobQueue.Instance.createJob({ type: 'activitypub-follow', payload })
+      .catch(err => logger.error('Cannot create follow job for %s.', host, err))
   }
 
-  // Don't make the client wait the tasks
-  Promise.all(tasks)
-    .catch(err => logger.error('Error in follow.', err))
-
   return res.status(204).end()
 }
 
-function follow (fromActor: ActorModel, targetActor: ActorModel) {
-  if (fromActor.id === targetActor.id) {
-    throw new Error('Follower is the same than target actor.')
-  }
-
-  return sequelizeTypescript.transaction(async t => {
-    const [ actorFollow ] = await ActorFollowModel.findOrCreate({
-      where: {
-        actorId: fromActor.id,
-        targetActorId: targetActor.id
-      },
-      defaults: {
-        state: 'pending',
-        actorId: fromActor.id,
-        targetActorId: targetActor.id
-      },
-      transaction: t
-    })
-    actorFollow.ActorFollowing = targetActor
-    actorFollow.ActorFollower = fromActor
-
-    // Send a notification to remote server
-    await sendFollow(actorFollow)
-  })
-}
-
 async function removeFollow (req: express.Request, res: express.Response, next: express.NextFunction) {
   const follow: ActorFollowModel = res.locals.follow
 
   await sequelizeTypescript.transaction(async t => {
     if (follow.state === 'accepted') await sendUndoFollow(follow, t)
 
+    // Disable redundancy on unfollowed instances
+    const server = follow.ActorFollowing.Server
+    server.redundancyAllowed = false
+    await server.save({ transaction: t })
+
+    // Async, could be long
+    removeRedundancyOf(server.id)
+      .catch(err => logger.error('Cannot remove redundancy of %s.', server.host, err))
+
     await follow.destroy({ transaction: t })
   })
 
-  // Destroy the actor that will destroy video channels, videos and video files too
-  // This could be long so don't wait this task
-  const following = follow.ActorFollowing
-  following.destroy()
-    .catch(err => logger.error('Cannot destroy actor that we do not follow anymore %s.', following.url, err))
-
   return res.status(204).end()
 }