yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Add ability to remove an instance follower in API

Browse source
This commit is contained in:
Chocobozzz 2019-04-08 11:52:29 +02:00
parent ae9bbed46d
commit 0e9c48c2ed
No known key found for this signature in database
GPG key ID: 583A612D890159BE
8 changed files with 202 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
server/controllers/api/server/follows.ts
View file

@ -3,18 +3,23 @@ import { UserRight } from '../../../../shared/models/users'
import { logger } from '../../../helpers/logger'
import { getFormattedObjects, getServerActor } from '../../../helpers/utils'
import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../../../initializers'
import { sendUndoFollow } from '../../../lib/activitypub/send'
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'
@ -40,7 +45,7 @@ serverFollowsRouter.delete('/following/:host',
authenticate,
ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
asyncMiddleware(removeFollowingValidator),
asyncMiddleware(removeFollow)
asyncMiddleware(removeFollowing)
)
serverFollowsRouter.get('/followers',
@ -51,6 +56,13 @@ serverFollowsRouter.get('/followers',
asyncMiddleware(listFollowers)
)
serverFollowsRouter.delete('/followers/:nameWithHost',
authenticate,
ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
asyncMiddleware(removeFollowerValidator),
asyncMiddleware(removeFollower)
)
// ---------------------------------------------------------------------------
export {
@ -103,7 +115,7 @@ async function followInstance (req: express.Request, res: express.Response) {
return res.status(204).end()
}
async function removeFollow (req: express.Request, res: express.Response) {
async function removeFollowing (req: express.Request, res: express.Response) {
const follow = res.locals.follow
await sequelizeTypescript.transaction(async t => {
@ -123,3 +135,13 @@ async function removeFollow (req: express.Request, res: express.Response) {
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()
}