Add users search filter

[github/Chocobozzz/PeerTube.git] / server / controllers / api / accounts.ts

diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts
index 06ab040339eb3f63dd528ff9370f906ff3915030..b7691ccba2f8e2544bdda03b3d4b4b222d13b20d 100644 (file)
--- a/server/controllers/api/accounts.ts
+++ b/server/controllers/api/accounts.ts
@@ -1,11 +1,18 @@
 import * as express from 'express'
 import { getFormattedObjects } from '../../helpers/utils'
-import { asyncMiddleware, optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort } from '../../middlewares'
-import { accountsGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators'
+import {
+  asyncMiddleware, commonVideosFiltersValidator,
+  listVideoAccountChannelsValidator,
+  optionalAuthenticate,
+  paginationValidator,
+  setDefaultPagination,
+  setDefaultSort
+} from '../../middlewares'
+import { accountsNameWithHostGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators'
 import { AccountModel } from '../../models/account/account'
 import { VideoModel } from '../../models/video/video'
-import { VideoSortField } from '../../../client/src/app/shared/video/sort-field.type'
-import { isNSFWHidden } from '../../helpers/express-utils'
+import { buildNSFWFilter, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
+import { VideoChannelModel } from '../../models/video/video-channel'
 
 const accountsRouter = express.Router()
 
@@ -17,19 +24,25 @@ accountsRouter.get('/',
   asyncMiddleware(listAccounts)
 )
 
-accountsRouter.get('/:id',
-  asyncMiddleware(accountsGetValidator),
+accountsRouter.get('/:accountName',
+  asyncMiddleware(accountsNameWithHostGetValidator),
   getAccount
 )
 
-accountsRouter.get('/:id/videos',
-  asyncMiddleware(accountsGetValidator),
+accountsRouter.get('/:accountName/videos',
+  asyncMiddleware(accountsNameWithHostGetValidator),
   paginationValidator,
   videosSortValidator,
   setDefaultSort,
   setDefaultPagination,
   optionalAuthenticate,
-  asyncMiddleware(getAccountVideos)
+  commonVideosFiltersValidator,
+  asyncMiddleware(listAccountVideos)
+)
+
+accountsRouter.get('/:accountName/video-channels',
+  asyncMiddleware(listVideoAccountChannelsValidator),
+  asyncMiddleware(listVideoAccountChannels)
 )
 
 // ---------------------------------------------------------------------------
@@ -52,18 +65,31 @@ async function listAccounts (req: express.Request, res: express.Response, next:
   return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 
-async function getAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function listVideoAccountChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const resultList = await VideoChannelModel.listByAccount(res.locals.account.id)
+
+  return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
   const account: AccountModel = res.locals.account
+  const actorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
 
-  const resultList = await VideoModel.listForApi(
-    req.query.start as number,
-    req.query.count as number,
-    req.query.sort as VideoSortField,
-    isNSFWHidden(res),
-    null,
-    false,
-    account.id
-  )
+  const resultList = await VideoModel.listForApi({
+    actorId,
+    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,
+    nsfw: buildNSFWFilter(res, req.query.nsfw),
+    withFiles: false,
+    accountId: account.id
+  })
 
   return res.json(getFormattedObjects(resultList.data, resultList.total))
 }