X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=ff82fb3b274adc324915e08e7657277ecf94e0b9;hb=34cbef8c6cc912143a421413bdd832c4adcc556a;hp=c4b716cd21e68013adbc4f1d0b167f9012d53036;hpb=47564bbe2eeb2baae9b7e3f9b2b8d16522bc7e04;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index c4b716cd2..ff82fb3b2 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -5,10 +5,27 @@ import * as parseTorrent from 'parse-torrent' import { join } from 'path' import * as Sequelize from 'sequelize' import { - AfterDestroy, AllowNull, BelongsTo, BelongsToMany, Column, CreatedAt, DataType, Default, ForeignKey, HasMany, IFindOptions, Is, - IsInt, IsUUID, Min, Model, Scopes, Table, UpdatedAt + AfterDestroy, + AllowNull, + BeforeDestroy, + BelongsTo, + BelongsToMany, + Column, + CreatedAt, + DataType, + Default, + ForeignKey, + HasMany, + IFindOptions, + Is, + IsInt, + IsUUID, + Min, + Model, + Scopes, + Table, + UpdatedAt } from 'sequelize-typescript' -import { IIncludeOptions } from 'sequelize-typescript/lib/interfaces/IIncludeOptions' import { VideoPrivacy, VideoResolution } from '../../../shared' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { Video, VideoDetails } from '../../../shared/models/videos' @@ -17,16 +34,36 @@ import { createTorrentPromise, renamePromise, statPromise, unlinkPromise, writeF import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { isBooleanValid } from '../../helpers/custom-validators/misc' import { - isVideoCategoryValid, isVideoDescriptionValid, isVideoDurationValid, isVideoLanguageValid, isVideoLicenceValid, isVideoNameValid, + isVideoCategoryValid, + isVideoDescriptionValid, + isVideoDurationValid, + isVideoLanguageValid, + isVideoLicenceValid, + isVideoNameValid, isVideoPrivacyValid } from '../../helpers/custom-validators/videos' import { generateImageFromVideoFile, getVideoFileHeight, transcode } from '../../helpers/ffmpeg-utils' import { logger } from '../../helpers/logger' +import { getServerActor } from '../../helpers/utils' import { - API_VERSION, CONFIG, CONSTRAINTS_FIELDS, PREVIEWS_SIZE, REMOTE_SCHEME, STATIC_PATHS, THUMBNAILS_SIZE, VIDEO_CATEGORIES, - VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES + API_VERSION, + CONFIG, + CONSTRAINTS_FIELDS, + PREVIEWS_SIZE, + REMOTE_SCHEME, + STATIC_PATHS, + THUMBNAILS_SIZE, + VIDEO_CATEGORIES, + VIDEO_LANGUAGES, + VIDEO_LICENCES, + VIDEO_PRIVACIES } from '../../initializers' -import { getAnnounceActivityPubUrl } from '../../lib/activitypub' +import { + getVideoCommentsActivityPubUrl, + getVideoDislikesActivityPubUrl, + getVideoLikesActivityPubUrl, + getVideoSharesActivityPubUrl +} from '../../lib/activitypub' import { sendDeleteVideo } from '../../lib/activitypub/send' import { AccountModel } from '../account/account' import { AccountVideoRateModel } from '../account/account-video-rate' @@ -43,7 +80,7 @@ import { VideoTagModel } from './video-tag' enum ScopeNames { AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST', - WITH_ACCOUNT = 'WITH_ACCOUNT', + WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS', WITH_TAGS = 'WITH_TAGS', WITH_FILES = 'WITH_FILES', WITH_SHARES = 'WITH_SHARES', @@ -52,32 +89,91 @@ enum ScopeNames { } @Scopes({ - [ScopeNames.AVAILABLE_FOR_LIST]: { + [ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number) => ({ where: { id: { [Sequelize.Op.notIn]: Sequelize.literal( '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")' + ), + [ Sequelize.Op.in ]: Sequelize.literal( + '(' + + 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' + + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + + 'WHERE "actorFollow"."actorId" = ' + parseInt(actorId.toString(), 10) + + ' UNION ' + + '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" ' + + 'LEFT JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' + + 'WHERE "actor"."serverId" IS NULL OR "actorFollow"."actorId" = ' + parseInt(actorId.toString(), 10) + + ')' ) }, privacy: VideoPrivacy.PUBLIC - } - }, - [ScopeNames.WITH_ACCOUNT]: { + }, include: [ { - model: () => VideoChannelModel, + attributes: [ 'name', 'description' ], + model: VideoChannelModel.unscoped(), required: true, include: [ { - model: () => AccountModel, + attributes: [ 'name' ], + model: AccountModel.unscoped(), required: true, include: [ { - model: () => ActorModel, + attributes: [ 'serverId' ], + model: ActorModel.unscoped(), required: true, include: [ { - model: () => ServerModel, + attributes: [ 'host' ], + model: ServerModel.unscoped() + } + ] + } + ] + } + ] + } + ] + }), + [ScopeNames.WITH_ACCOUNT_DETAILS]: { + include: [ + { + model: () => VideoChannelModel.unscoped(), + required: true, + include: [ + { + attributes: { + exclude: [ 'privateKey', 'publicKey' ] + }, + model: () => ActorModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), + required: false + } + ] + }, + { + model: () => AccountModel.unscoped(), + required: true, + include: [ + { + model: () => ActorModel.unscoped(), + attributes: { + exclude: [ 'privateKey', 'publicKey' ] + }, + required: true, + include: [ + { + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), required: false } ] @@ -146,6 +242,13 @@ enum ScopeNames { }, { fields: [ 'channelId' ] + }, + { + fields: [ 'id', 'privacy' ] + }, + { + fields: [ 'url'], + unique: true } ] }) @@ -301,23 +404,46 @@ export class VideoModel extends Model { name: 'videoId', allowNull: false }, - onDelete: 'cascade' + onDelete: 'cascade', + hooks: true }) VideoComments: VideoCommentModel[] + @BeforeDestroy + static async sendDelete (instance: VideoModel, options) { + if (instance.isOwned()) { + if (!instance.VideoChannel) { + instance.VideoChannel = await instance.$get('VideoChannel', { + include: [ + { + model: AccountModel, + include: [ ActorModel ] + } + ], + transaction: options.transaction + }) as VideoChannelModel + } + + logger.debug('Sending delete of video %s.', instance.url) + + return sendDeleteVideo(instance, options.transaction) + } + + return undefined + } + @AfterDestroy - static removeFilesAndSendDelete (instance: VideoModel) { - const tasks = [] + static async removeFilesAndSendDelete (instance: VideoModel) { + const tasks: Promise[] = [] - tasks.push( - instance.removeThumbnail() - ) + tasks.push(instance.removeThumbnail()) if (instance.isOwned()) { - tasks.push( - instance.removePreview(), - sendDeleteVideo(instance, undefined) - ) + 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 => { @@ -360,11 +486,16 @@ export class VideoModel extends Model { where: { id: { [Sequelize.Op.in]: Sequelize.literal('(' + rawQuery + ')') - } + }, + [Sequelize.Op.or]: [ + { privacy: VideoPrivacy.PUBLIC }, + { privacy: VideoPrivacy.UNLISTED } + ] }, include: [ { - model: VideoShareModel, + attributes: [ 'id', 'url' ], + model: VideoShareModel.unscoped(), required: false, where: { [Sequelize.Op.and]: [ @@ -380,28 +511,65 @@ export class VideoModel extends Model { }, include: [ { - model: ActorModel, - required: true + attributes: [ 'id', 'url' ], + model: ActorModel.unscoped() } ] }, { - model: VideoChannelModel, + model: VideoChannelModel.unscoped(), required: true, include: [ { - model: AccountModel, + attributes: [ 'name' ], + model: AccountModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'id', 'url' ], + model: ActorModel.unscoped(), + required: true + } + ] + }, + { + attributes: [ 'id', 'url' ], + model: ActorModel.unscoped(), required: true } ] }, { + attributes: [ 'type' ], model: AccountVideoRateModel, - include: [ AccountModel ] + required: false, + include: [ + { + attributes: [ 'id' ], + model: AccountModel.unscoped(), + include: [ + { + attributes: [ 'url' ], + model: ActorModel.unscoped(), + include: [ + { + attributes: [ 'host' ], + model: ServerModel, + required: false + } + ] + } + ] + } + ] + }, + { + attributes: [ 'url' ], + model: VideoCommentModel, + required: false }, VideoFileModel, - TagModel, - VideoCommentModel + TagModel ] } @@ -454,14 +622,16 @@ export class VideoModel extends Model { }) } - static listForApi (start: number, count: number, sort: string) { + static async listForApi (start: number, count: number, sort: string) { const query = { offset: start, limit: count, order: [ getSort(sort) ] } - return VideoModel.scope([ ScopeNames.AVAILABLE_FOR_LIST, ScopeNames.WITH_ACCOUNT ]) + const serverActor = await getServerActor() + + return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id ] }) .findAndCountAll(query) .then(({ rows, count }) => { return { @@ -471,20 +641,31 @@ export class VideoModel extends Model { }) } - static load (id: number) { - return VideoModel.findById(id) - } - - static loadByUrl (url: string, t?: Sequelize.Transaction) { + static async searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) { const query: IFindOptions = { + offset: start, + limit: count, + order: [ getSort(sort) ], where: { - url + name: { + [Sequelize.Op.iLike]: '%' + value + '%' + } } } - if (t !== undefined) query.transaction = t + const serverActor = await getServerActor() - return VideoModel.findOne(query) + return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id ] }) + .findAndCountAll(query).then(({ rows, count }) => { + return { + data: rows, + total: count + } + }) + } + + static load (id: number) { + return VideoModel.findById(id) } static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) { @@ -496,10 +677,10 @@ export class VideoModel extends Model { if (t !== undefined) query.transaction = t - return VideoModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_FILES ]).findOne(query) + return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_FILES ]).findOne(query) } - static loadByUUIDOrURL (uuid: string, url: string, t?: Sequelize.Transaction) { + static loadByUUIDOrURLAndPopulateAccount (uuid: string, url: string, t?: Sequelize.Transaction) { const query: IFindOptions = { where: { [Sequelize.Op.or]: [ @@ -511,7 +692,7 @@ export class VideoModel extends Model { if (t !== undefined) query.transaction = t - return VideoModel.scope(ScopeNames.WITH_FILES).findOne(query) + return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_FILES ]).findOne(query) } static loadAndPopulateAccountAndServerAndTags (id: number) { @@ -520,7 +701,7 @@ export class VideoModel extends Model { } return VideoModel - .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT ]) + .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS ]) .findById(id, options) } @@ -545,7 +726,7 @@ export class VideoModel extends Model { } return VideoModel - .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT ]) + .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS ]) .findOne(options) } @@ -563,80 +744,12 @@ export class VideoModel extends Model { ScopeNames.WITH_SHARES, ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, - ScopeNames.WITH_ACCOUNT, + ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_COMMENTS ]) .findOne(options) } - static searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) { - const serverInclude: IIncludeOptions = { - model: ServerModel, - required: false - } - - const accountInclude: IIncludeOptions = { - model: AccountModel, - include: [ - { - model: ActorModel, - required: true, - include: [ serverInclude ] - } - ] - } - - const videoChannelInclude: IIncludeOptions = { - model: VideoChannelModel, - include: [ accountInclude ], - required: true - } - - const tagInclude: IIncludeOptions = { - model: TagModel - } - - const query: IFindOptions = { - distinct: true, // Because we have tags - offset: start, - limit: count, - order: [ getSort(sort) ], - where: {} - } - - // TODO: search on tags too - // const escapedValue = Video['sequelize'].escape('%' + value + '%') - // query.where['id'][Sequelize.Op.in] = Video['sequelize'].literal( - // `(SELECT "VideoTags"."videoId" - // FROM "Tags" - // INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId" - // WHERE name ILIKE ${escapedValue} - // )` - // ) - - // TODO: search on account too - // accountInclude.where = { - // name: { - // [Sequelize.Op.iLike]: '%' + value + '%' - // } - // } - query.where['name'] = { - [Sequelize.Op.iLike]: '%' + value + '%' - } - - query.include = [ - videoChannelInclude, tagInclude - ] - - return VideoModel.scope([ ScopeNames.AVAILABLE_FOR_LIST ]) - .findAndCountAll(query).then(({ rows, count }) => { - return { - data: rows, - total: count - } - }) - } - getOriginalFile () { if (Array.isArray(this.VideoFiles) === false) return undefined @@ -697,7 +810,8 @@ export class VideoModel extends Model { createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) { const options = { announceList: [ - [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ] + [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ], + [ CONFIG.WEBSERVER.URL + '/tracker/announce' ] ], urlList: [ CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) @@ -854,31 +968,19 @@ export class VideoModel extends Model { } } - likesObject = activityPubCollection(likes) - dislikesObject = activityPubCollection(dislikes) + const res = this.toRatesActivityPubObjects() + likesObject = res.likesObject + dislikesObject = res.dislikesObject } let sharesObject if (Array.isArray(this.VideoShares)) { - const shares: string[] = [] - - for (const videoShare of this.VideoShares) { - const shareUrl = getAnnounceActivityPubUrl(this.url, videoShare.Actor) - shares.push(shareUrl) - } - - sharesObject = activityPubCollection(shares) + sharesObject = this.toAnnouncesActivityPubObject() } let commentsObject if (Array.isArray(this.VideoComments)) { - const comments: string[] = [] - - for (const videoComment of this.VideoComments) { - comments.push(videoComment.url) - } - - commentsObject = activityPubCollection(comments) + commentsObject = this.toCommentsActivityPubObject() } const url = [] @@ -886,7 +988,7 @@ export class VideoModel extends Model { url.push({ type: 'Link', mimeType: 'video/' + file.extname.replace('.', ''), - url: this.getVideoFileUrl(file, baseUrlHttp), + href: this.getVideoFileUrl(file, baseUrlHttp), width: file.resolution, size: file.size }) @@ -894,14 +996,14 @@ export class VideoModel extends Model { url.push({ type: 'Link', mimeType: 'application/x-bittorrent', - url: this.getTorrentUrl(file, baseUrlHttp), + href: this.getTorrentUrl(file, baseUrlHttp), width: file.resolution }) url.push({ type: 'Link', mimeType: 'application/x-bittorrent;x-scheme-handler/magnet', - url: this.generateMagnetUri(file, baseUrlHttp, baseUrlWs), + href: this.generateMagnetUri(file, baseUrlHttp, baseUrlWs), width: file.resolution }) } @@ -910,22 +1012,21 @@ export class VideoModel extends Model { url.push({ type: 'Link', mimeType: 'text/html', - url: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid + href: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid }) return { type: 'Video' as 'Video', id: this.url, name: this.name, - // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration - duration: 'PT' + this.duration + 'S', + duration: this.getActivityStreamDuration(), uuid: this.uuid, tag, category, licence, language, views: this.views, - nsfw: this.nsfw, + sensitive: this.nsfw, commentsEnabled: this.commentsEnabled, published: this.createdAt.toISOString(), updated: this.updatedAt.toISOString(), @@ -947,11 +1048,53 @@ export class VideoModel extends Model { { type: 'Group', id: this.VideoChannel.Actor.url + }, + { + type: 'Person', + id: this.VideoChannel.Account.Actor.url } ] } } + toAnnouncesActivityPubObject () { + const shares: string[] = [] + + for (const videoShare of this.VideoShares) { + shares.push(videoShare.url) + } + + return activityPubCollection(getVideoSharesActivityPubUrl(this), shares) + } + + toCommentsActivityPubObject () { + const comments: string[] = [] + + for (const videoComment of this.VideoComments) { + comments.push(videoComment.url) + } + + return activityPubCollection(getVideoCommentsActivityPubUrl(this), comments) + } + + toRatesActivityPubObjects () { + const likes: string[] = [] + const dislikes: string[] = [] + + for (const rate of this.AccountVideoRates) { + if (rate.type === 'like') { + likes.push(rate.Account.Actor.url) + } else if (rate.type === 'dislike') { + dislikes.push(rate.Account.Actor.url) + } + } + + const likesObject = activityPubCollection(getVideoLikesActivityPubUrl(this), likes) + const dislikesObject = activityPubCollection(getVideoDislikesActivityPubUrl(this), dislikes) + + return { likesObject, dislikesObject } + } + getTruncatedDescription () { if (!this.description) return null @@ -1084,6 +1227,11 @@ export class VideoModel extends Model { return unlinkPromise(torrentPath) } + getActivityStreamDuration () { + // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration + return 'PT' + this.duration + 'S' + } + private getBaseUrls () { let baseUrlHttp let baseUrlWs