X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=ec3d5ddb06cb22fb772fd73092ee0e85f50240e2;hb=30ff39e7f07898ebb716c938123825c678b4e5af;hp=9840d17fdcf96a752f7fe9d255ace9b260673b37;hpb=e8bafea35bc930cb8ac5b2d521a188642a1adffe;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 9840d17fd..ec3d5ddb0 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -3,7 +3,18 @@ import { maxBy } from 'lodash' import * as magnetUtil from 'magnet-uri' import * as parseTorrent from 'parse-torrent' import { join } from 'path' -import * as Sequelize from 'sequelize' +import { + CountOptions, + FindOptions, + IncludeOptions, + ModelIndexesOptions, + Op, + QueryTypes, + ScopeOptions, + Sequelize, + Transaction, + WhereOptions +} from 'sequelize' import { AllowNull, BeforeDestroy, @@ -16,8 +27,6 @@ import { ForeignKey, HasMany, HasOne, - IFindOptions, - IIncludeOptions, Is, IsInt, IsUUID, @@ -31,7 +40,7 @@ import { UserRight, VideoPrivacy, VideoState } from '../../../shared' 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 { @@ -45,7 +54,7 @@ import { isVideoStateValid, isVideoSupportValid } from '../../helpers/custom-validators/videos' -import { generateImageFromVideoFile, getVideoFileResolution } from '../../helpers/ffmpeg-utils' +import { getVideoFileResolution } from '../../helpers/ffmpeg-utils' import { logger } from '../../helpers/logger' import { getServerActor } from '../../helpers/utils' import { @@ -54,11 +63,9 @@ import { CONSTRAINTS_FIELDS, HLS_REDUNDANCY_DIRECTORY, HLS_STREAMING_PLAYLIST_DIRECTORY, - PREVIEWS_SIZE, REMOTE_SCHEME, STATIC_DOWNLOAD_PATHS, STATIC_PATHS, - THUMBNAILS_SIZE, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, @@ -76,6 +83,7 @@ import { buildBlockedAccountSQL, buildTrigramSearchIndex, buildWhereIdOrUUID, + createSafeIn, createSimilarityAttribute, getVideoSort, isOutdated, @@ -109,9 +117,10 @@ import { VideoPlaylistElementModel } from './video-playlist-element' 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: Sequelize.DefineIndexesOptions[] = [ +const indexes: (ModelIndexesOptions & { where?: WhereOptions })[] = [ buildTrigramSearchIndex('video_name_trigram', 'name'), { fields: [ 'createdAt' ] }, @@ -123,7 +132,7 @@ const indexes: Sequelize.DefineIndexesOptions[] = [ fields: [ 'originallyPublishedAt' ], where: { originallyPublishedAt: { - [Sequelize.Op.ne]: null + [Op.ne]: null } } }, @@ -131,7 +140,7 @@ const indexes: Sequelize.DefineIndexesOptions[] = [ fields: [ 'category' ], // We don't care videos with an unknown category where: { category: { - [Sequelize.Op.ne]: null + [Op.ne]: null } } }, @@ -139,7 +148,7 @@ const indexes: Sequelize.DefineIndexesOptions[] = [ fields: [ 'licence' ], // We don't care videos with an unknown licence where: { licence: { - [Sequelize.Op.ne]: null + [Op.ne]: null } } }, @@ -147,7 +156,7 @@ const indexes: Sequelize.DefineIndexesOptions[] = [ fields: [ 'language' ], // We don't care videos with an unknown language where: { language: { - [Sequelize.Op.ne]: null + [Op.ne]: null } } }, @@ -200,6 +209,8 @@ type AvailableForListIDsOptions = { followerActorId: number includeLocalVideos: boolean + withoutId?: boolean + filter?: VideoFilter categoryOneOf?: number[] nsfw?: boolean @@ -218,20 +229,27 @@ type AvailableForListIDsOptions = { trendingDays?: number user?: UserModel, historyOfUser?: UserModel + + baseWhere?: WhereOptions[] } -@Scopes({ +@Scopes(() => ({ [ ScopeNames.FOR_API ]: (options: ForAPIOptions) => { - const query: IFindOptions = { + const query: FindOptions = { where: { id: { - [ Sequelize.Op.any ]: options.ids + [ 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 } ] } @@ -256,44 +274,46 @@ type AvailableForListIDsOptions = { return query }, [ ScopeNames.AVAILABLE_FOR_LIST_IDS ]: (options: AvailableForListIDsOptions) => { - const query: IFindOptions = { + const whereAnd = options.baseWhere ? options.baseWhere : [] + + const query: FindOptions = { raw: true, - attributes: [ 'id' ], - where: { - id: { - [ Sequelize.Op.and ]: [ - { - [ Sequelize.Op.notIn ]: Sequelize.literal( - '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")' - ) - } - ] - }, - channelId: { - [ Sequelize.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 = { // Always list public videos privacy: VideoPrivacy.PUBLIC, // Always list published videos, or videos that are being transcoded but on which we don't want to wait for transcoding - [ Sequelize.Op.or ]: [ + [ Op.or ]: [ { state: VideoState.PUBLISHED }, { - [ Sequelize.Op.and ]: { + [ Op.and ]: { state: VideoState.TO_TRANSCODE, waitTranscoding: false } @@ -301,7 +321,7 @@ type AvailableForListIDsOptions = { ] } - Object.assign(query.where, privacyWhere) + whereAnd.push(privacyWhere) } if (options.videoPlaylistId) { @@ -318,7 +338,7 @@ type AvailableForListIDsOptions = { } if (options.filter || options.accountId || options.videoChannelId) { - const videoChannelInclude: IIncludeOptions = { + const videoChannelInclude: IncludeOptions = { attributes: [], model: VideoChannelModel.unscoped(), required: true @@ -331,7 +351,7 @@ type AvailableForListIDsOptions = { } if (options.filter || options.accountId) { - const accountInclude: IIncludeOptions = { + const accountInclude: IncludeOptions = { attributes: [], model: AccountModel.unscoped(), required: true @@ -371,86 +391,114 @@ type AvailableForListIDsOptions = { // Force actorId to be a number to avoid SQL injections const actorIdNumber = parseInt(options.followerActorId.toString(), 10) - query.where[ 'id' ][ Sequelize.Op.and ].push({ - [ Sequelize.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' ][ Sequelize.Op.and ].push({ - [ Sequelize.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' ][ Sequelize.Op.and ].push({ - [ Sequelize.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' ][ Sequelize.Op.and ].push({ - [ Sequelize.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' ] = { - [ Sequelize.Op.or ]: options.categoryOneOf - } + whereAnd.push({ + category: { + [ Op.or ]: options.categoryOneOf + } + }) } if (options.licenceOneOf) { - query.where[ 'licence' ] = { - [ Sequelize.Op.or ]: options.licenceOneOf - } + whereAnd.push({ + licence: { + [ Op.or ]: options.licenceOneOf + } + }) } if (options.languageOneOf) { - query.where[ 'language' ] = { - [ Sequelize.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) { @@ -474,12 +522,16 @@ type AvailableForListIDsOptions = { query.subQuery = false } + query.where = { + [ Op.and ]: whereAnd + } + return query }, [ ScopeNames.WITH_THUMBNAILS ]: { include: [ { - model: () => ThumbnailModel, + model: ThumbnailModel, required: false } ] @@ -488,12 +540,12 @@ type AvailableForListIDsOptions = { include: [ { attributes: [ 'accountId' ], - model: () => VideoChannelModel.unscoped(), + model: VideoChannelModel.unscoped(), required: true, include: [ { attributes: [ 'userId' ], - model: () => AccountModel.unscoped(), + model: AccountModel.unscoped(), required: true } ] @@ -503,33 +555,33 @@ type AvailableForListIDsOptions = { [ 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' ] }, @@ -537,11 +589,11 @@ type AvailableForListIDsOptions = { include: [ { attributes: [ 'host' ], - model: () => ServerModel.unscoped(), + model: ServerModel.unscoped(), required: false }, { - model: () => AvatarModel.unscoped(), + model: AvatarModel.unscoped(), required: false } ] @@ -553,13 +605,13 @@ type AvailableForListIDsOptions = { ] }, [ ScopeNames.WITH_TAGS ]: { - include: [ () => TagModel ] + include: [ TagModel ] }, [ ScopeNames.WITH_BLACKLISTED ]: { include: [ { attributes: [ 'id', 'reason' ], - model: () => VideoBlacklistModel, + model: VideoBlacklistModel, required: false } ] @@ -581,8 +633,7 @@ type AvailableForListIDsOptions = { 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 } @@ -606,8 +657,7 @@ type AvailableForListIDsOptions = { 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 } @@ -617,7 +667,7 @@ type AvailableForListIDsOptions = { [ ScopeNames.WITH_SCHEDULED_UPDATE ]: { include: [ { - model: () => ScheduleVideoUpdateModel.unscoped(), + model: ScheduleVideoUpdateModel.unscoped(), required: false } ] @@ -636,7 +686,7 @@ type AvailableForListIDsOptions = { ] } } -}) +})) @Table({ tableName: 'video', indexes @@ -656,19 +706,19 @@ export class VideoModel extends Model { @AllowNull(true) @Default(null) - @Is('VideoCategory', value => throwIfNotValid(value, isVideoCategoryValid, 'category')) + @Is('VideoCategory', value => throwIfNotValid(value, isVideoCategoryValid, 'category', true)) @Column category: number @AllowNull(true) @Default(null) - @Is('VideoLicence', value => throwIfNotValid(value, isVideoLicenceValid, 'licence')) + @Is('VideoLicence', value => throwIfNotValid(value, isVideoLicenceValid, 'licence', true)) @Column licence: number @AllowNull(true) @Default(null) - @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language')) + @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language', true)) @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.LANGUAGE.max)) language: string @@ -684,13 +734,13 @@ export class VideoModel extends Model { @AllowNull(true) @Default(null) - @Is('VideoDescription', value => throwIfNotValid(value, isVideoDescriptionValid, 'description')) + @Is('VideoDescription', value => throwIfNotValid(value, isVideoDescriptionValid, 'description', true)) @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.DESCRIPTION.max)) description: string @AllowNull(true) @Default(null) - @Is('VideoSupport', value => throwIfNotValid(value, isVideoSupportValid, 'support')) + @Is('VideoSupport', value => throwIfNotValid(value, isVideoSupportValid, 'support', true)) @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.SUPPORT.max)) support: string @@ -754,7 +804,7 @@ export class VideoModel extends Model { updatedAt: Date @AllowNull(false) - @Default(Sequelize.NOW) + @Default(DataType.NOW) @Column publishedAt: Date @@ -999,12 +1049,12 @@ export class VideoModel extends Model { distinct: true, offset: start, limit: count, - order: getVideoSort('createdAt', [ 'Tags', 'name', 'ASC' ]), + order: getVideoSort('createdAt', [ 'Tags', 'name', 'ASC' ] as any), // FIXME: sequelize typings where: { id: { - [ Sequelize.Op.in ]: Sequelize.literal('(' + rawQuery + ')') + [ Op.in ]: Sequelize.literal('(' + rawQuery + ')') }, - [ Sequelize.Op.or ]: [ + [ Op.or ]: [ { privacy: VideoPrivacy.PUBLIC }, { privacy: VideoPrivacy.UNLISTED } ] @@ -1021,10 +1071,10 @@ export class VideoModel extends Model { required: false, // We only want videos shared by this actor where: { - [ Sequelize.Op.and ]: [ + [ Op.and ]: [ { id: { - [ Sequelize.Op.not ]: null + [ Op.not ]: null } }, { @@ -1068,9 +1118,8 @@ export class VideoModel extends Model { } return Bluebird.all([ - // FIXME: typing issue - VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findAll(query as any), - VideoModel.sequelize.query(rawCountQuery, { type: Sequelize.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 @@ -1087,50 +1136,54 @@ export class VideoModel extends Model { } static listUserVideosForApi (accountId: number, start: number, count: number, sort: string, withFiles = false) { - const query: IFindOptions = { - 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: { @@ -1158,7 +1211,7 @@ export class VideoModel extends Model { throw new Error('Try to filter all-local but no user has not the see all videos right') } - const query: IFindOptions = { + const query: FindOptions & { where?: null } = { offset: options.start, limit: options.count, order: getVideoSort(options.sort) @@ -1225,8 +1278,8 @@ export class VideoModel extends Model { if (options.startDate || options.endDate) { const publishedAtRange = {} - if (options.startDate) publishedAtRange[ Sequelize.Op.gte ] = options.startDate - if (options.endDate) publishedAtRange[ Sequelize.Op.lte ] = options.endDate + if (options.startDate) publishedAtRange[ Op.gte ] = options.startDate + if (options.endDate) publishedAtRange[ Op.lte ] = options.endDate whereAnd.push({ publishedAt: publishedAtRange }) } @@ -1234,8 +1287,8 @@ export class VideoModel extends Model { if (options.originallyPublishedStartDate || options.originallyPublishedEndDate) { const originallyPublishedAtRange = {} - if (options.originallyPublishedStartDate) originallyPublishedAtRange[ Sequelize.Op.gte ] = options.originallyPublishedStartDate - if (options.originallyPublishedEndDate) originallyPublishedAtRange[ Sequelize.Op.lte ] = options.originallyPublishedEndDate + if (options.originallyPublishedStartDate) originallyPublishedAtRange[ Op.gte ] = options.originallyPublishedStartDate + if (options.originallyPublishedEndDate) originallyPublishedAtRange[ Op.lte ] = options.originallyPublishedEndDate whereAnd.push({ originallyPublishedAt: originallyPublishedAtRange }) } @@ -1243,8 +1296,8 @@ export class VideoModel extends Model { if (options.durationMin || options.durationMax) { const durationRange = {} - if (options.durationMin) durationRange[ Sequelize.Op.gte ] = options.durationMin - if (options.durationMax) durationRange[ Sequelize.Op.lte ] = options.durationMax + if (options.durationMin) durationRange[ Op.gte ] = options.durationMin + if (options.durationMax) durationRange[ Op.lte ] = options.durationMax whereAnd.push({ duration: durationRange }) } @@ -1256,7 +1309,7 @@ export class VideoModel extends Model { whereAnd.push( { id: { - [ Sequelize.Op.in ]: Sequelize.literal( + [ Op.in ]: Sequelize.literal( '(' + 'SELECT "video"."id" FROM "video" ' + 'WHERE ' + @@ -1282,16 +1335,13 @@ export class VideoModel extends Model { ) } - const query: IFindOptions = { + const query = { attributes: { include: attributesInclude }, offset: options.start, limit: options.count, - order: getVideoSort(options.sort), - where: { - [ Sequelize.Op.and ]: whereAnd - } + order: getVideoSort(options.sort) } const serverActor = await getServerActor() @@ -1306,13 +1356,14 @@ export class VideoModel extends Model { tagsOneOf: options.tagsOneOf, tagsAllOf: options.tagsAllOf, user: options.user, - filter: options.filter + filter: options.filter, + baseWhere: whereAnd } return VideoModel.getAvailableForApi(query, queryOptions) } - static load (id: number | string, t?: Sequelize.Transaction) { + static load (id: number | string, t?: Transaction) { const where = buildWhereIdOrUUID(id) const options = { where, @@ -1322,7 +1373,7 @@ export class VideoModel extends Model { return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) } - static loadWithRights (id: number | string, t?: Sequelize.Transaction) { + static loadWithRights (id: number | string, t?: Transaction) { const where = buildWhereIdOrUUID(id) const options = { where, @@ -1336,7 +1387,7 @@ export class VideoModel extends Model { ]).findOne(options) } - static loadOnlyId (id: number | string, t?: Sequelize.Transaction) { + static loadOnlyId (id: number | string, t?: Transaction) { const where = buildWhereIdOrUUID(id) const options = { @@ -1348,7 +1399,7 @@ export class VideoModel extends Model { return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) } - static loadWithFiles (id: number, t?: Sequelize.Transaction, logging?: boolean) { + static loadWithFiles (id: number, t?: Transaction, logging?: boolean) { return VideoModel.scope([ ScopeNames.WITH_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS, @@ -1366,8 +1417,8 @@ export class VideoModel extends Model { return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) } - static loadByUrl (url: string, transaction?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadByUrl (url: string, transaction?: Transaction) { + const query: FindOptions = { where: { url }, @@ -1377,8 +1428,8 @@ export class VideoModel extends Model { return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(query) } - static loadByUrlAndPopulateAccount (url: string, transaction?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction) { + const query: FindOptions = { where: { url }, @@ -1393,16 +1444,16 @@ export class VideoModel extends Model { ]).findOne(query) } - static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Sequelize.Transaction, userId?: number) { + static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Transaction, userId?: number) { const where = buildWhereIdOrUUID(id) const options = { - order: [ [ 'Tags', 'name', 'ASC' ] ], + 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, @@ -1413,7 +1464,7 @@ export class VideoModel extends Model { ] if (userId) { - scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] } as any) // FIXME: typings + scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] }) } return VideoModel @@ -1421,27 +1472,27 @@ export class VideoModel extends Model { .findOne(options) } - static loadForGetAPI (id: number | string, t?: Sequelize.Transaction, userId?: number) { + static loadForGetAPI (id: number | string, t?: Transaction, userId?: number) { const where = buildWhereIdOrUUID(id) const options = { - order: [ [ 'Tags', 'name', 'ASC' ] ], + order: [ [ 'Tags', 'name', 'ASC' ] ] as any, // FIXME: sequelize typings where, 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 @@ -1489,7 +1540,7 @@ export class VideoModel extends Model { 'LIMIT 1' const options = { - type: Sequelize.QueryTypes.SELECT, + type: QueryTypes.SELECT, bind: { followerActorId, videoId }, raw: true } @@ -1498,6 +1549,29 @@ export class VideoModel extends Model { .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() @@ -1506,17 +1580,18 @@ export class VideoModel extends Model { const scopeOptions: AvailableForListIDsOptions = { serverAccountId: serverActor.Account.id, followerActorId, - includeLocalVideos: true + includeLocalVideos: true, + withoutId: true // Don't break aggregation } - const query: IFindOptions = { + const query: FindOptions = { attributes: [ field ], limit: count, group: field, - having: Sequelize.where(Sequelize.fn('COUNT', Sequelize.col(field)), { - [ Sequelize.Op.gte ]: threshold - }) as any, // FIXME: typings - order: [ this.sequelize.random() ] + having: Sequelize.where( + Sequelize.fn('COUNT', Sequelize.col(field)), { [ Op.gte ]: threshold } + ), + order: [ (this.sequelize as any).random() ] } return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST_IDS, scopeOptions ] }) @@ -1532,7 +1607,7 @@ export class VideoModel extends Model { required: false, where: { startDate: { - [ Sequelize.Op.gte ]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays) + [ Op.gte ]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays) } } } @@ -1549,11 +1624,11 @@ export class VideoModel extends Model { } private static async getAvailableForApi ( - query: IFindOptions, + query: FindOptions & { where?: null }, // Forbid where field in query options: AvailableForListIDsOptions, countVideos = true ) { - const idsScope = { + const idsScope: ScopeOptions = { method: [ ScopeNames.AVAILABLE_FOR_LIST_IDS, options ] @@ -1561,22 +1636,26 @@ export class VideoModel extends Model { // Remove trending sort on count, because it uses a group by const countOptions = Object.assign({}, options, { trendingDays: undefined }) - const countQuery = Object.assign({}, query, { attributes: undefined, group: undefined }) - const countScope = { + const countQuery: CountOptions = Object.assign({}, query, { attributes: undefined, group: undefined }) + const countScope: ScopeOptions = { method: [ ScopeNames.AVAILABLE_FOR_LIST_IDS, countOptions ] } - const [ count, rowsId ] = await Promise.all([ - countVideos ? VideoModel.scope(countScope).count(countQuery) : Promise.resolve(undefined), - VideoModel.scope(idsScope).findAll(query) + const [ count, ids ] = await Promise.all([ + countVideos + ? VideoModel.scope(countScope).count(countQuery) + : Promise.resolve(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 } - const secondQuery: IFindOptions = { + const secondQuery: FindOptions = { offset: 0, limit: query.limit, attributes: query.attributes, @@ -1587,16 +1666,10 @@ export class VideoModel extends Model { ] } - // 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({ @@ -1644,13 +1717,17 @@ export class VideoModel extends Model { 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) { @@ -1661,10 +1738,10 @@ export class VideoModel extends Model { 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 () { @@ -1725,8 +1802,8 @@ export class VideoModel extends Model { 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)