OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix videos list sql request 

Sequelize my love <3
pull/232/head
Chocobozzz 2018-01-18 19:37:35 +01:00
parent 2e866cc75d
commit 2d9ab59061
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/models/video/video.ts
View File

@ -31,7 +31,6 @@ import { sendDeleteVideo } from '../../lib/activitypub/send'
import { AccountModel } from '../account/account'
import { AccountVideoRateModel } from '../account/account-video-rate'
import { ActorModel } from '../activitypub/actor'
import { ActorFollowModel } from '../activitypub/actor-follow'
import { ServerModel } from '../server/server'
import { getSort, throwIfNotValid } from '../utils'
import { TagModel } from './tag'
@ -54,33 +53,27 @@ enum ScopeNames {
@Scopes({
[ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number) => ({
subQuery: false,
where: {
id: {
[Sequelize.Op.notIn]: Sequelize.literal(
'(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
)
},
privacy: VideoPrivacy.PUBLIC,
[Sequelize.Op.or]: [
{
'$VideoChannel.Account.Actor.serverId$': null
},
{
'$VideoChannel.Account.Actor.ActorFollowers.actorId$': actorId
},
{
id: {
),
[ Sequelize.Op.in ]: Sequelize.literal(
'(' +
'SELECT "videoShare"."videoId" FROM "videoShare" ' +
'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' +
'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
'WHERE "actorFollow"."actorId" = ' + parseInt(actorId.toString(), 10) +
' UNION ' +
'SELECT "video"."id" AS "id" FROM "video" ' +
'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' +
'INNER JOIN "actor" ON "account"."actorId" = "actor"."id" ' +
'LEFT JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' +
'WHERE "actor"."serverId" IS NULL OR "actorFollow"."actorId" = ' + parseInt(actorId.toString(), 10) +
')'
)
}
}
]
},
privacy: VideoPrivacy.PUBLIC
},
include: [
{
@ -100,14 +93,7 @@ enum ScopeNames {
include: [
{
attributes: [ 'host' ],
model: ServerModel.unscoped(),
required: false
},
{
attributes: [ ],
model: ActorFollowModel.unscoped(),
as: 'ActorFollowers',
required: false
model: ServerModel.unscoped()
}
]
}