import { UserRight } from '../../../../shared/models/users/user-right.enum'
import { getFormattedObjects } from '../../../helpers'
import { logger } from '../../../helpers/logger'
-import { getApplicationAccount } from '../../../helpers/utils'
+import { getServerAccount } from '../../../helpers/utils'
import { getAccountFromWebfinger } from '../../../helpers/webfinger'
import { SERVER_ACCOUNT_NAME } from '../../../initializers/constants'
import { database as db } from '../../../initializers/database'
-import { sendFollow } from '../../../lib/activitypub/send-request'
-import { asyncMiddleware, paginationValidator, setFollowersSort, setPagination } from '../../../middlewares'
+import { asyncMiddleware, paginationValidator, removeFollowingValidator, setFollowersSort, setPagination } from '../../../middlewares'
import { authenticate } from '../../../middlewares/oauth'
import { setBodyHostsPort } from '../../../middlewares/servers'
import { setFollowingSort } from '../../../middlewares/sort'
import { ensureUserHasRight } from '../../../middlewares/user-right'
-import { followValidator } from '../../../middlewares/validators/servers'
+import { followValidator } from '../../../middlewares/validators/follows'
import { followersSortValidator, followingSortValidator } from '../../../middlewares/validators/sort'
+import { AccountFollowInstance } from '../../../models/index'
+import { sendFollow } from '../../../lib/index'
+import { sendUndoFollow } from '../../../lib/activitypub/send/send-undo'
-const applicationFollowsRouter = express.Router()
+const serverFollowsRouter = express.Router()
-applicationFollowsRouter.get('/following',
+serverFollowsRouter.get('/following',
paginationValidator,
followingSortValidator,
setFollowingSort,
asyncMiddleware(listFollowing)
)
-applicationFollowsRouter.post('/follow',
+serverFollowsRouter.post('/following',
authenticate,
- ensureUserHasRight(UserRight.MANAGE_APPLICATION_FOLLOW),
+ ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
followValidator,
setBodyHostsPort,
asyncMiddleware(follow)
)
-applicationFollowsRouter.get('/followers',
+serverFollowsRouter.delete('/following/:accountId',
+ authenticate,
+ ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
+ removeFollowingValidator,
+ asyncMiddleware(removeFollow)
+)
+
+serverFollowsRouter.get('/followers',
paginationValidator,
followersSortValidator,
setFollowersSort,
// ---------------------------------------------------------------------------
export {
- applicationFollowsRouter
+ serverFollowsRouter
}
// ---------------------------------------------------------------------------
async function listFollowing (req: express.Request, res: express.Response, next: express.NextFunction) {
- const applicationAccount = await getApplicationAccount()
- const resultList = await db.AccountFollow.listFollowingForApi(applicationAccount.id, req.query.start, req.query.count, req.query.sort)
+ const serverAccount = await getServerAccount()
+ const resultList = await db.AccountFollow.listFollowingForApi(serverAccount.id, req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function listFollowers (req: express.Request, res: express.Response, next: express.NextFunction) {
- const applicationAccount = await getApplicationAccount()
- const resultList = await db.AccountFollow.listFollowersForApi(applicationAccount.id, req.query.start, req.query.count, req.query.sort)
+ const serverAccount = await getServerAccount()
+ const resultList = await db.AccountFollow.listFollowersForApi(serverAccount.id, req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function follow (req: express.Request, res: express.Response, next: express.NextFunction) {
const hosts = req.body.hosts as string[]
- const fromAccount = await getApplicationAccount()
+ const fromAccount = await getServerAccount()
const tasks: Promise<any>[] = []
const accountName = SERVER_ACCOUNT_NAME
},
transaction: t
})
+ accountFollow.AccountFollowing = targetAccount
+ accountFollow.AccountFollower = fromAccount
// Send a notification to remote server
if (accountFollow.state === 'pending') {
- await sendFollow(fromAccount, targetAccount, t)
+ await sendFollow(accountFollow, t)
}
})
})
return res.status(204).end()
}
+async function removeFollow (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const following: AccountFollowInstance = res.locals.following
+
+ await db.sequelize.transaction(async t => {
+ await sendUndoFollow(following, t)
+ await following.destroy({ transaction: t })
+ })
+
+ return res.status(204).end()
+}
+
async function loadLocalOrGetAccountFromWebfinger (name: string, host: string) {
let loadedFromDB = true
let account = await db.Account.loadByNameAndHost(name, host)