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

Fix languageOneOf filter with only _unknown

pull/2654/head
Chocobozzz 2020-04-16 17:00:40 +02:00
parent 2c0ccd4b3f
commit 14cbb9a65a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/models/video/video-query-builder.ts
View File

@ -203,23 +203,28 @@ function buildListQuery (model: typeof Model, options: BuildVideosQueryOptions)
}
if (options.languageOneOf) {
replacements.languageOneOf = options.languageOneOf.filter(l => l && l !== '_unknown')
const languages = options.languageOneOf.filter(l => l && l !== '_unknown')
const languagesQueryParts: string[] = []
let languagesQuery = '("video"."language" IN (:languageOneOf) OR '
if (languages.length !== 0) {
languagesQueryParts.push('("video"."language" IN (:languageOneOf)')
replacements.languageOneOf = languages
if (options.languageOneOf.includes('_unknown')) {
languagesQuery += '"video"."language" IS NULL OR '
languagesQueryParts.push(
' EXISTS (' +
' SELECT 1 FROM "videoCaption" WHERE "videoCaption"."language" ' +
' IN (' + createSafeIn(model, languages) + ') AND ' +
' "videoCaption"."videoId" = "video"."id"' +
' )' +
')'
)
}
and.push(
languagesQuery +
' EXISTS (' +
' SELECT 1 FROM "videoCaption" WHERE "videoCaption"."language" ' +
' IN (' + createSafeIn(model, options.languageOneOf) + ') AND ' +
' "videoCaption"."videoId" = "video"."id"' +
' )' +
')'
)
if (options.languageOneOf.includes('_unknown')) {
languagesQueryParts.push('"video"."language" IS NULL')
}
and.push(languagesQueryParts.join(' OR '))
}
// We don't exclude results in this if so if we do a count we don't need to add this complex clauses