aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/accounts.ts4
-rw-r--r--server/controllers/api/users/me.ts2
-rw-r--r--server/controllers/api/video-channel.ts4
-rw-r--r--server/models/video/video.ts20
4 files changed, 15 insertions, 15 deletions
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts
index 86ef2aed1..a69a83acf 100644
--- a/server/controllers/api/accounts.ts
+++ b/server/controllers/api/accounts.ts
@@ -74,10 +74,10 @@ async function listVideoAccountChannels (req: express.Request, res: express.Resp
74 74
75async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) { 75async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
76 const account: AccountModel = res.locals.account 76 const account: AccountModel = res.locals.account
77 const actorId = isUserAbleToSearchRemoteURI(res) ? null : undefined 77 const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
78 78
79 const resultList = await VideoModel.listForApi({ 79 const resultList = await VideoModel.listForApi({
80 actorId, 80 followerActorId,
81 start: req.query.start, 81 start: req.query.start,
82 count: req.query.count, 82 count: req.query.count,
83 sort: req.query.sort, 83 sort: req.query.sort,
diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts
index 47f2c9ec7..d2456346b 100644
--- a/server/controllers/api/users/me.ts
+++ b/server/controllers/api/users/me.ts
@@ -238,7 +238,7 @@ async function getUserSubscriptionVideos (req: express.Request, res: express.Res
238 nsfw: buildNSFWFilter(res, req.query.nsfw), 238 nsfw: buildNSFWFilter(res, req.query.nsfw),
239 filter: req.query.filter as VideoFilter, 239 filter: req.query.filter as VideoFilter,
240 withFiles: false, 240 withFiles: false,
241 actorId: user.Account.Actor.id, 241 followerActorId: user.Account.Actor.id,
242 user 242 user
243 }) 243 })
244 244
diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts
index 63240dfa1..fd143a139 100644
--- a/server/controllers/api/video-channel.ts
+++ b/server/controllers/api/video-channel.ts
@@ -202,10 +202,10 @@ async function getVideoChannel (req: express.Request, res: express.Response, nex
202 202
203async function listVideoChannelVideos (req: express.Request, res: express.Response, next: express.NextFunction) { 203async function listVideoChannelVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
204 const videoChannelInstance: VideoChannelModel = res.locals.videoChannel 204 const videoChannelInstance: VideoChannelModel = res.locals.videoChannel
205 const actorId = isUserAbleToSearchRemoteURI(res) ? null : undefined 205 const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
206 206
207 const resultList = await VideoModel.listForApi({ 207 const resultList = await VideoModel.listForApi({
208 actorId, 208 followerActorId,
209 start: req.query.start, 209 start: req.query.start,
210 count: req.query.count, 210 count: req.query.count,
211 sort: req.query.sort, 211 sort: req.query.sort,
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index e8cb5aa88..adef37937 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -140,7 +140,7 @@ type ForAPIOptions = {
140 140
141type AvailableForListIDsOptions = { 141type AvailableForListIDsOptions = {
142 serverAccountId: number 142 serverAccountId: number
143 actorId: number 143 followerActorId: number
144 includeLocalVideos: boolean 144 includeLocalVideos: boolean
145 filter?: VideoFilter 145 filter?: VideoFilter
146 categoryOneOf?: number[] 146 categoryOneOf?: number[]
@@ -315,7 +315,7 @@ type AvailableForListIDsOptions = {
315 query.include.push(videoChannelInclude) 315 query.include.push(videoChannelInclude)
316 } 316 }
317 317
318 if (options.actorId) { 318 if (options.followerActorId) {
319 let localVideosReq = '' 319 let localVideosReq = ''
320 if (options.includeLocalVideos === true) { 320 if (options.includeLocalVideos === true) {
321 localVideosReq = ' UNION ALL ' + 321 localVideosReq = ' UNION ALL ' +
@@ -327,7 +327,7 @@ type AvailableForListIDsOptions = {
327 } 327 }
328 328
329 // Force actorId to be a number to avoid SQL injections 329 // Force actorId to be a number to avoid SQL injections
330 const actorIdNumber = parseInt(options.actorId.toString(), 10) 330 const actorIdNumber = parseInt(options.followerActorId.toString(), 10)
331 query.where[ 'id' ][ Sequelize.Op.and ].push({ 331 query.where[ 'id' ][ Sequelize.Op.and ].push({
332 [ Sequelize.Op.in ]: Sequelize.literal( 332 [ Sequelize.Op.in ]: Sequelize.literal(
333 '(' + 333 '(' +
@@ -985,7 +985,7 @@ export class VideoModel extends Model<VideoModel> {
985 filter?: VideoFilter, 985 filter?: VideoFilter,
986 accountId?: number, 986 accountId?: number,
987 videoChannelId?: number, 987 videoChannelId?: number,
988 actorId?: number 988 followerActorId?: number
989 trendingDays?: number, 989 trendingDays?: number,
990 user?: UserModel 990 user?: UserModel
991 }, countVideos = true) { 991 }, countVideos = true) {
@@ -1008,11 +1008,11 @@ export class VideoModel extends Model<VideoModel> {
1008 1008
1009 const serverActor = await getServerActor() 1009 const serverActor = await getServerActor()
1010 1010
1011 // actorId === null has a meaning, so just check undefined 1011 // followerActorId === null has a meaning, so just check undefined
1012 const actorId = options.actorId !== undefined ? options.actorId : serverActor.id 1012 const followerActorId = options.followerActorId !== undefined ? options.followerActorId : serverActor.id
1013 1013
1014 const queryOptions = { 1014 const queryOptions = {
1015 actorId, 1015 followerActorId,
1016 serverAccountId: serverActor.Account.id, 1016 serverAccountId: serverActor.Account.id,
1017 nsfw: options.nsfw, 1017 nsfw: options.nsfw,
1018 categoryOneOf: options.categoryOneOf, 1018 categoryOneOf: options.categoryOneOf,
@@ -1118,7 +1118,7 @@ export class VideoModel extends Model<VideoModel> {
1118 1118
1119 const serverActor = await getServerActor() 1119 const serverActor = await getServerActor()
1120 const queryOptions = { 1120 const queryOptions = {
1121 actorId: serverActor.id, 1121 followerActorId: serverActor.id,
1122 serverAccountId: serverActor.Account.id, 1122 serverAccountId: serverActor.Account.id,
1123 includeLocalVideos: options.includeLocalVideos, 1123 includeLocalVideos: options.includeLocalVideos,
1124 nsfw: options.nsfw, 1124 nsfw: options.nsfw,
@@ -1273,11 +1273,11 @@ export class VideoModel extends Model<VideoModel> {
1273 // threshold corresponds to how many video the field should have to be returned 1273 // threshold corresponds to how many video the field should have to be returned
1274 static async getRandomFieldSamples (field: 'category' | 'channelId', threshold: number, count: number) { 1274 static async getRandomFieldSamples (field: 'category' | 'channelId', threshold: number, count: number) {
1275 const serverActor = await getServerActor() 1275 const serverActor = await getServerActor()
1276 const actorId = serverActor.id 1276 const followerActorId = serverActor.id
1277 1277
1278 const scopeOptions: AvailableForListIDsOptions = { 1278 const scopeOptions: AvailableForListIDsOptions = {
1279 serverAccountId: serverActor.Account.id, 1279 serverAccountId: serverActor.Account.id,
1280 actorId, 1280 followerActorId,
1281 includeLocalVideos: true 1281 includeLocalVideos: true
1282 } 1282 }
1283 1283