X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=b0fff65268fd8542153fb16649ab6f915cfd42a7;hb=9d3ef9fe052ed29bd67566754cb28662bd122234;hp=3e2b4ce64b617c7d632d6a2300778602a867558d;hpb=9fb3abfdac5c4bffe9992a457e5210d3aa743952;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 3e2b4ce64..b0fff6526 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1,36 +1,79 @@ import * as Bluebird from 'bluebird' -import { map, maxBy, truncate } from 'lodash' +import { map, 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 { - 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' +import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' +import { VideoFilter } from '../../../shared/models/videos/video-query.type' import { activityPubCollection } from '../../helpers/activitypub' -import { createTorrentPromise, renamePromise, statPromise, unlinkPromise, writeFilePromise } from '../../helpers/core-utils' +import { + createTorrentPromise, peertubeTruncate, renamePromise, statPromise, unlinkPromise, + writeFilePromise +} from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { isBooleanValid } from '../../helpers/custom-validators/misc' import { - isVideoCategoryValid, isVideoDescriptionValid, isVideoDurationValid, isVideoLanguageValid, isVideoLicenceValid, isVideoNameValid, - isVideoPrivacyValid + isVideoCategoryValid, + isVideoDescriptionValid, + isVideoDurationValid, + isVideoLanguageValid, + isVideoLicenceValid, + isVideoNameValid, + isVideoPrivacyValid, + isVideoSupportValid } from '../../helpers/custom-validators/videos' -import { generateImageFromVideoFile, getVideoFileHeight, transcode } from '../../helpers/ffmpeg-utils' +import { generateImageFromVideoFile, getVideoFileResolution, 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' import { ActorModel } from '../activitypub/actor' +import { AvatarModel } from '../avatar/avatar' import { ServerModel } from '../server/server' import { getSort, throwIfNotValid } from '../utils' import { TagModel } from './tag' @@ -43,7 +86,6 @@ import { VideoTagModel } from './video-tag' enum ScopeNames { AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST', - WITH_ACCOUNT_API = 'WITH_ACCOUNT_API', WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS', WITH_TAGS = 'WITH_TAGS', WITH_FILES = 'WITH_FILES', @@ -53,70 +95,117 @@ enum ScopeNames { } @Scopes({ - [ScopeNames.AVAILABLE_FOR_LIST]: { - where: { - id: { - [Sequelize.Op.notIn]: Sequelize.literal( - '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")' - ) + [ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number, hideNSFW: boolean, filter?: VideoFilter, withFiles?: boolean) => { + const query: IFindOptions = { + 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 }, - privacy: VideoPrivacy.PUBLIC + include: [ + { + attributes: [ 'name', 'description' ], + model: VideoChannelModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'name' ], + model: AccountModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'preferredUsername', 'url', 'serverId', 'avatarId' ], + model: ActorModel.unscoped(), + required: true, + where: VideoModel.buildActorWhereWithFilter(filter), + include: [ + { + attributes: [ 'host' ], + model: ServerModel.unscoped(), + required: false + }, + { + model: AvatarModel.unscoped(), + required: false + } + ] + } + ] + } + ] + } + ] + } + + if (withFiles === true) { + query.include.push({ + model: VideoFileModel.unscoped(), + required: true + }) + } + + // Hide nsfw videos? + if (hideNSFW === true) { + query.where['nsfw'] = false } + + return query }, - [ScopeNames.WITH_ACCOUNT_API]: { + [ScopeNames.WITH_ACCOUNT_DETAILS]: { include: [ { model: () => VideoChannelModel.unscoped(), required: true, include: [ { - attributes: [ 'name' ], - model: () => AccountModel.unscoped(), + attributes: { + exclude: [ 'privateKey', 'publicKey' ] + }, + model: () => ActorModel.unscoped(), required: true, include: [ { - attributes: [ 'serverId' ], - model: () => ActorModel.unscoped(), - required: true, - include: [ - { - model: () => ServerModel.unscoped(), - required: false - } - ] + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), + required: false } ] - } - ] - } - ] - }, - [ScopeNames.WITH_ACCOUNT_DETAILS]: { - include: [ - { - model: () => VideoChannelModel.unscoped(), - required: true, - include: [ - { - attributes: { - exclude: [ 'privateKey', 'publicKey' ] - }, - model: () => ActorModel, - required: true }, { - model: () => AccountModel, + model: () => AccountModel.unscoped(), required: true, include: [ { - model: () => ActorModel, + model: () => ActorModel.unscoped(), attributes: { exclude: [ 'privateKey', 'publicKey' ] }, required: true, include: [ { - model: () => ServerModel, + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), + required: false + }, + { + model: () => AvatarModel.unscoped(), required: false } ] @@ -133,7 +222,7 @@ enum ScopeNames { [ScopeNames.WITH_FILES]: { include: [ { - model: () => VideoFileModel, + model: () => VideoFileModel.unscoped(), required: true } ] @@ -141,8 +230,7 @@ enum ScopeNames { [ScopeNames.WITH_SHARES]: { include: [ { - model: () => VideoShareModel, - include: [ () => ActorModel ] + model: () => VideoShareModel.unscoped() } ] }, @@ -150,14 +238,25 @@ enum ScopeNames { include: [ { model: () => AccountVideoRateModel, - include: [ () => AccountModel ] + include: [ + { + model: () => AccountModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'url' ], + model: () => ActorModel.unscoped() + } + ] + } + ] } ] }, [ScopeNames.WITH_COMMENTS]: { include: [ { - model: () => VideoCommentModel + model: () => VideoCommentModel.unscoped() } ] } @@ -223,8 +322,8 @@ export class VideoModel extends Model { @AllowNull(true) @Default(null) @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language')) - @Column - language: number + @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.LANGUAGE.max)) + language: string @AllowNull(false) @Is('VideoPrivacy', value => throwIfNotValid(value, isVideoPrivacyValid, 'privacy')) @@ -242,6 +341,12 @@ export class VideoModel extends Model { @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.DESCRIPTION.max)) description: string + @AllowNull(true) + @Default(null) + @Is('VideoSupport', value => throwIfNotValid(value, isVideoSupportValid, 'support')) + @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.SUPPORT.max)) + support: string + @AllowNull(false) @Is('VideoDuration', value => throwIfNotValid(value, isVideoDurationValid, 'duration')) @Column @@ -287,6 +392,11 @@ export class VideoModel extends Model { @UpdatedAt updatedAt: Date + @AllowNull(false) + @Default(Sequelize.NOW) + @Column + publishedAt: Date + @ForeignKey(() => VideoChannelModel) @Column channelId: number @@ -347,23 +457,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 => { @@ -374,7 +507,7 @@ export class VideoModel extends Model { return Promise.all(tasks) .catch(err => { - logger.error('Some errors when removing files of video %s in after destroy hook.', instance.uuid, err) + logger.error('Some errors when removing files of video %s in after destroy hook.', instance.uuid, { err }) }) } @@ -402,15 +535,20 @@ export class VideoModel extends Model { distinct: true, offset: start, limit: count, - order: [ getSort('createdAt'), [ 'Tags', 'name', 'ASC' ] ], + order: getSort('createdAt', [ 'Tags', 'name', 'ASC' ]), 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]: [ @@ -426,28 +564,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 ] } @@ -470,11 +645,11 @@ export class VideoModel extends Model { }) } - static listUserVideosForApi (userId: number, start: number, count: number, sort: string) { - const query = { + static listAccountVideosForApi (accountId: number, start: number, count: number, sort: string, hideNSFW: boolean, withFiles = false) { + const query: IFindOptions = { offset: start, limit: count, - order: [ getSort(sort) ], + order: getSort(sort), include: [ { model: VideoChannelModel, @@ -483,7 +658,7 @@ export class VideoModel extends Model { { model: AccountModel, where: { - userId + id: accountId }, required: true } @@ -492,6 +667,19 @@ export class VideoModel extends Model { ] } + if (withFiles === true) { + query.include.push({ + model: VideoFileModel.unscoped(), + required: true + }) + } + + if (hideNSFW === true) { + query.where = { + nsfw: false + } + } + return VideoModel.findAndCountAll(query).then(({ rows, count }) => { return { data: rows, @@ -500,14 +688,53 @@ export class VideoModel extends Model { }) } - static listForApi (start: number, count: number, sort: string) { + static async listForApi (start: number, count: number, sort: string, hideNSFW: boolean, filter?: VideoFilter, withFiles = false) { const query = { offset: start, limit: count, - order: [ getSort(sort) ] + order: getSort(sort) + } + + const serverActor = await getServerActor() + return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id, hideNSFW, filter, withFiles ] }) + .findAndCountAll(query) + .then(({ rows, count }) => { + return { + data: rows, + total: count + } + }) + } + + static async searchAndPopulateAccountAndServer (value: string, start: number, count: number, sort: string, hideNSFW: boolean) { + const query: IFindOptions = { + offset: start, + limit: count, + order: getSort(sort), + where: { + [Sequelize.Op.or]: [ + { + name: { + [ Sequelize.Op.iLike ]: '%' + value + '%' + } + }, + { + preferredUsername: Sequelize.where(Sequelize.col('preferredUsername'), { + [ Sequelize.Op.iLike ]: '%' + value + '%' + }) + }, + { + host: Sequelize.where(Sequelize.col('host'), { + [ Sequelize.Op.iLike ]: '%' + value + '%' + }) + } + ] + } } - return VideoModel.scope([ ScopeNames.AVAILABLE_FOR_LIST, ScopeNames.WITH_ACCOUNT_API ]) + const serverActor = await getServerActor() + + return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id, hideNSFW ] }) .findAndCountAll(query) .then(({ rows, count }) => { return { @@ -603,72 +830,67 @@ export class VideoModel extends Model { .findOne(options) } - static searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) { - const serverInclude: IIncludeOptions = { - model: ServerModel, - required: false - } + static async getStats () { + const totalLocalVideos = await VideoModel.count({ + where: { + remote: false + } + }) + const totalVideos = await VideoModel.count() - const accountInclude: IIncludeOptions = { - model: AccountModel, - include: [ - { - model: ActorModel, - required: true, - include: [ serverInclude ] - } - ] - } + let totalLocalVideoViews = await VideoModel.sum('views', { + where: { + remote: false + } + }) + // Sequelize could return null... + if (!totalLocalVideoViews) totalLocalVideoViews = 0 - const videoChannelInclude: IIncludeOptions = { - model: VideoChannelModel, - include: [ accountInclude ], - required: true + return { + totalLocalVideos, + totalLocalVideoViews, + totalVideos } + } - const tagInclude: IIncludeOptions = { - model: TagModel + private static buildActorWhereWithFilter (filter?: VideoFilter) { + if (filter && filter === 'local') { + return { + serverId: null + } } - const query: IFindOptions = { - distinct: true, // Because we have tags - offset: start, - limit: count, - order: [ getSort(sort) ], - where: {} - } + return {} + } - // 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 + '%' - } + private static getCategoryLabel (id: number) { + let categoryLabel = VIDEO_CATEGORIES[id] + if (!categoryLabel) categoryLabel = 'Misc' - query.include = [ - videoChannelInclude, tagInclude - ] + return categoryLabel + } - return VideoModel.scope([ ScopeNames.AVAILABLE_FOR_LIST ]) - .findAndCountAll(query).then(({ rows, count }) => { - return { - data: rows, - total: count - } - }) + private static getLicenceLabel (id: number) { + let licenceLabel = VIDEO_LICENCES[id] + if (!licenceLabel) licenceLabel = 'Unknown' + + return licenceLabel + } + + private static getLanguageLabel (id: string) { + let languageLabel = VIDEO_LANGUAGES[id] + console.log(VIDEO_LANGUAGES) + console.log(id) + if (!languageLabel) languageLabel = 'Unknown' + + return languageLabel + } + + private static getPrivacyLabel (id: number) { + let privacyLabel = VIDEO_PRIVACIES[id] + if (!privacyLabel) privacyLabel = 'Unknown' + + return privacyLabel } getOriginalFile () { @@ -703,24 +925,20 @@ export class VideoModel extends Model { } createPreview (videoFile: VideoFileModel) { - const imageSize = PREVIEWS_SIZE.width + 'x' + PREVIEWS_SIZE.height - return generateImageFromVideoFile( this.getVideoFilePath(videoFile), CONFIG.STORAGE.PREVIEWS_DIR, this.getPreviewName(), - imageSize + PREVIEWS_SIZE ) } createThumbnail (videoFile: VideoFileModel) { - const imageSize = THUMBNAILS_SIZE.width + 'x' + THUMBNAILS_SIZE.height - return generateImageFromVideoFile( this.getVideoFilePath(videoFile), CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName(), - imageSize + THUMBNAILS_SIZE ) } @@ -728,10 +946,14 @@ export class VideoModel extends Model { return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile)) } - createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) { + 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: [ - [ 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) @@ -761,31 +983,32 @@ export class VideoModel extends Model { return join(STATIC_PATHS.PREVIEWS, this.getPreviewName()) } - toFormattedJSON () { - let serverHost - - if (this.VideoChannel.Account.Actor.Server) { - serverHost = this.VideoChannel.Account.Actor.Server.host - } else { - // It means it's our video - serverHost = CONFIG.WEBSERVER.HOST - } + toFormattedJSON (): Video { + const formattedAccount = this.VideoChannel.Account.toFormattedJSON() return { id: this.id, uuid: this.uuid, name: this.name, - category: this.category, - categoryLabel: this.getCategoryLabel(), - licence: this.licence, - licenceLabel: this.getLicenceLabel(), - language: this.language, - languageLabel: this.getLanguageLabel(), + category: { + id: this.category, + label: VideoModel.getCategoryLabel(this.category) + }, + licence: { + id: this.licence, + label: VideoModel.getLicenceLabel(this.licence) + }, + language: { + id: this.language, + label: VideoModel.getLanguageLabel(this.language) + }, + privacy: { + id: this.privacy, + label: VideoModel.getPrivacyLabel(this.privacy) + }, nsfw: this.nsfw, description: this.getTruncatedDescription(), - serverHost, isLocal: this.isOwned(), - accountName: this.VideoChannel.Account.name, duration: this.duration, views: this.views, likes: this.likes, @@ -794,50 +1017,60 @@ export class VideoModel extends Model { previewPath: this.getPreviewPath(), embedPath: this.getEmbedPath(), createdAt: this.createdAt, - updatedAt: this.updatedAt - } as Video + updatedAt: this.updatedAt, + publishedAt: this.publishedAt, + account: { + name: formattedAccount.name, + displayName: formattedAccount.displayName, + url: formattedAccount.url, + host: formattedAccount.host, + avatar: formattedAccount.avatar + } + } } - toFormattedDetailsJSON () { + toFormattedDetailsJSON (): VideoDetails { const formattedJson = this.toFormattedJSON() - // Maybe our server is not up to date and there are new privacy settings since our version - let privacyLabel = VIDEO_PRIVACIES[this.privacy] - if (!privacyLabel) privacyLabel = 'Unknown' - const detailsJson = { - privacyLabel, - privacy: this.privacy, + support: this.support, descriptionPath: this.getDescriptionPath(), channel: this.VideoChannel.toFormattedJSON(), account: this.VideoChannel.Account.toFormattedJSON(), - tags: map(this.Tags, 'name'), + tags: map(this.Tags, 'name'), commentsEnabled: this.commentsEnabled, files: [] } // Format and sort video files + detailsJson.files = this.getFormattedVideoFilesJSON() + + return Object.assign(formattedJson, detailsJson) + } + + getFormattedVideoFilesJSON (): VideoFile[] { const { baseUrlHttp, baseUrlWs } = this.getBaseUrls() - detailsJson.files = this.VideoFiles - .map(videoFile => { - let resolutionLabel = videoFile.resolution + 'p' - return { - resolution: videoFile.resolution, - resolutionLabel, - magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs), - size: videoFile.size, - torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp), - fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp) - } - }) - .sort((a, b) => { - if (a.resolution < b.resolution) return 1 - if (a.resolution === b.resolution) return 0 - return -1 - }) + return this.VideoFiles + .map(videoFile => { + let resolutionLabel = videoFile.resolution + 'p' - return Object.assign(formattedJson, detailsJson) as VideoDetails + return { + resolution: { + id: videoFile.resolution, + label: resolutionLabel + }, + magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs), + size: videoFile.size, + torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp), + fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp) + } as VideoFile + }) + .sort((a, b) => { + if (a.resolution.id < b.resolution.id) return 1 + if (a.resolution.id === b.resolution.id) return 0 + return -1 + }) } toActivityPubObject (): VideoTorrentObject { @@ -852,8 +1085,8 @@ export class VideoModel extends Model { let language if (this.language) { language = { - identifier: this.language + '', - name: this.getLanguageLabel() + identifier: this.language, + name: VideoModel.getLanguageLabel(this.language) } } @@ -861,7 +1094,7 @@ export class VideoModel extends Model { if (this.category) { category = { identifier: this.category + '', - name: this.getCategoryLabel() + name: VideoModel.getCategoryLabel(this.category) } } @@ -869,7 +1102,7 @@ export class VideoModel extends Model { if (this.licence) { licence = { identifier: this.licence + '', - name: this.getLicenceLabel() + name: VideoModel.getLicenceLabel(this.licence) } } @@ -877,42 +1110,19 @@ export class VideoModel extends Model { let dislikesObject if (Array.isArray(this.AccountVideoRates)) { - 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) - } - } - - 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 = [] @@ -951,20 +1161,20 @@ export class VideoModel extends Model { 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(), + published: this.publishedAt.toISOString(), updated: this.updatedAt.toISOString(), mediaType: 'text/markdown', content: this.getTruncatedDescription(), + support: this.support, icon: { type: 'Image', url: this.getThumbnailUrl(baseUrlHttp), @@ -978,29 +1188,64 @@ export class VideoModel extends Model { shares: sharesObject, comments: commentsObject, attributedTo: [ - { - type: 'Group', - id: this.VideoChannel.Actor.url - }, { type: 'Person', id: this.VideoChannel.Account.Actor.url + }, + { + type: 'Group', + id: this.VideoChannel.Actor.url } ] } } - getTruncatedDescription () { - if (!this.description) return null + toAnnouncesActivityPubObject () { + const shares: string[] = [] - const options = { - length: CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max + 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 truncate(this.description, options) + return activityPubCollection(getVideoCommentsActivityPubUrl(this), comments) } - optimizeOriginalVideofile = async function () { + 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 + + const maxLength = CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max + return peertubeTruncate(this.description, maxLength) + } + + async optimizeOriginalVideofile () { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR const newExtname = '.mp4' const inputVideoFile = this.getOriginalFile() @@ -1012,10 +1257,10 @@ export class VideoModel extends Model { outputPath: videoOutputPath } - try { - // Could be very long! - await transcode(transcodeOptions) + // Could be very long! + await transcode(transcodeOptions) + try { await unlinkPromise(videoInputPath) // Important to do this before getVideoFilename() to take in account the new file extension @@ -1031,13 +1276,13 @@ export class VideoModel extends Model { } catch (err) { // Auto destruction... - this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err)) + this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', { err })) throw err } } - transcodeOriginalVideofile = async function (resolution: VideoResolution) { + async transcodeOriginalVideofile (resolution: VideoResolution, isPortraitMode: boolean) { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR const extname = '.mp4' @@ -1055,7 +1300,8 @@ export class VideoModel extends Model { const transcodeOptions = { inputPath: videoInputPath, outputPath: videoOutputPath, - resolution + resolution, + isPortraitMode } await transcode(transcodeOptions) @@ -1071,37 +1317,16 @@ export class VideoModel extends Model { this.VideoFiles.push(newVideoFile) } - getOriginalFileHeight () { + getOriginalFileResolution () { const originalFilePath = this.getVideoFilePath(this.getOriginalFile()) - return getVideoFileHeight(originalFilePath) + return getVideoFileResolution(originalFilePath) } getDescriptionPath () { return `/api/${API_VERSION}/videos/${this.uuid}/description` } - getCategoryLabel () { - let categoryLabel = VIDEO_CATEGORIES[this.category] - if (!categoryLabel) categoryLabel = 'Misc' - - return categoryLabel - } - - getLicenceLabel () { - let licenceLabel = VIDEO_LICENCES[this.licence] - if (!licenceLabel) licenceLabel = 'Unknown' - - return licenceLabel - } - - getLanguageLabel () { - let languageLabel = VIDEO_LANGUAGES[this.language] - if (!languageLabel) languageLabel = 'Unknown' - - return languageLabel - } - removeThumbnail () { const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName()) return unlinkPromise(thumbnailPath) @@ -1122,6 +1347,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