-import * as express from 'express'
+import 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'
} from '../../../middlewares'
import {
acceptOrRejectFollowerValidator,
- followersSortValidator,
- followingSortValidator,
+ instanceFollowersSortValidator,
+ instanceFollowingSortValidator,
followValidator,
getFollowerValidator,
listFollowsValidator,
serverFollowsRouter.get('/following',
listFollowsValidator,
paginationValidator,
- followingSortValidator,
+ instanceFollowingSortValidator,
setDefaultSort,
setDefaultPagination,
asyncMiddleware(listFollowing)
serverFollowsRouter.get('/followers',
listFollowsValidator,
paginationValidator,
- followersSortValidator,
+ instanceFollowersSortValidator,
setDefaultSort,
setDefaultPagination,
asyncMiddleware(listFollowers)
async function listFollowing (req: express.Request, res: express.Response) {
const serverActor = await getServerActor()
- const resultList = await ActorFollowModel.listFollowingForApi({
+ const resultList = await ActorFollowModel.listInstanceFollowingForApi({
id: serverActor.id,
start: req.query.start,
count: req.query.count,
async function listFollowers (req: express.Request, res: express.Response) {
const serverActor = await getServerActor()
const resultList = await ActorFollowModel.listFollowersForApi({
- actorId: serverActor.id,
+ actorIds: [ serverActor.id ],
start: req.query.start,
count: req.query.count,
sort: req.query.sort,