-import * as express from 'express'
-import { getFormattedObjects} from '../../helpers/utils'
+import express from 'express'
+import { pickCommonVideoQuery } from '@server/helpers/query'
+import { ActorFollowModel } from '@server/models/actor/actor-follow'
+import { getServerActor } from '@server/models/application/application'
+import { guessAdditionalAttributesFromQuery } from '@server/models/video/formatter/video-format-utils'
+import { buildNSFWFilter, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
+import { getFormattedObjects } from '../../helpers/utils'
+import { JobQueue } from '../../lib/job-queue'
+import { Hooks } from '../../lib/plugins/hooks'
import {
asyncMiddleware,
authenticate,
paginationValidator,
setDefaultPagination,
setDefaultSort,
+ setDefaultVideosSort,
videoPlaylistsSortValidator,
videoRatesSortValidator,
videoRatingValidator
} from '../../middlewares'
import {
accountNameWithHostGetValidator,
+ accountsFollowersSortValidator,
accountsSortValidator,
ensureAuthUserOwnsAccountValidator,
videoChannelsSortValidator,
- videosSortValidator,
- videoChannelStatsValidator
+ videoChannelStatsValidator,
+ videosSortValidator
} from '../../middlewares/validators'
+import { commonVideoPlaylistFiltersValidator, videoPlaylistsSearchValidator } from '../../middlewares/validators/videos/video-playlists'
import { AccountModel } from '../../models/account/account'
import { AccountVideoRateModel } from '../../models/account/account-video-rate'
import { VideoModel } from '../../models/video/video'
-import { buildNSFWFilter, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
import { VideoChannelModel } from '../../models/video/video-channel'
-import { JobQueue } from '../../lib/job-queue'
import { VideoPlaylistModel } from '../../models/video/video-playlist'
-import { commonVideoPlaylistFiltersValidator, videoPlaylistsSearchValidator } from '../../middlewares/validators/videos/video-playlists'
-import { getServerActor } from '@server/models/application/application'
const accountsRouter = express.Router()
asyncMiddleware(accountNameWithHostGetValidator),
paginationValidator,
videosSortValidator,
- setDefaultSort,
+ setDefaultVideosSort,
setDefaultPagination,
optionalAuthenticate,
commonVideosFiltersValidator,
asyncMiddleware(listAccountRatings)
)
+accountsRouter.get('/:accountName/followers',
+ authenticate,
+ asyncMiddleware(accountNameWithHostGetValidator),
+ ensureAuthUserOwnsAccountValidator,
+ paginationValidator,
+ accountsFollowersSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
+ asyncMiddleware(listAccountFollowers)
+)
+
// ---------------------------------------------------------------------------
export {
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
- withStats: req.query.withStats
+ withStats: req.query.withStats,
+ search: req.query.search
}
- const resultList = await VideoChannelModel.listByAccount(options)
+ const resultList = await VideoChannelModel.listByAccountForAPI(options)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
}
async function listAccountVideos (req: express.Request, res: express.Response) {
+ const serverActor = await getServerActor()
+
const account = res.locals.account
- const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
+
+ const displayOnlyForFollower = isUserAbleToSearchRemoteURI(res)
+ ? null
+ : {
+ actorId: serverActor.id,
+ orLocalVideos: true
+ }
+
const countVideos = getCountVideos(req)
+ const query = pickCommonVideoQuery(req.query)
- const resultList = await VideoModel.listForApi({
- followerActorId,
- start: req.query.start,
- count: req.query.count,
- sort: req.query.sort,
- includeLocalVideos: true,
- categoryOneOf: req.query.categoryOneOf,
- licenceOneOf: req.query.licenceOneOf,
- languageOneOf: req.query.languageOneOf,
- tagsOneOf: req.query.tagsOneOf,
- tagsAllOf: req.query.tagsAllOf,
- filter: req.query.filter,
- nsfw: buildNSFWFilter(res, req.query.nsfw),
- withFiles: false,
+ const apiOptions = await Hooks.wrapObject({
+ ...query,
+
+ displayOnlyForFollower,
+ nsfw: buildNSFWFilter(res, query.nsfw),
accountId: account.id,
user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
countVideos
- })
+ }, 'filter:api.accounts.videos.list.params')
- return res.json(getFormattedObjects(resultList.data, resultList.total))
+ const resultList = await Hooks.wrapPromiseFun(
+ VideoModel.listForApi,
+ apiOptions,
+ 'filter:api.accounts.videos.list.result'
+ )
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total, guessAdditionalAttributesFromQuery(query)))
}
async function listAccountRatings (req: express.Request, res: express.Response) {
sort: req.query.sort,
type: req.query.rating
})
- return res.json(getFormattedObjects(resultList.rows, resultList.count))
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+async function listAccountFollowers (req: express.Request, res: express.Response) {
+ const account = res.locals.account
+
+ const channels = await VideoChannelModel.listAllByAccount(account.id)
+ const actorIds = [ account.actorId ].concat(channels.map(c => c.actorId))
+
+ const resultList = await ActorFollowModel.listFollowersForApi({
+ actorIds,
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ search: req.query.search,
+ state: 'accepted'
+ })
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
}