X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=7e18af497fce86694d34fad5aa999ad2e68e6b8d;hb=22a73cb879a5cc775d4bec3d72fa9c9cf52e5175;hp=3b30e9e283bf0fdb8e569506f5cbd6b733abbeab;hpb=6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 3b30e9e28..7e18af497 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1,9 +1,18 @@ import * as Bluebird from 'bluebird' -import { maxBy } from 'lodash' -import * as magnetUtil from 'magnet-uri' -import * as parseTorrent from 'parse-torrent' +import { maxBy, minBy } from 'lodash' 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 +25,6 @@ import { ForeignKey, HasMany, HasOne, - IFindOptions, - IIncludeOptions, Is, IsInt, IsUUID, @@ -29,11 +36,11 @@ import { } from 'sequelize-typescript' import { UserRight, VideoPrivacy, VideoState } from '../../../shared' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' -import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' +import { Video, VideoDetails } 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 { isBooleanValid } from '../../helpers/custom-validators/misc' import { isVideoCategoryValid, isVideoDescriptionValid, @@ -45,27 +52,24 @@ 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 { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, - HLS_REDUNDANCY_DIRECTORY, - HLS_STREAMING_PLAYLIST_DIRECTORY, - PREVIEWS_SIZE, + LAZY_STATIC_PATHS, REMOTE_SCHEME, STATIC_DOWNLOAD_PATHS, STATIC_PATHS, - THUMBNAILS_SIZE, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES, VIDEO_STATES, WEBSERVER -} from '../../initializers' +} from '../../initializers/constants' import { sendDeleteVideo } from '../../lib/activitypub/send' import { AccountModel } from '../account/account' import { AccountVideoRateModel } from '../account/account-video-rate' @@ -76,6 +80,7 @@ import { buildBlockedAccountSQL, buildTrigramSearchIndex, buildWhereIdOrUUID, + createSafeIn, createSimilarityAttribute, getVideoSort, isOutdated, @@ -83,7 +88,7 @@ import { } from '../utils' import { TagModel } from './tag' import { VideoAbuseModel } from './video-abuse' -import { ScopeNames as VideoChannelScopeNames, VideoChannelModel } from './video-channel' +import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' import { VideoCommentModel } from './video-comment' import { VideoFileModel } from './video-file' import { VideoShareModel } from './video-share' @@ -91,7 +96,7 @@ import { VideoTagModel } from './video-tag' import { ScheduleVideoUpdateModel } from './schedule-video-update' import { VideoCaptionModel } from './video-caption' import { VideoBlacklistModel } from './video-blacklist' -import { remove, writeFile } from 'fs-extra' +import { remove } from 'fs-extra' import { VideoViewModel } from './video-views' import { VideoRedundancyModel } from '../redundancy/video-redundancy' import { @@ -102,14 +107,45 @@ import { videoModelToFormattedJSON } from './video-format-utils' import { UserVideoHistoryModel } from '../account/user-video-history' -import { UserModel } from '../account/user' import { VideoImportModel } from './video-import' import { VideoStreamingPlaylistModel } from './video-streaming-playlist' import { VideoPlaylistElementModel } from './video-playlist-element' import { CONFIG } from '../../initializers/config' +import { ThumbnailModel } from './thumbnail' +import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type' +import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' +import { + MChannel, + MChannelAccountDefault, + MChannelId, + MStreamingPlaylist, + MStreamingPlaylistFilesVideo, + MUserAccountId, + MUserId, + MVideoAccountLight, + MVideoAccountLightBlacklistAllFiles, + MVideoAP, + MVideoDetails, + MVideoFileVideo, + MVideoFormattable, + MVideoFormattableDetails, + MVideoForUser, + MVideoFullLight, + MVideoIdThumbnail, + MVideoThumbnail, + MVideoThumbnailBlacklist, + MVideoWithAllFiles, + MVideoWithFile, + MVideoWithRights +} from '../../typings/models' +import { MVideoFile, MVideoFileStreamingPlaylistVideo } from '../../typings/models/video/video-file' +import { MThumbnail } from '../../typings/models/video/thumbnail' +import { VideoFile } from '@shared/models/videos/video-file.model' +import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths' +import * as validator from 'validator' // 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' ] }, @@ -121,7 +157,7 @@ const indexes: Sequelize.DefineIndexesOptions[] = [ fields: [ 'originallyPublishedAt' ], where: { originallyPublishedAt: { - [Sequelize.Op.ne]: null + [Op.ne]: null } } }, @@ -129,7 +165,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 } } }, @@ -137,7 +173,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 } } }, @@ -145,7 +181,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 } } }, @@ -176,27 +212,33 @@ export enum ScopeNames { FOR_API = 'FOR_API', WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS', WITH_TAGS = 'WITH_TAGS', - WITH_FILES = 'WITH_FILES', + WITH_WEBTORRENT_FILES = 'WITH_WEBTORRENT_FILES', WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE', WITH_BLACKLISTED = 'WITH_BLACKLISTED', + WITH_BLOCKLIST = 'WITH_BLOCKLIST', WITH_USER_HISTORY = 'WITH_USER_HISTORY', WITH_STREAMING_PLAYLISTS = 'WITH_STREAMING_PLAYLISTS', - WITH_USER_ID = 'WITH_USER_ID' + WITH_USER_ID = 'WITH_USER_ID', + WITH_THUMBNAILS = 'WITH_THUMBNAILS' } -type ForAPIOptions = { - ids: number[] +export type ForAPIOptions = { + ids?: number[] videoPlaylistId?: number withFiles?: boolean + + withAccountBlockerIds?: number[] } -type AvailableForListIDsOptions = { +export type AvailableForListIDsOptions = { serverAccountId: number followerActorId: number includeLocalVideos: boolean + attributesType?: 'none' | 'id' | 'all' + filter?: VideoFilter categoryOneOf?: number[] nsfw?: boolean @@ -213,26 +255,43 @@ type AvailableForListIDsOptions = { videoPlaylistId?: number trendingDays?: number - user?: UserModel, - historyOfUser?: UserModel + user?: MUserAccountId + historyOfUser?: MUserId + + baseWhere?: WhereOptions[] } -@Scopes({ +@Scopes(() => ({ [ ScopeNames.FOR_API ]: (options: ForAPIOptions) => { - const query: IFindOptions = { - where: { - id: { - [ Sequelize.Op.any ]: options.ids - } - }, + const query: FindOptions = { include: [ { - model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, true ] }), + model: VideoChannelModel.scope({ + method: [ + VideoChannelScopeNames.SUMMARY, { + withAccount: true, + withAccountBlockerIds: options.withAccountBlockerIds + } as SummaryOptions + ] + }), required: true + }, + { + attributes: [ 'type', 'filename' ], + model: ThumbnailModel, + required: false } ] } + if (options.ids) { + query.where = { + id: { + [ Op.in ]: options.ids // FIXME: sequelize ANY seems broken + } + } + } + if (options.withFiles === true) { query.include.push({ model: VideoFileModel.unscoped(), @@ -253,21 +312,30 @@ 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")' - ) - } - ] - }, + include: [] + } + + const attributesType = options.attributesType || 'id' + + if (attributesType === 'id') query.attributes = [ 'id' ] + else if (attributesType === 'none') query.attributes = [ ] + + whereAnd.push({ + id: { + [ Op.notIn ]: Sequelize.literal( + '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")' + ) + } + }) + + if (options.serverAccountId) { + whereAnd.push({ channelId: { - [ Sequelize.Op.notIn ]: Sequelize.literal( + [ Op.notIn ]: Sequelize.literal( '(' + 'SELECT id FROM "videoChannel" WHERE "accountId" IN (' + buildBlockedAccountSQL(options.serverAccountId, options.user ? options.user.Account.id : undefined) + @@ -275,30 +343,46 @@ type AvailableForListIDsOptions = { ')' ) } - }, - include: [] + }) } // Only list public/published videos if (!options.filter || options.filter !== 'all-local') { - const privacyWhere = { - // Always list public videos - privacy: VideoPrivacy.PUBLIC, + + const publishWhere = { // 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 } } ] } + whereAnd.push(publishWhere) + + // List internal videos if the user is logged in + if (options.user) { + const privacyWhere = { + [Op.or]: [ + { + privacy: VideoPrivacy.INTERNAL + }, + { + privacy: VideoPrivacy.PUBLIC + } + ] + } - Object.assign(query.where, privacyWhere) + whereAnd.push(privacyWhere) + } else { // Or only public videos + const privacyWhere = { privacy: VideoPrivacy.PUBLIC } + whereAnd.push(privacyWhere) + } } if (options.videoPlaylistId) { @@ -315,7 +399,7 @@ type AvailableForListIDsOptions = { } if (options.filter || options.accountId || options.videoChannelId) { - const videoChannelInclude: IIncludeOptions = { + const videoChannelInclude: IncludeOptions = { attributes: [], model: VideoChannelModel.unscoped(), required: true @@ -328,7 +412,7 @@ type AvailableForListIDsOptions = { } if (options.filter || options.accountId) { - const accountInclude: IIncludeOptions = { + const accountInclude: IncludeOptions = { attributes: [], model: AccountModel.unscoped(), required: true @@ -368,86 +452,118 @@ 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) + ')' + - ')' - ) + const tagsOneOfLower = options.tagsOneOf.map(t => t.toLowerCase()) + + whereAnd.push({ + id: { + [ Op.in ]: Sequelize.literal( + '(' + + 'SELECT "videoId" FROM "videoTag" ' + + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + + 'WHERE lower("tag"."name") IN (' + createSafeIn(VideoModel, tagsOneOfLower) + ')' + + ')' + ) + } }) } 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 + - ')' - ) + const tagsAllOfLower = options.tagsAllOf.map(t => t.toLowerCase()) + + whereAnd.push({ + id: { + [ Op.in ]: Sequelize.literal( + '(' + + 'SELECT "videoId" FROM "videoTag" ' + + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + + 'WHERE lower("tag"."name") IN (' + createSafeIn(VideoModel, tagsAllOfLower) + ')' + + 'GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + tagsAllOfLower.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) { @@ -471,18 +587,33 @@ type AvailableForListIDsOptions = { query.subQuery = false } + query.where = { + [ Op.and ]: whereAnd + } + return query }, + [ScopeNames.WITH_BLOCKLIST]: { + + }, + [ ScopeNames.WITH_THUMBNAILS ]: { + include: [ + { + model: ThumbnailModel, + required: false + } + ] + }, [ ScopeNames.WITH_USER_ID ]: { include: [ { attributes: [ 'accountId' ], - model: () => VideoChannelModel.unscoped(), + model: VideoChannelModel.unscoped(), required: true, include: [ { attributes: [ 'userId' ], - model: () => AccountModel.unscoped(), + model: AccountModel.unscoped(), required: true } ] @@ -492,33 +623,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' ] }, @@ -526,11 +657,11 @@ type AvailableForListIDsOptions = { include: [ { attributes: [ 'host' ], - model: () => ServerModel.unscoped(), + model: ServerModel.unscoped(), required: false }, { - model: () => AvatarModel.unscoped(), + model: AvatarModel.unscoped(), required: false } ] @@ -542,18 +673,18 @@ type AvailableForListIDsOptions = { ] }, [ ScopeNames.WITH_TAGS ]: { - include: [ () => TagModel ] + include: [ TagModel ] }, [ ScopeNames.WITH_BLACKLISTED ]: { include: [ { - attributes: [ 'id', 'reason' ], - model: () => VideoBlacklistModel, + attributes: [ 'id', 'reason', 'unfederated' ], + model: VideoBlacklistModel, required: false } ] }, - [ ScopeNames.WITH_FILES ]: (withRedundancies = false) => { + [ ScopeNames.WITH_WEBTORRENT_FILES ]: (withRedundancies = false) => { let subInclude: any[] = [] if (withRedundancies === true) { @@ -570,8 +701,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 } @@ -579,24 +709,26 @@ type AvailableForListIDsOptions = { } }, [ ScopeNames.WITH_STREAMING_PLAYLISTS ]: (withRedundancies = false) => { - let subInclude: any[] = [] + const subInclude: IncludeOptions[] = [ + { + model: VideoFileModel.unscoped(), + required: false + } + ] if (withRedundancies === true) { - subInclude = [ - { - attributes: [ 'fileUrl' ], - model: VideoRedundancyModel.unscoped(), - required: false - } - ] + subInclude.push({ + attributes: [ 'fileUrl' ], + model: VideoRedundancyModel.unscoped(), + required: false + }) } return { 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 } @@ -606,7 +738,7 @@ type AvailableForListIDsOptions = { [ ScopeNames.WITH_SCHEDULED_UPDATE ]: { include: [ { - model: () => ScheduleVideoUpdateModel.unscoped(), + model: ScheduleVideoUpdateModel.unscoped(), required: false } ] @@ -625,7 +757,7 @@ type AvailableForListIDsOptions = { ] } } -}) +})) @Table({ tableName: 'video', indexes @@ -645,19 +777,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 @@ -673,13 +805,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 @@ -743,7 +875,7 @@ export class VideoModel extends Model { updatedAt: Date @AllowNull(false) - @Default(Sequelize.NOW) + @Default(DataType.NOW) @Column publishedAt: Date @@ -771,13 +903,23 @@ export class VideoModel extends Model { }) Tags: TagModel[] - @HasMany(() => VideoPlaylistElementModel, { + @HasMany(() => ThumbnailModel, { foreignKey: { name: 'videoId', - allowNull: false + allowNull: true }, + hooks: true, onDelete: 'cascade' }) + Thumbnails: ThumbnailModel[] + + @HasMany(() => VideoPlaylistElementModel, { + foreignKey: { + name: 'videoId', + allowNull: true + }, + onDelete: 'set null' + }) VideoPlaylistElements: VideoPlaylistElementModel[] @HasMany(() => VideoAbuseModel, { @@ -792,7 +934,7 @@ export class VideoModel extends Model { @HasMany(() => VideoFileModel, { foreignKey: { name: 'videoId', - allowNull: false + allowNull: true }, hooks: true, onDelete: 'cascade' @@ -894,18 +1036,16 @@ export class VideoModel extends Model { VideoCaptions: VideoCaptionModel[] @BeforeDestroy - static async sendDelete (instance: VideoModel, options) { + static async sendDelete (instance: MVideoAccountLight, options) { if (instance.isOwned()) { if (!instance.VideoChannel) { instance.VideoChannel = await instance.$get('VideoChannel', { include: [ - { - model: AccountModel, - include: [ ActorModel ] - } + ActorModel, + AccountModel ], transaction: options.transaction - }) as VideoChannelModel + }) as MChannelAccountDefault } return sendDeleteVideo(instance, options.transaction) @@ -920,15 +1060,11 @@ export class VideoModel extends Model { logger.info('Removing files of video %s.', instance.url) - tasks.push(instance.removeThumbnail()) - if (instance.isOwned()) { if (!Array.isArray(instance.VideoFiles)) { instance.VideoFiles = await instance.$get('VideoFiles') as VideoFileModel[] } - tasks.push(instance.removePreview()) - // Remove physical files and torrents instance.VideoFiles.forEach(file => { tasks.push(instance.removeFile(file)) @@ -948,14 +1084,18 @@ export class VideoModel extends Model { return undefined } - static listLocal () { + static listLocal (): Bluebird { const query = { where: { remote: false } } - return VideoModel.scope([ ScopeNames.WITH_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS ]).findAll(query) + return VideoModel.scope([ + ScopeNames.WITH_WEBTORRENT_FILES, + ScopeNames.WITH_STREAMING_PLAYLISTS, + ScopeNames.WITH_THUMBNAILS + ]).findAll(query) } static listAllAndSharedByActorForOutbox (actorId: number, start: number, count: number) { @@ -978,12 +1118,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 } ] @@ -1000,10 +1140,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 } }, { @@ -1047,9 +1187,8 @@ export class VideoModel extends Model { } return Bluebird.all([ - // FIXME: typing issue - VideoModel.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 @@ -1065,44 +1204,43 @@ 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 - } - ] + static listUserVideosForApi (accountId: number, start: number, count: number, sort: string) { + function buildBaseQuery (): FindOptions { + return { + offset: start, + limit: count, + order: getVideoSort(sort), + include: [ + { + model: VideoChannelModel, + required: true, + include: [ + { + model: AccountModel, + where: { + id: accountId + }, + required: true + } + ] + } + ] + } } - if (withFiles === true) { - query.include.push({ - model: VideoFileModel.unscoped(), - required: true - }) - } + const countQuery = buildBaseQuery() + const findQuery = buildBaseQuery() - return VideoModel.findAndCountAll(query).then(({ rows, count }) => { + const findScopes = [ + ScopeNames.WITH_SCHEDULED_UPDATE, + ScopeNames.WITH_BLACKLISTED, + ScopeNames.WITH_THUMBNAILS + ] + + return Promise.all([ + VideoModel.count(countQuery), + VideoModel.scope(findScopes).findAll(findQuery) + ]).then(([ count, rows ]) => { return { data: rows, total: count @@ -1128,14 +1266,14 @@ export class VideoModel extends Model { followerActorId?: number videoPlaylistId?: number, trendingDays?: number, - user?: UserModel, - historyOfUser?: UserModel + user?: MUserAccountId, + historyOfUser?: MUserId }, countVideos = true) { if (options.filter && options.filter === 'all-local' && !options.user.hasRight(UserRight.SEE_ALL_VIDEOS)) { 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) @@ -1194,7 +1332,7 @@ export class VideoModel extends Model { tagsAllOf?: string[] durationMin?: number // seconds durationMax?: number // seconds - user?: UserModel, + user?: MUserAccountId, filter?: VideoFilter }) { const whereAnd = [] @@ -1202,8 +1340,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 }) } @@ -1211,8 +1349,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 }) } @@ -1220,8 +1358,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 }) } @@ -1230,24 +1368,35 @@ export class VideoModel extends Model { const escapedSearch = VideoModel.sequelize.escape(options.search) const escapedLikeSearch = VideoModel.sequelize.escape('%' + options.search + '%') if (options.search) { - whereAnd.push( - { - id: { - [ Sequelize.Op.in ]: Sequelize.literal( - '(' + - 'SELECT "video"."id" FROM "video" ' + - 'WHERE ' + - 'lower(immutable_unaccent("video"."name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' + - 'lower(immutable_unaccent("video"."name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' + - 'UNION ALL ' + - 'SELECT "video"."id" FROM "video" LEFT JOIN "videoTag" ON "videoTag"."videoId" = "video"."id" ' + - 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + - 'WHERE "tag"."name" = ' + escapedSearch + - ')' - ) - } + const trigramSearch = { + id: { + [ Op.in ]: Sequelize.literal( + '(' + + 'SELECT "video"."id" FROM "video" ' + + 'WHERE ' + + 'lower(immutable_unaccent("video"."name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' + + 'lower(immutable_unaccent("video"."name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' + + 'UNION ALL ' + + 'SELECT "video"."id" FROM "video" LEFT JOIN "videoTag" ON "videoTag"."videoId" = "video"."id" ' + + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + + 'WHERE "tag"."name" = ' + escapedSearch + + ')' + ) } - ) + } + + if (validator.isUUID(options.search)) { + whereAnd.push({ + [Op.or]: [ + trigramSearch, + { + uuid: options.search + } + ] + }) + } else { + whereAnd.push(trigramSearch) + } attributesInclude.push(createSimilarityAttribute('VideoModel.name', options.search)) } @@ -1259,16 +1408,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() @@ -1283,33 +1429,51 @@ 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): Bluebird { const where = buildWhereIdOrUUID(id) const options = { where, transaction: t } - return VideoModel.findOne(options) + return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) } - static loadWithRights (id: number | string, t?: Sequelize.Transaction) { + static loadWithBlacklist (id: number | string, t?: Transaction): Bluebird { const where = buildWhereIdOrUUID(id) const options = { where, transaction: t } - return VideoModel.scope([ ScopeNames.WITH_BLACKLISTED, ScopeNames.WITH_USER_ID ]).findOne(options) + return VideoModel.scope([ + ScopeNames.WITH_THUMBNAILS, + ScopeNames.WITH_BLACKLISTED + ]).findOne(options) } - static loadOnlyId (id: number | string, t?: Sequelize.Transaction) { + static loadWithRights (id: number | string, t?: Transaction): Bluebird { + const where = buildWhereIdOrUUID(id) + const options = { + where, + transaction: t + } + + return VideoModel.scope([ + ScopeNames.WITH_BLACKLISTED, + ScopeNames.WITH_USER_ID, + ScopeNames.WITH_THUMBNAILS + ]).findOne(options) + } + + static loadOnlyId (id: number | string, t?: Transaction): Bluebird { const where = buildWhereIdOrUUID(id) const options = { @@ -1318,37 +1482,48 @@ export class VideoModel extends Model { transaction: t } - return VideoModel.findOne(options) + return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) } - static loadWithFiles (id: number, t?: Sequelize.Transaction, logging?: boolean) { - return VideoModel.scope([ ScopeNames.WITH_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS ]) - .findByPk(id, { transaction: t, logging }) + static loadWithFiles (id: number | string, t?: Transaction, logging?: boolean): Bluebird { + const where = buildWhereIdOrUUID(id) + + const query = { + where, + transaction: t, + logging + } + + return VideoModel.scope([ + ScopeNames.WITH_WEBTORRENT_FILES, + ScopeNames.WITH_STREAMING_PLAYLISTS, + ScopeNames.WITH_THUMBNAILS + ]).findOne(query) } - static loadByUUIDWithFile (uuid: string) { + static loadByUUID (uuid: string): Bluebird { const options = { where: { uuid } } - return VideoModel.findOne(options) + return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) } - static loadByUrl (url: string, transaction?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadByUrl (url: string, transaction?: Transaction): Bluebird { + const query: FindOptions = { where: { url }, transaction } - return VideoModel.findOne(query) + return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(query) } - static loadByUrlAndPopulateAccount (url: string, transaction?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Bluebird { + const query: FindOptions = { where: { url }, @@ -1357,31 +1532,34 @@ export class VideoModel extends Model { return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_FILES, - ScopeNames.WITH_STREAMING_PLAYLISTS + ScopeNames.WITH_WEBTORRENT_FILES, + ScopeNames.WITH_STREAMING_PLAYLISTS, + ScopeNames.WITH_THUMBNAILS, + ScopeNames.WITH_BLACKLISTED ]).findOne(query) } - static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Sequelize.Transaction, userId?: number) { + static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Transaction, userId?: number): Bluebird { 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, ScopeNames.WITH_SCHEDULED_UPDATE, - ScopeNames.WITH_FILES, - ScopeNames.WITH_STREAMING_PLAYLISTS + ScopeNames.WITH_WEBTORRENT_FILES, + ScopeNames.WITH_STREAMING_PLAYLISTS, + ScopeNames.WITH_THUMBNAILS ] if (userId) { - scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] } as any) // FIXME: typings + scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] }) } return VideoModel @@ -1389,26 +1567,32 @@ export class VideoModel extends Model { .findOne(options) } - static loadForGetAPI (id: number | string, t?: Sequelize.Transaction, userId?: number) { + static loadForGetAPI (parameters: { + id: number | string, + t?: Transaction, + userId?: number + }): Bluebird { + const { id, t, userId } = parameters 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, - { method: [ ScopeNames.WITH_FILES, true ] } as any, // FIXME: typings - { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] } as any // FIXME: typings + ScopeNames.WITH_THUMBNAILS, + { method: [ ScopeNames.WITH_WEBTORRENT_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 @@ -1456,7 +1640,7 @@ export class VideoModel extends Model { 'LIMIT 1' const options = { - type: Sequelize.QueryTypes.SELECT, + type: QueryTypes.SELECT as QueryTypes.SELECT, bind: { followerActorId, videoId }, raw: true } @@ -1465,6 +1649,29 @@ export class VideoModel extends Model { .then(results => results.length === 1) } + static bulkUpdateSupportField (videoChannel: MChannel, t: Transaction) { + const options = { + where: { + channelId: videoChannel.id + }, + transaction: t + } + + return VideoModel.update({ support: videoChannel.support }, options) + } + + static getAllIdsFromChannel (videoChannel: MChannelId): Bluebird { + 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() @@ -1473,17 +1680,18 @@ export class VideoModel extends Model { const scopeOptions: AvailableForListIDsOptions = { serverAccountId: serverActor.Account.id, followerActorId, - includeLocalVideos: true + includeLocalVideos: true, + attributesType: 'none' // 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 ] }) @@ -1499,7 +1707,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) } } } @@ -1516,11 +1724,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 ] @@ -1528,22 +1736,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, @@ -1554,16 +1766,10 @@ export class VideoModel extends Model { ] } - // FIXME: typing - const apiScope: any[] = [] + 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({ @@ -1584,6 +1790,10 @@ export class VideoModel extends Model { } } + private static isPrivacyForFederation (privacy: VideoPrivacy) { + return privacy === VideoPrivacy.PUBLIC || privacy === VideoPrivacy.UNLISTED + } + static getCategoryLabel (id: number) { return VIDEO_CATEGORIES[ id ] || 'Misc' } @@ -1604,83 +1814,85 @@ export class VideoModel extends Model { return VIDEO_STATES[ id ] || 'Unknown' } - getOriginalFile () { - if (Array.isArray(this.VideoFiles) === false) return undefined - - // The original file is the file that have the higher resolution - return maxBy(this.VideoFiles, file => file.resolution) + isBlacklisted () { + return !!this.VideoBlacklist } - getVideoFilename (videoFile: VideoFileModel) { - return this.uuid + '-' + videoFile.resolution + videoFile.extname + isBlocked () { + return (this.VideoChannel.Account.Actor.Server && this.VideoChannel.Account.Actor.Server.isBlocked()) || + this.VideoChannel.Account.isBlocked() } - getThumbnailName () { - const extension = '.jpg' - return this.uuid + extension - } + getQualityFileBy (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) { + if (Array.isArray(this.VideoFiles) && this.VideoFiles.length !== 0) { + const file = fun(this.VideoFiles, file => file.resolution) - getPreviewName () { - const extension = '.jpg' - return this.uuid + extension - } + return Object.assign(file, { Video: this }) + } + + // No webtorrent files, try with streaming playlist files + if (Array.isArray(this.VideoStreamingPlaylists) && this.VideoStreamingPlaylists.length !== 0) { + const streamingPlaylistWithVideo = Object.assign(this.VideoStreamingPlaylists[0], { Video: this }) + + const file = fun(streamingPlaylistWithVideo.VideoFiles, file => file.resolution) + return Object.assign(file, { VideoStreamingPlaylist: streamingPlaylistWithVideo }) + } - getTorrentFileName (videoFile: VideoFileModel) { - const extension = '.torrent' - return this.uuid + '-' + videoFile.resolution + extension + return undefined } - isOwned () { - return this.remote === false + getMaxQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + return this.getQualityFileBy(maxBy) } - createPreview (videoFile: VideoFileModel) { - return generateImageFromVideoFile( - this.getVideoFilePath(videoFile), - CONFIG.STORAGE.PREVIEWS_DIR, - this.getPreviewName(), - PREVIEWS_SIZE - ) + getMinQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + return this.getQualityFileBy(minBy) } - createThumbnail (videoFile: VideoFileModel) { - return generateImageFromVideoFile( - this.getVideoFilePath(videoFile), - CONFIG.STORAGE.THUMBNAILS_DIR, - this.getThumbnailName(), - THUMBNAILS_SIZE - ) + getWebTorrentFile (this: T, resolution: number): MVideoFileVideo { + if (Array.isArray(this.VideoFiles) === false) return undefined + + const file = this.VideoFiles.find(f => f.resolution === resolution) + if (!file) return undefined + + return Object.assign(file, { Video: this }) } - getTorrentFilePath (videoFile: VideoFileModel) { - return join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) + async addAndSaveThumbnail (thumbnail: MThumbnail, 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 === savedThumbnail.id)) return + + this.Thumbnails.push(savedThumbnail) } - getVideoFilePath (videoFile: VideoFileModel) { - return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile)) + generateThumbnailName () { + return this.uuid + '.jpg' } - async createTorrentAndSetInfoHash (videoFile: VideoFileModel) { - const options = { - // Keep the extname, it's used by the client to stream the file inside a web browser - name: `${this.name} ${videoFile.resolution}p${videoFile.extname}`, - createdBy: 'PeerTube', - announceList: [ - [ WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + '/tracker/socket' ], - [ WEBSERVER.URL + '/tracker/announce' ] - ], - urlList: [ WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) ] - } + getMiniature () { + if (Array.isArray(this.Thumbnails) === false) return undefined + + return this.Thumbnails.find(t => t.type === ThumbnailType.MINIATURE) + } - const torrent = await createTorrentPromise(this.getVideoFilePath(videoFile), options) + generatePreviewName () { + return this.uuid + '.jpg' + } - const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) - logger.info('Creating torrent %s.', filePath) + getPreview () { + if (Array.isArray(this.Thumbnails) === false) return undefined - await writeFile(filePath, torrent) + return this.Thumbnails.find(t => t.type === ThumbnailType.PREVIEW) + } - const parsedTorrent = parseTorrent(torrent) - videoFile.infoHash = parsedTorrent.infoHash + isOwned () { + return this.remote === false } getWatchStaticPath () { @@ -1691,27 +1903,35 @@ export class VideoModel extends Model { return '/videos/embed/' + this.uuid } - getThumbnailStaticPath () { - return join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName()) + getMiniatureStaticPath () { + const thumbnail = this.getMiniature() + if (!thumbnail) return null + + return join(STATIC_PATHS.THUMBNAILS, thumbnail.filename) } getPreviewStaticPath () { - return join(STATIC_PATHS.PREVIEWS, this.getPreviewName()) + const preview = this.getPreview() + if (!preview) return null + + // We use a local cache, so specify our cache endpoint instead of potential remote URL + return join(LAZY_STATIC_PATHS.PREVIEWS, preview.filename) } - toFormattedJSON (options?: VideoFormattingJSONOptions): Video { + toFormattedJSON (this: MVideoFormattable, options?: VideoFormattingJSONOptions): Video { return videoModelToFormattedJSON(this, options) } - toFormattedDetailsJSON (): VideoDetails { + toFormattedDetailsJSON (this: MVideoFormattableDetails): VideoDetails { return videoModelToFormattedDetailsJSON(this) } getFormattedVideoFilesJSON (): VideoFile[] { - return videoFilesModelToFormattedJSON(this, this.VideoFiles) + const { baseUrlHttp, baseUrlWs } = this.getBaseUrls() + return videoFilesModelToFormattedJSON(this, baseUrlHttp, baseUrlWs, this.VideoFiles) } - toActivityPubObject (): VideoTorrentObject { + toActivityPubObject (this: MVideoAP): VideoTorrentObject { return videoModelToActivityPubObject(this) } @@ -1719,11 +1939,13 @@ export class VideoModel extends Model { if (!this.description) return null const maxLength = CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max - return peertubeTruncate(this.description, maxLength) + return peertubeTruncate(this.description, { length: maxLength }) } - getOriginalFileResolution () { - const originalFilePath = this.getVideoFilePath(this.getOriginalFile()) + getMaxQualityResolution () { + const file = this.getMaxQualityFile() + const videoOrPlaylist = file.getVideoOrStreamingPlaylist() + const originalFilePath = getVideoFilePath(videoOrPlaylist, file) return getVideoFileResolution(originalFilePath) } @@ -1732,38 +1954,45 @@ export class VideoModel extends Model { return `/api/${API_VERSION}/videos/${this.uuid}/description` } - removeThumbnail () { - const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName()) - return remove(thumbnailPath) - .catch(err => logger.warn('Cannot delete thumbnail %s.', thumbnailPath, { err })) - } + getHLSPlaylist (): MStreamingPlaylistFilesVideo { + if (!this.VideoStreamingPlaylists) return undefined + + const playlist = this.VideoStreamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + playlist.Video = this - removePreview () { - const previewPath = join(CONFIG.STORAGE.PREVIEWS_DIR + this.getPreviewName()) - return remove(previewPath) - .catch(err => logger.warn('Cannot delete preview %s.', previewPath, { err })) + return playlist } - removeFile (videoFile: VideoFileModel, isRedundancy = false) { - const baseDir = isRedundancy ? CONFIG.STORAGE.REDUNDANCY_DIR : CONFIG.STORAGE.VIDEOS_DIR + setHLSPlaylist (playlist: MStreamingPlaylist) { + const toAdd = [ playlist ] as [ VideoStreamingPlaylistModel ] + + if (Array.isArray(this.VideoStreamingPlaylists) === false || this.VideoStreamingPlaylists.length === 0) { + this.VideoStreamingPlaylists = toAdd + return + } - const filePath = join(baseDir, this.getVideoFilename(videoFile)) + this.VideoStreamingPlaylists = this.VideoStreamingPlaylists + .filter(s => s.type !== VideoStreamingPlaylistType.HLS) + .concat(toAdd) + } + + removeFile (videoFile: MVideoFile, isRedundancy = false) { + const filePath = getVideoFilePath(this, videoFile, isRedundancy) return remove(filePath) .catch(err => logger.warn('Cannot delete file %s.', filePath, { err })) } - removeTorrent (videoFile: VideoFileModel) { - const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) + removeTorrent (videoFile: MVideoFile) { + const torrentPath = getTorrentFilePath(this, videoFile) return remove(torrentPath) .catch(err => logger.warn('Cannot delete torrent %s.', torrentPath, { err })) } removeStreamingPlaylist (isRedundancy = false) { - const baseDir = isRedundancy ? HLS_REDUNDANCY_DIRECTORY : HLS_STREAMING_PLAYLIST_DIRECTORY + const directoryPath = getHLSDirectory(this, isRedundancy) - const filePath = join(baseDir, this.uuid) - return remove(filePath) - .catch(err => logger.warn('Cannot delete playlist directory %s.', filePath, { err })) + return remove(directoryPath) + .catch(err => logger.warn('Cannot delete playlist directory %s.', directoryPath, { err })) } isOutdated () { @@ -1772,75 +2001,89 @@ export class VideoModel extends Model { return isOutdated(this, ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL) } + hasPrivacyForFederation () { + return VideoModel.isPrivacyForFederation(this.privacy) + } + + isNewVideo (newPrivacy: VideoPrivacy) { + return this.hasPrivacyForFederation() === false && VideoModel.isPrivacyForFederation(newPrivacy) === true + } + setAsRefreshed () { this.changed('updatedAt', true) return this.save() } - getBaseUrls () { - let baseUrlHttp - let baseUrlWs + requiresAuth () { + return this.privacy === VideoPrivacy.PRIVATE || this.privacy === VideoPrivacy.INTERNAL || !!this.VideoBlacklist + } - if (this.isOwned()) { - baseUrlHttp = WEBSERVER.URL - baseUrlWs = WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT - } else { - baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.VideoChannel.Account.Actor.Server.host - baseUrlWs = REMOTE_SCHEME.WS + '://' + this.VideoChannel.Account.Actor.Server.host + setPrivacy (newPrivacy: VideoPrivacy) { + if (this.privacy === VideoPrivacy.PRIVATE && newPrivacy !== VideoPrivacy.PRIVATE) { + this.publishedAt = new Date() } - return { baseUrlHttp, baseUrlWs } + this.privacy = newPrivacy } - generateMagnetUri (videoFile: VideoFileModel, baseUrlHttp: string, baseUrlWs: string) { - const xs = this.getTorrentUrl(videoFile, baseUrlHttp) - const announce = this.getTrackerUrls(baseUrlHttp, baseUrlWs) - let urlList = [ this.getVideoFileUrl(videoFile, baseUrlHttp) ] + isConfidential () { + return this.privacy === VideoPrivacy.PRIVATE || + this.privacy === VideoPrivacy.UNLISTED || + this.privacy === VideoPrivacy.INTERNAL + } - const redundancies = videoFile.RedundancyVideos - if (isArray(redundancies)) urlList = urlList.concat(redundancies.map(r => r.fileUrl)) + async publishIfNeededAndSave (t: Transaction) { + if (this.state !== VideoState.PUBLISHED) { + this.state = VideoState.PUBLISHED + this.publishedAt = new Date() + await this.save({ transaction: t }) - const magnetHash = { - xs, - announce, - urlList, - infoHash: videoFile.infoHash, - name: this.name + return true } - return magnetUtil.encode(magnetHash) + return false } - getTrackerUrls (baseUrlHttp: string, baseUrlWs: string) { - return [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ] + getBaseUrls () { + if (this.isOwned()) { + return { + baseUrlHttp: WEBSERVER.URL, + baseUrlWs: WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + } + } + + return { + baseUrlHttp: REMOTE_SCHEME.HTTP + '://' + this.VideoChannel.Account.Actor.Server.host, + baseUrlWs: REMOTE_SCHEME.WS + '://' + this.VideoChannel.Account.Actor.Server.host + } } - getThumbnailUrl (baseUrlHttp: string) { - return baseUrlHttp + STATIC_PATHS.THUMBNAILS + this.getThumbnailName() + getTrackerUrls (baseUrlHttp: string, baseUrlWs: string) { + return [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ] } - getTorrentUrl (videoFile: VideoFileModel, baseUrlHttp: string) { - return baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile) + getTorrentUrl (videoFile: MVideoFile, baseUrlHttp: string) { + return baseUrlHttp + STATIC_PATHS.TORRENTS + getTorrentFileName(this, videoFile) } - getTorrentDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { - return baseUrlHttp + STATIC_DOWNLOAD_PATHS.TORRENTS + this.getTorrentFileName(videoFile) + getTorrentDownloadUrl (videoFile: MVideoFile, baseUrlHttp: string) { + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.TORRENTS + getTorrentFileName(this, videoFile) } - getVideoFileUrl (videoFile: VideoFileModel, baseUrlHttp: string) { - return baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) + getVideoFileUrl (videoFile: MVideoFile, baseUrlHttp: string) { + return baseUrlHttp + STATIC_PATHS.WEBSEED + getVideoFilename(this, videoFile) } - getVideoRedundancyUrl (videoFile: VideoFileModel, baseUrlHttp: string) { - return baseUrlHttp + STATIC_PATHS.REDUNDANCY + this.getVideoFilename(videoFile) + getVideoRedundancyUrl (videoFile: MVideoFile, baseUrlHttp: string) { + return baseUrlHttp + STATIC_PATHS.REDUNDANCY + getVideoFilename(this, videoFile) } - getVideoFileDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { - return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + this.getVideoFilename(videoFile) + getVideoFileDownloadUrl (videoFile: MVideoFile, baseUrlHttp: string) { + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + getVideoFilename(this, videoFile) } - getBandwidthBits (videoFile: VideoFileModel) { + getBandwidthBits (videoFile: MVideoFile) { return Math.ceil((videoFile.size * 8) / this.duration) } }