diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-24 15:36:50 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-27 09:41:54 +0200 |
commit | 687d638c2bee0d223f206168173b1b95adbad983 (patch) | |
tree | 957741b0ba704562a233181510bb8fda0102c8a5 /server/controllers/api/video-channel.ts | |
parent | f5b0af50c85e2f8b6b2b054ac1f47123cacbe08d (diff) | |
download | PeerTube-687d638c2bee0d223f206168173b1b95adbad983.tar.gz PeerTube-687d638c2bee0d223f206168173b1b95adbad983.tar.zst PeerTube-687d638c2bee0d223f206168173b1b95adbad983.zip |
Fetch outbox when searching an actor
Diffstat (limited to 'server/controllers/api/video-channel.ts')
-rw-r--r-- | server/controllers/api/video-channel.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index bd08d7a08..a7a36080b 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts | |||
@@ -19,7 +19,7 @@ import { videoChannelsNameWithHostValidator, videosSortValidator } from '../../m | |||
19 | import { sendUpdateActor } from '../../lib/activitypub/send' | 19 | import { sendUpdateActor } from '../../lib/activitypub/send' |
20 | import { VideoChannelCreate, VideoChannelUpdate } from '../../../shared' | 20 | import { VideoChannelCreate, VideoChannelUpdate } from '../../../shared' |
21 | import { createVideoChannel } from '../../lib/video-channel' | 21 | import { createVideoChannel } from '../../lib/video-channel' |
22 | import { buildNSFWFilter, createReqFiles } from '../../helpers/express-utils' | 22 | import { buildNSFWFilter, createReqFiles, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils' |
23 | import { setAsyncActorKeys } from '../../lib/activitypub' | 23 | import { setAsyncActorKeys } from '../../lib/activitypub' |
24 | import { AccountModel } from '../../models/account/account' | 24 | import { AccountModel } from '../../models/account/account' |
25 | import { CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers' | 25 | import { CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers' |
@@ -210,8 +210,10 @@ async function getVideoChannel (req: express.Request, res: express.Response, nex | |||
210 | 210 | ||
211 | async function listVideoChannelVideos (req: express.Request, res: express.Response, next: express.NextFunction) { | 211 | async function listVideoChannelVideos (req: express.Request, res: express.Response, next: express.NextFunction) { |
212 | const videoChannelInstance: VideoChannelModel = res.locals.videoChannel | 212 | const videoChannelInstance: VideoChannelModel = res.locals.videoChannel |
213 | const actorId = isUserAbleToSearchRemoteURI(res) ? null : undefined | ||
213 | 214 | ||
214 | const resultList = await VideoModel.listForApi({ | 215 | const resultList = await VideoModel.listForApi({ |
216 | actorId, | ||
215 | start: req.query.start, | 217 | start: req.query.start, |
216 | count: req.query.count, | 218 | count: req.query.count, |
217 | sort: req.query.sort, | 219 | sort: req.query.sort, |