import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos'
import { VideoFilter } from '../../../shared/models/videos/video-query.type'
-import { createTorrentPromise, peertubeTruncate } from '../../helpers/core-utils'
+import { peertubeTruncate } from '../../helpers/core-utils'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
import { isArray, isBooleanValid } from '../../helpers/custom-validators/misc'
import {
buildBlockedAccountSQL,
buildTrigramSearchIndex,
buildWhereIdOrUUID,
+ createSafeIn,
createSimilarityAttribute,
getVideoSort,
isOutdated,
import { CONFIG } from '../../initializers/config'
import { ThumbnailModel } from './thumbnail'
import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type'
+import { createTorrentPromise } from '../../helpers/webtorrent'
// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation
const indexes: (ModelIndexesOptions & { where?: WhereOptions })[] = [
followerActorId: number
includeLocalVideos: boolean
+ withoutId?: boolean
+
filter?: VideoFilter
categoryOneOf?: number[]
nsfw?: boolean
trendingDays?: number
user?: UserModel,
historyOfUser?: UserModel
+
+ baseWhere?: WhereOptions[]
}
-@Scopes({
+@Scopes(() => ({
[ ScopeNames.FOR_API ]: (options: ForAPIOptions) => {
const query: FindOptions = {
where: {
id: {
- [ Op.in ]: options.ids // FIXME: sequelize any seems broken
+ [ Op.in ]: options.ids // FIXME: sequelize ANY seems broken
}
},
include: [
{
model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, true ] }),
required: true
+ },
+ {
+ attributes: [ 'type', 'filename' ],
+ model: ThumbnailModel,
+ required: false
}
]
}
return query
},
[ ScopeNames.AVAILABLE_FOR_LIST_IDS ]: (options: AvailableForListIDsOptions) => {
+ const whereAnd = options.baseWhere ? options.baseWhere : []
+
const query: FindOptions = {
raw: true,
- attributes: [ 'id' ],
- where: {
- id: {
- [ Op.and ]: [
- {
- [ Op.notIn ]: Sequelize.literal(
- '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
- )
- }
- ]
- },
- channelId: {
- [ Op.notIn ]: Sequelize.literal(
- '(' +
- 'SELECT id FROM "videoChannel" WHERE "accountId" IN (' +
- buildBlockedAccountSQL(options.serverAccountId, options.user ? options.user.Account.id : undefined) +
- ')' +
- ')'
- )
- }
- },
+ attributes: options.withoutId === true ? [] : [ 'id' ],
include: []
}
+ whereAnd.push({
+ id: {
+ [ Op.notIn ]: Sequelize.literal(
+ '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
+ )
+ }
+ })
+
+ whereAnd.push({
+ channelId: {
+ [ Op.notIn ]: Sequelize.literal(
+ '(' +
+ 'SELECT id FROM "videoChannel" WHERE "accountId" IN (' +
+ buildBlockedAccountSQL(options.serverAccountId, options.user ? options.user.Account.id : undefined) +
+ ')' +
+ ')'
+ )
+ }
+ })
+
// Only list public/published videos
if (!options.filter || options.filter !== 'all-local') {
const privacyWhere = {
]
}
- Object.assign(query.where, privacyWhere)
+ whereAnd.push(privacyWhere)
}
if (options.videoPlaylistId) {
// Force actorId to be a number to avoid SQL injections
const actorIdNumber = parseInt(options.followerActorId.toString(), 10)
- query.where[ 'id' ][ Op.and ].push({
- [ Op.in ]: Sequelize.literal(
- '(' +
- 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' +
- 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
- 'WHERE "actorFollow"."actorId" = ' + actorIdNumber +
- ' UNION ALL ' +
- '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" ' +
- 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' +
- 'WHERE "actorFollow"."actorId" = ' + actorIdNumber +
- localVideosReq +
- ')'
- )
+ whereAnd.push({
+ id: {
+ [ Op.in ]: Sequelize.literal(
+ '(' +
+ 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' +
+ 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
+ 'WHERE "actorFollow"."actorId" = ' + actorIdNumber +
+ ' UNION ALL ' +
+ '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" ' +
+ 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' +
+ 'WHERE "actorFollow"."actorId" = ' + actorIdNumber +
+ localVideosReq +
+ ')'
+ )
+ }
})
}
if (options.withFiles === true) {
- query.where[ 'id' ][ Op.and ].push({
- [ Op.in ]: Sequelize.literal(
- '(SELECT "videoId" FROM "videoFile")'
- )
+ whereAnd.push({
+ id: {
+ [ Op.in ]: Sequelize.literal(
+ '(SELECT "videoId" FROM "videoFile")'
+ )
+ }
})
}
// FIXME: issues with sequelize count when making a join on n:m relation, so we just make a IN()
if (options.tagsAllOf || options.tagsOneOf) {
- const createTagsIn = (tags: string[]) => {
- return tags.map(t => VideoModel.sequelize.escape(t))
- .join(', ')
- }
-
if (options.tagsOneOf) {
- query.where[ 'id' ][ Op.and ].push({
- [ Op.in ]: Sequelize.literal(
- '(' +
- 'SELECT "videoId" FROM "videoTag" ' +
- 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
- 'WHERE "tag"."name" IN (' + createTagsIn(options.tagsOneOf) + ')' +
- ')'
- )
+ whereAnd.push({
+ id: {
+ [ Op.in ]: Sequelize.literal(
+ '(' +
+ 'SELECT "videoId" FROM "videoTag" ' +
+ 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
+ 'WHERE "tag"."name" IN (' + createSafeIn(VideoModel, options.tagsOneOf) + ')' +
+ ')'
+ )
+ }
})
}
if (options.tagsAllOf) {
- query.where[ 'id' ][ Op.and ].push({
- [ Op.in ]: Sequelize.literal(
- '(' +
- 'SELECT "videoId" FROM "videoTag" ' +
- 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
- 'WHERE "tag"."name" IN (' + createTagsIn(options.tagsAllOf) + ')' +
- 'GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + options.tagsAllOf.length +
- ')'
- )
+ whereAnd.push({
+ id: {
+ [ Op.in ]: Sequelize.literal(
+ '(' +
+ 'SELECT "videoId" FROM "videoTag" ' +
+ 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
+ 'WHERE "tag"."name" IN (' + createSafeIn(VideoModel, options.tagsAllOf) + ')' +
+ 'GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + options.tagsAllOf.length +
+ ')'
+ )
+ }
})
}
}
if (options.nsfw === true || options.nsfw === false) {
- query.where[ 'nsfw' ] = options.nsfw
+ whereAnd.push({ nsfw: options.nsfw })
}
if (options.categoryOneOf) {
- query.where[ 'category' ] = {
- [ Op.or ]: options.categoryOneOf
- }
+ whereAnd.push({
+ category: {
+ [ Op.or ]: options.categoryOneOf
+ }
+ })
}
if (options.licenceOneOf) {
- query.where[ 'licence' ] = {
- [ Op.or ]: options.licenceOneOf
- }
+ whereAnd.push({
+ licence: {
+ [ Op.or ]: options.licenceOneOf
+ }
+ })
}
if (options.languageOneOf) {
- query.where[ 'language' ] = {
- [ Op.or ]: options.languageOneOf
+ let videoLanguages = options.languageOneOf
+ if (options.languageOneOf.find(l => l === '_unknown')) {
+ videoLanguages = videoLanguages.concat([ null ])
}
+
+ whereAnd.push({
+ [Op.or]: [
+ {
+ language: {
+ [ Op.or ]: videoLanguages
+ }
+ },
+ {
+ id: {
+ [ Op.in ]: Sequelize.literal(
+ '(' +
+ 'SELECT "videoId" FROM "videoCaption" ' +
+ 'WHERE "language" IN (' + createSafeIn(VideoModel, options.languageOneOf) + ') ' +
+ ')'
+ )
+ }
+ }
+ ]
+ })
}
if (options.trendingDays) {
query.subQuery = false
}
+ query.where = {
+ [ Op.and ]: whereAnd
+ }
+
return query
},
[ ScopeNames.WITH_THUMBNAILS ]: {
include: [
{
- model: () => ThumbnailModel,
+ model: ThumbnailModel,
required: false
}
]
include: [
{
attributes: [ 'accountId' ],
- model: () => VideoChannelModel.unscoped(),
+ model: VideoChannelModel.unscoped(),
required: true,
include: [
{
attributes: [ 'userId' ],
- model: () => AccountModel.unscoped(),
+ model: AccountModel.unscoped(),
required: true
}
]
}
- ] as any // FIXME: sequelize typings
+ ]
},
[ ScopeNames.WITH_ACCOUNT_DETAILS ]: {
include: [
{
- model: () => VideoChannelModel.unscoped(),
+ model: VideoChannelModel.unscoped(),
required: true,
include: [
{
attributes: {
exclude: [ 'privateKey', 'publicKey' ]
},
- model: () => ActorModel.unscoped(),
+ model: ActorModel.unscoped(),
required: true,
include: [
{
attributes: [ 'host' ],
- model: () => ServerModel.unscoped(),
+ model: ServerModel.unscoped(),
required: false
},
{
- model: () => AvatarModel.unscoped(),
+ model: AvatarModel.unscoped(),
required: false
}
]
},
{
- model: () => AccountModel.unscoped(),
+ model: AccountModel.unscoped(),
required: true,
include: [
{
- model: () => ActorModel.unscoped(),
+ model: ActorModel.unscoped(),
attributes: {
exclude: [ 'privateKey', 'publicKey' ]
},
include: [
{
attributes: [ 'host' ],
- model: () => ServerModel.unscoped(),
+ model: ServerModel.unscoped(),
required: false
},
{
- model: () => AvatarModel.unscoped(),
+ model: AvatarModel.unscoped(),
required: false
}
]
}
]
}
- ] as any // FIXME: sequelize typings
+ ]
},
[ ScopeNames.WITH_TAGS ]: {
- include: [ () => TagModel ]
+ include: [ TagModel ]
},
[ ScopeNames.WITH_BLACKLISTED ]: {
include: [
{
attributes: [ 'id', 'reason' ],
- model: () => VideoBlacklistModel,
+ model: VideoBlacklistModel,
required: false
}
]
include: [
{
model: VideoFileModel.unscoped(),
- // FIXME: typings
- [ 'separate' as any ]: true, // We may have multiple files, having multiple redundancies so let's separate this join
+ separate: true, // We may have multiple files, having multiple redundancies so let's separate this join
required: false,
include: subInclude
}
include: [
{
model: VideoStreamingPlaylistModel.unscoped(),
- // FIXME: typings
- [ 'separate' as any ]: true, // We may have multiple streaming playlists, having multiple redundancies so let's separate this join
+ separate: true, // We may have multiple streaming playlists, having multiple redundancies so let's separate this join
required: false,
include: subInclude
}
[ ScopeNames.WITH_SCHEDULED_UPDATE ]: {
include: [
{
- model: () => ScheduleVideoUpdateModel.unscoped(),
+ model: ScheduleVideoUpdateModel.unscoped(),
required: false
}
]
]
}
}
-})
+}))
@Table({
tableName: 'video',
indexes
}
return Bluebird.all([
- // FIXME: typing issue
- VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findAll(query as any),
- VideoModel.sequelize.query<{ total: number }>(rawCountQuery, { type: QueryTypes.SELECT })
+ VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findAll(query),
+ VideoModel.sequelize.query<{ total: string }>(rawCountQuery, { type: QueryTypes.SELECT })
]).then(([ rows, totals ]) => {
// totals: totalVideos + totalVideoShares
let totalVideos = 0
let totalVideoShares = 0
- if (totals[ 0 ]) totalVideos = parseInt(totals[ 0 ].total + '', 10)
- if (totals[ 1 ]) totalVideoShares = parseInt(totals[ 1 ].total + '', 10)
+ if (totals[ 0 ]) totalVideos = parseInt(totals[ 0 ].total, 10)
+ if (totals[ 1 ]) totalVideoShares = parseInt(totals[ 1 ].total, 10)
const total = totalVideos + totalVideoShares
return {
}
static listUserVideosForApi (accountId: number, start: number, count: number, sort: string, withFiles = false) {
- const query: FindOptions = {
- offset: start,
- limit: count,
- order: getVideoSort(sort),
- include: [
- {
- model: VideoChannelModel,
- required: true,
- include: [
- {
- model: AccountModel,
- where: {
- id: accountId
- },
- required: true
- }
- ]
- },
- {
- model: ScheduleVideoUpdateModel,
- required: false
- },
- {
- model: VideoBlacklistModel,
- required: false
- }
- ]
+ function buildBaseQuery (): FindOptions {
+ return {
+ offset: start,
+ limit: count,
+ order: getVideoSort(sort),
+ include: [
+ {
+ model: VideoChannelModel,
+ required: true,
+ include: [
+ {
+ model: AccountModel,
+ where: {
+ id: accountId
+ },
+ required: true
+ }
+ ]
+ }
+ ]
+ }
}
+ const countQuery = buildBaseQuery()
+ const findQuery = buildBaseQuery()
+
+ const findScopes = [
+ ScopeNames.WITH_SCHEDULED_UPDATE,
+ ScopeNames.WITH_BLACKLISTED,
+ ScopeNames.WITH_THUMBNAILS
+ ]
+
if (withFiles === true) {
- query.include.push({
+ findQuery.include.push({
model: VideoFileModel.unscoped(),
required: true
})
}
- return VideoModel.scope(ScopeNames.WITH_THUMBNAILS)
- .findAndCountAll(query)
- .then(({ rows, count }) => {
- return {
- data: rows,
- total: count
- }
- })
+ return Promise.all([
+ VideoModel.count(countQuery),
+ VideoModel.scope(findScopes).findAll(findQuery)
+ ]).then(([ count, rows ]) => {
+ return {
+ data: rows,
+ total: count
+ }
+ })
}
static async listForApi (options: {
throw new Error('Try to filter all-local but no user has not the see all videos right')
}
- const query: FindOptions = {
+ const query: FindOptions & { where?: null } = {
offset: options.start,
limit: options.count,
order: getVideoSort(options.sort)
)
}
- const query: FindOptions = {
+ const query = {
attributes: {
include: attributesInclude
},
offset: options.start,
limit: options.count,
- order: getVideoSort(options.sort),
- where: {
- [ Op.and ]: whereAnd
- }
+ order: getVideoSort(options.sort)
}
const serverActor = await getServerActor()
tagsOneOf: options.tagsOneOf,
tagsAllOf: options.tagsAllOf,
user: options.user,
- filter: options.filter
+ filter: options.filter,
+ baseWhere: whereAnd
}
return VideoModel.getAvailableForApi(query, queryOptions)
const where = buildWhereIdOrUUID(id)
const options = {
- order: [ [ 'Tags', 'name', 'ASC' ] ] as any, // FIXME: sequelize typings
+ order: [ [ 'Tags', 'name', 'ASC' ] ] as any,
where,
transaction: t
}
- const scopes = [
+ const scopes: (string | ScopeOptions)[] = [
ScopeNames.WITH_TAGS,
ScopeNames.WITH_BLACKLISTED,
ScopeNames.WITH_ACCOUNT_DETAILS,
]
if (userId) {
- scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] } as any) // FIXME: typings
+ scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] })
}
return VideoModel
transaction: t
}
- const scopes = [
+ const scopes: (string | ScopeOptions)[] = [
ScopeNames.WITH_TAGS,
ScopeNames.WITH_BLACKLISTED,
ScopeNames.WITH_ACCOUNT_DETAILS,
ScopeNames.WITH_SCHEDULED_UPDATE,
ScopeNames.WITH_THUMBNAILS,
- { method: [ ScopeNames.WITH_FILES, true ] } as any, // FIXME: typings
- { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] } as any // FIXME: typings
+ { method: [ ScopeNames.WITH_FILES, true ] },
+ { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] }
]
if (userId) {
- scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] } as any) // FIXME: typings
+ scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] })
}
return VideoModel
.then(results => results.length === 1)
}
+ static bulkUpdateSupportField (videoChannel: VideoChannelModel, t: Transaction) {
+ const options = {
+ where: {
+ channelId: videoChannel.id
+ },
+ transaction: t
+ }
+
+ return VideoModel.update({ support: videoChannel.support }, options)
+ }
+
+ static getAllIdsFromChannel (videoChannel: VideoChannelModel) {
+ const query = {
+ attributes: [ 'id' ],
+ where: {
+ channelId: videoChannel.id
+ }
+ }
+
+ return VideoModel.findAll(query)
+ .then(videos => videos.map(v => v.id))
+ }
+
// threshold corresponds to how many video the field should have to be returned
static async getRandomFieldSamples (field: 'category' | 'channelId', threshold: number, count: number) {
const serverActor = await getServerActor()
const scopeOptions: AvailableForListIDsOptions = {
serverAccountId: serverActor.Account.id,
followerActorId,
- includeLocalVideos: true
+ includeLocalVideos: true,
+ withoutId: true // Don't break aggregation
}
const query: FindOptions = {
attributes: [ field ],
limit: count,
group: field,
- having: Sequelize.where(Sequelize.fn('COUNT', Sequelize.col(field)), {
- [ Op.gte ]: threshold
- }) as any, // FIXME: typings
+ having: Sequelize.where(
+ Sequelize.fn('COUNT', Sequelize.col(field)), { [ Op.gte ]: threshold }
+ ),
order: [ (this.sequelize as any).random() ]
}
}
private static async getAvailableForApi (
- query: FindOptions,
+ query: FindOptions & { where?: null }, // Forbid where field in query
options: AvailableForListIDsOptions,
countVideos = true
) {
]
}
- const [ count, rowsId ] = await Promise.all([
- countVideos ? VideoModel.scope(countScope).count(countQuery) : Promise.resolve<number>(undefined),
- VideoModel.scope(idsScope).findAll(query)
+ const [ count, ids ] = await Promise.all([
+ countVideos
+ ? VideoModel.scope(countScope).count(countQuery)
+ : Promise.resolve<number>(undefined),
+
+ VideoModel.scope(idsScope)
+ .findAll(query)
+ .then(rows => rows.map(r => r.id))
])
- const ids = rowsId.map(r => r.id)
if (ids.length === 0) return { data: [], total: count }
]
}
- // FIXME: typing
- const apiScope: any[] = [ ScopeNames.WITH_THUMBNAILS ]
+ const apiScope: (string | ScopeOptions)[] = []
if (options.user) {
apiScope.push({ method: [ ScopeNames.WITH_USER_HISTORY, options.user.id ] })
-
- // Even if the relation is n:m, we know that a user only have 0..1 video history
- // So we won't have multiple rows for the same video
- // A subquery adds some bugs in our query so disable it
- secondQuery.subQuery = false
}
apiScope.push({
return maxBy(this.VideoFiles, file => file.resolution)
}
- addThumbnail (thumbnail: ThumbnailModel) {
+ async addAndSaveThumbnail (thumbnail: ThumbnailModel, transaction: Transaction) {
+ thumbnail.videoId = this.id
+
+ const savedThumbnail = await thumbnail.save({ transaction })
+
if (Array.isArray(this.Thumbnails) === false) this.Thumbnails = []
// Already have this thumbnail, skip
- if (this.Thumbnails.find(t => t.id === thumbnail.id)) return
+ if (this.Thumbnails.find(t => t.id === savedThumbnail.id)) return
- this.Thumbnails.push(thumbnail)
+ this.Thumbnails.push(savedThumbnail)
}
getVideoFilename (videoFile: VideoFileModel) {
return this.uuid + '.jpg'
}
- getThumbnail () {
+ getMiniature () {
if (Array.isArray(this.Thumbnails) === false) return undefined
- return this.Thumbnails.find(t => t.type === ThumbnailType.THUMBNAIL)
+ return this.Thumbnails.find(t => t.type === ThumbnailType.MINIATURE)
}
generatePreviewName () {
return '/videos/embed/' + this.uuid
}
- getThumbnailStaticPath () {
- const thumbnail = this.getThumbnail()
+ getMiniatureStaticPath () {
+ const thumbnail = this.getMiniature()
if (!thumbnail) return null
return join(STATIC_PATHS.THUMBNAILS, thumbnail.filename)
projects / github / Chocobozzz / PeerTube.git / blobdiff