import { UserRight } from '../../../../shared/models/users'
import { logger } from '../../../helpers/logger'
import { getFormattedObjects, getServerActor } from '../../../helpers/utils'
-import { sequelizeTypescript } from '../../../initializers'
-import { sendUndoFollow } from '../../../lib/activitypub/send'
+import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../../../initializers'
+import { sendReject, sendUndoFollow } from '../../../lib/activitypub/send'
import {
asyncMiddleware,
authenticate,
ensureUserHasRight,
paginationValidator,
- removeFollowingValidator,
setBodyHostsPort,
setDefaultPagination,
setDefaultSort
} from '../../../middlewares'
-import { followersSortValidator, followingSortValidator, followValidator } from '../../../middlewares/validators'
+import {
+ followersSortValidator,
+ followingSortValidator,
+ followValidator,
+ removeFollowerValidator,
+ removeFollowingValidator
+} from '../../../middlewares/validators'
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',
authenticate,
ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
asyncMiddleware(removeFollowingValidator),
- asyncMiddleware(removeFollow)
+ asyncMiddleware(removeFollowing)
)
serverFollowsRouter.get('/followers',
asyncMiddleware(listFollowers)
)
+serverFollowsRouter.delete('/followers/:nameWithHost',
+ authenticate,
+ ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
+ asyncMiddleware(removeFollowerValidator),
+ asyncMiddleware(removeFollower)
+)
+
// ---------------------------------------------------------------------------
export {
// ---------------------------------------------------------------------------
-async function listFollowing (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function listFollowing (req: express.Request, res: express.Response) {
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) {
+async function listFollowers (req: express.Request, res: express.Response) {
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 followInstance (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function followInstance (req: express.Request, res: express.Response) {
const hosts = req.body.hosts as string[]
+ const follower = await getServerActor()
for (const host of hosts) {
- JobQueue.Instance.createJob({ type: 'activitypub-follow', payload: { host } })
+ 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))
}
return res.status(204).end()
}
-async function removeFollow (req: express.Request, res: express.Response, next: express.NextFunction) {
- const follow: ActorFollowModel = res.locals.follow
+async function removeFollowing (req: express.Request, res: express.Response) {
+ const follow = 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()
+}
+
+async function removeFollower (req: express.Request, res: express.Response) {
+ const follow = res.locals.follow
+
+ await sendReject(follow)
+
+ await follow.destroy()
return res.status(204).end()
}