Add informational message at login for visitors coming from upload button

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

diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts
index 9b3489120521b60bc38a91c79483aabea9e88edd..05740318efe046d40f26f0bda41dca059b747cf7 100644 (file)
--- a/server/controllers/api/accounts.ts
+++ b/server/controllers/api/accounts.ts
@@ -22,12 +22,15 @@ import {
 import { AccountModel } from '../../models/account/account'
 import { AccountVideoRateModel } from '../../models/account/account-video-rate'
 import { VideoModel } from '../../models/video/video'
-import { buildNSFWFilter, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
+import { buildNSFWFilter, isUserAbleToSearchRemoteURI, getCountVideos } from '../../helpers/express-utils'
 import { VideoChannelModel } from '../../models/video/video-channel'
 import { JobQueue } from '../../lib/job-queue'
 import { logger } from '../../helpers/logger'
 import { VideoPlaylistModel } from '../../models/video/video-playlist'
-import { commonVideoPlaylistFiltersValidator } from '../../middlewares/validators/videos/video-playlists'
+import {
+  commonVideoPlaylistFiltersValidator,
+  videoPlaylistsSearchValidator
+} from '../../middlewares/validators/videos/video-playlists'
 
 const accountsRouter = express.Router()
 
@@ -72,6 +75,7 @@ accountsRouter.get('/:accountName/video-playlists',
   setDefaultSort,
   setDefaultPagination,
   commonVideoPlaylistFiltersValidator,
+  videoPlaylistsSearchValidator,
   asyncMiddleware(listAccountPlaylists)
 )
 
@@ -117,7 +121,7 @@ async function listAccountChannels (req: express.Request, res: express.Response)
     accountId: res.locals.account.id,
     start: req.query.start,
     count: req.query.count,
-    sort: req.query.sort,
+    sort: req.query.sort
   }
 
   const resultList = await VideoChannelModel.listByAccount(options)
@@ -129,18 +133,19 @@ async function listAccountPlaylists (req: express.Request, res: express.Response
   const serverActor = await getServerActor()
 
   // Allow users to see their private/unlisted video playlists
-  let privateAndUnlisted = false
+  let listMyPlaylists = false
   if (res.locals.oauth && res.locals.oauth.token.User.Account.id === res.locals.account.id) {
-    privateAndUnlisted = true
+    listMyPlaylists = true
   }
 
   const resultList = await VideoPlaylistModel.listForApi({
+    search: req.query.search,
     followerActorId: serverActor.id,
     start: req.query.start,
     count: req.query.count,
     sort: req.query.sort,
     accountId: res.locals.account.id,
-    privateAndUnlisted,
+    listMyPlaylists,
     type: req.query.playlistType
   })
 
@@ -150,6 +155,7 @@ async function listAccountPlaylists (req: express.Request, res: express.Response
 async function listAccountVideos (req: express.Request, res: express.Response) {
   const account = res.locals.account
   const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
+  const countVideos = getCountVideos(req)
 
   const resultList = await VideoModel.listForApi({
     followerActorId,
@@ -166,7 +172,8 @@ async function listAccountVideos (req: express.Request, res: express.Response) {
     nsfw: buildNSFWFilter(res, req.query.nsfw),
     withFiles: false,
     accountId: account.id,
-    user: res.locals.oauth ? res.locals.oauth.token.User : undefined
+    user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
+    countVideos
   })
 
   return res.json(getFormattedObjects(resultList.data, resultList.total))