Reorganize imports

[github/Chocobozzz/PeerTube.git] / server / controllers / api / server / follows.ts

diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts
index 23823c9fb2f2aa1a0577b82ed6b113f7962b8f41..e6f4f6b92f5cb0ceb9320ef3ece96790f33148a4 100644 (file)
--- a/server/controllers/api/server/follows.ts
+++ b/server/controllers/api/server/follows.ts
@@ -1,9 +1,15 @@
 import * as express from 'express'
+import { getServerActor } from '@server/models/application/application'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
 import { UserRight } from '../../../../shared/models/users'
 import { logger } from '../../../helpers/logger'
 import { getFormattedObjects } from '../../../helpers/utils'
 import { SERVER_ACTOR_NAME } from '../../../initializers/constants'
+import { sequelizeTypescript } from '../../../initializers/database'
+import { autoFollowBackIfNeeded } from '../../../lib/activitypub/follow'
 import { sendAccept, sendReject, sendUndoFollow } from '../../../lib/activitypub/send'
+import { JobQueue } from '../../../lib/job-queue'
+import { removeRedundanciesOfServer } from '../../../lib/redundancy'
 import {
   asyncMiddleware,
   authenticate,
@@ -19,15 +25,10 @@ import {
   followingSortValidator,
   followValidator,
   getFollowerValidator,
-  removeFollowingValidator,
-  listFollowsValidator
+  listFollowsValidator,
+  removeFollowingValidator
 } from '../../../middlewares/validators'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { JobQueue } from '../../../lib/job-queue'
-import { removeRedundanciesOfServer } from '../../../lib/redundancy'
-import { sequelizeTypescript } from '../../../initializers/database'
-import { autoFollowBackIfNeeded } from '../../../lib/activitypub/follow'
-import { getServerActor } from '@server/models/application/application'
+import { ActorFollowModel } from '../../../models/actor/actor-follow'
 
 const serverFollowsRouter = express.Router()
 serverFollowsRouter.get('/following',
@@ -138,7 +139,7 @@ async function followInstance (req: express.Request, res: express.Response) {
     JobQueue.Instance.createJob({ type: 'activitypub-follow', payload })
   }
 
-  return res.status(204).end()
+  return res.status(HttpStatusCode.NO_CONTENT_204).end()
 }
 
 async function removeFollowing (req: express.Request, res: express.Response) {
@@ -159,28 +160,28 @@ async function removeFollowing (req: express.Request, res: express.Response) {
     await follow.destroy({ transaction: t })
   })
 
-  return res.status(204).end()
+  return res.status(HttpStatusCode.NO_CONTENT_204).end()
 }
 
 async function removeOrRejectFollower (req: express.Request, res: express.Response) {
   const follow = res.locals.follow
 
-  await sendReject(follow.ActorFollower, follow.ActorFollowing)
+  await sendReject(follow.url, follow.ActorFollower, follow.ActorFollowing)
 
   await follow.destroy()
 
-  return res.status(204).end()
+  return res.status(HttpStatusCode.NO_CONTENT_204).end()
 }
 
 async function acceptFollower (req: express.Request, res: express.Response) {
   const follow = res.locals.follow
 
-  await sendAccept(follow)
+  sendAccept(follow)
 
   follow.state = 'accepted'
   await follow.save()
 
   await autoFollowBackIfNeeded(follow)
 
-  return res.status(204).end()
+  return res.status(HttpStatusCode.NO_CONTENT_204).end()
 }