X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=fec3dcc205001d7da881693d61a36c12d4b6fcca;hb=7cde3b9c2e84ea20bb0aae4544598483cde9e22c;hp=7e3512fe1c36b047abfd67b6a42a6711a40137e3;hpb=66fb2aa39b6f8e4677f80128c27fbafd3a8fe2e7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 7e3512fe1..fec3dcc20 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1,5 +1,5 @@ import * as Bluebird from 'bluebird' -import { maxBy } from 'lodash' +import { maxBy, minBy } from 'lodash' import { join } from 'path' import { CountOptions, @@ -59,8 +59,6 @@ import { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, - HLS_REDUNDANCY_DIRECTORY, - HLS_STREAMING_PLAYLIST_DIRECTORY, LAZY_STATIC_PATHS, REMOTE_SCHEME, STATIC_DOWNLOAD_PATHS, @@ -143,14 +141,20 @@ import { 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 { getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath, getHLSDirectory } from '@server/lib/video-paths' +import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths' +import 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: (ModelIndexesOptions & { where?: WhereOptions })[] = [ buildTrigramSearchIndex('video_name_trigram', 'name'), { fields: [ 'createdAt' ] }, - { fields: [ 'publishedAt' ] }, + { + fields: [ + { name: 'publishedAt', order: 'DESC' }, + { name: 'id', order: 'ASC' } + ] + }, { fields: [ 'duration' ] }, { fields: [ 'views' ] }, { fields: [ 'channelId' ] }, @@ -216,7 +220,6 @@ export enum ScopeNames { 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', @@ -313,7 +316,7 @@ export type AvailableForListIDsOptions = { return query }, [ ScopeNames.AVAILABLE_FOR_LIST_IDS ]: (options: AvailableForListIDsOptions) => { - const whereAnd = options.baseWhere ? options.baseWhere : [] + const whereAnd = options.baseWhere ? [].concat(options.baseWhere) : [] const query: FindOptions = { raw: true, @@ -349,9 +352,8 @@ export type AvailableForListIDsOptions = { // 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 [ Op.or ]: [ { @@ -365,8 +367,26 @@ export type AvailableForListIDsOptions = { } ] } + 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 + } + ] + } - whereAnd.push(privacyWhere) + whereAnd.push(privacyWhere) + } else { // Or only public videos + const privacyWhere = { privacy: VideoPrivacy.PUBLIC } + whereAnd.push(privacyWhere) + } } if (options.videoPlaylistId) { @@ -382,7 +402,13 @@ export type AvailableForListIDsOptions = { query.subQuery = false } - if (options.filter || options.accountId || options.videoChannelId) { + if (options.filter && (options.filter === 'local' || options.filter === 'all-local')) { + whereAnd.push({ + remote: false + }) + } + + if (options.accountId || options.videoChannelId) { const videoChannelInclude: IncludeOptions = { attributes: [], model: VideoChannelModel.unscoped(), @@ -395,28 +421,14 @@ export type AvailableForListIDsOptions = { } } - if (options.filter || options.accountId) { + if (options.accountId) { const accountInclude: IncludeOptions = { attributes: [], model: AccountModel.unscoped(), required: true } - if (options.filter) { - accountInclude.include = [ - { - attributes: [], - model: ActorModel.unscoped(), - required: true, - where: VideoModel.buildActorWhereWithFilter(options.filter) - } - ] - } - - if (options.accountId) { - accountInclude.where = { id: options.accountId } - } - + accountInclude.where = { id: options.accountId } videoChannelInclude.include = [ accountInclude ] } @@ -424,36 +436,35 @@ export type AvailableForListIDsOptions = { } if (options.followerActorId) { - let localVideosReq = '' + let localVideosReq: WhereOptions = {} if (options.includeLocalVideos === true) { - localVideosReq = ' 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" ' + - 'WHERE "actor"."serverId" IS NULL' + localVideosReq = { remote: false } } // Force actorId to be a number to avoid SQL injections const actorIdNumber = parseInt(options.followerActorId.toString(), 10) 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 + - ')' - ) - } + [Op.or]: [ + { + 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 + ] }) } @@ -576,9 +587,6 @@ export type AvailableForListIDsOptions = { } return query - }, - [ScopeNames.WITH_BLOCKLIST]: { - }, [ ScopeNames.WITH_THUMBNAILS ]: { include: [ @@ -1188,9 +1196,15 @@ export class VideoModel extends Model { }) } - static listUserVideosForApi (accountId: number, start: number, count: number, sort: string) { + static listUserVideosForApi ( + accountId: number, + start: number, + count: number, + sort: string, + search?: string + ) { function buildBaseQuery (): FindOptions { - return { + let baseQuery = { offset: start, limit: count, order: getVideoSort(sort), @@ -1210,12 +1224,24 @@ export class VideoModel extends Model { } ] } + + if (search) { + baseQuery = Object.assign(baseQuery, { + where: { + name: { + [ Op.iLike ]: '%' + search + '%' + } + } + }) + } + + return baseQuery } const countQuery = buildBaseQuery() const findQuery = buildBaseQuery() - const findScopes = [ + const findScopes: (string | ScopeOptions)[] = [ ScopeNames.WITH_SCHEDULED_UPDATE, ScopeNames.WITH_BLACKLISTED, ScopeNames.WITH_THUMBNAILS @@ -1352,24 +1378,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: { - [ 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 lower("tag"."name") = lower(' + 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)) } @@ -1686,16 +1723,6 @@ export class VideoModel extends Model { } } - private static buildActorWhereWithFilter (filter?: VideoFilter) { - if (filter && (filter === 'local' || filter === 'all-local')) { - return { - serverId: null - } - } - - return {} - } - private static async getAvailableForApi ( query: FindOptions & { where?: null }, // Forbid where field in query options: AvailableForListIDsOptions, @@ -1763,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' } @@ -1792,9 +1823,9 @@ export class VideoModel extends Model { this.VideoChannel.Account.isBlocked() } - getMaxQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + getQualityFileBy (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) { if (Array.isArray(this.VideoFiles) && this.VideoFiles.length !== 0) { - const file = maxBy(this.VideoFiles, file => file.resolution) + const file = fun(this.VideoFiles, file => file.resolution) return Object.assign(file, { Video: this }) } @@ -1803,13 +1834,21 @@ export class VideoModel extends Model { if (Array.isArray(this.VideoStreamingPlaylists) && this.VideoStreamingPlaylists.length !== 0) { const streamingPlaylistWithVideo = Object.assign(this.VideoStreamingPlaylists[0], { Video: this }) - const file = maxBy(streamingPlaylistWithVideo.VideoFiles, file => file.resolution) + const file = fun(streamingPlaylistWithVideo.VideoFiles, file => file.resolution) return Object.assign(file, { VideoStreamingPlaylist: streamingPlaylistWithVideo }) } return undefined } + getMaxQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + return this.getQualityFileBy(maxBy) + } + + getMinQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + return this.getQualityFileBy(minBy) + } + getWebTorrentFile (this: T, resolution: number): MVideoFileVideo { if (Array.isArray(this.VideoFiles) === false) return undefined @@ -1962,12 +2001,38 @@ 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() } + requiresAuth () { + return this.privacy === VideoPrivacy.PRIVATE || this.privacy === VideoPrivacy.INTERNAL || !!this.VideoBlacklist + } + + setPrivacy (newPrivacy: VideoPrivacy) { + if (this.privacy === VideoPrivacy.PRIVATE && newPrivacy !== VideoPrivacy.PRIVATE) { + this.publishedAt = new Date() + } + + this.privacy = newPrivacy + } + + isConfidential () { + return this.privacy === VideoPrivacy.PRIVATE || + this.privacy === VideoPrivacy.UNLISTED || + this.privacy === VideoPrivacy.INTERNAL + } + async publishIfNeededAndSave (t: Transaction) { if (this.state !== VideoState.PUBLISHED) { this.state = VideoState.PUBLISHED