X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=a4d4c42f034b8da19eb4c531c71b64e9ca1d4408;hb=ae5a3dd6642c8d5abc87b874496026dc9ed37d2d;hp=8e1acdd44e6d17e9385790c8e2f227bc943d5407;hpb=0a67e28beeaf603110d52df3eda400e60531b3a4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 8e1acdd44..a4d4c42f0 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -29,6 +29,7 @@ import { import { VideoPrivacy, VideoResolution } from '../../../shared' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { Video, VideoDetails } 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 { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' @@ -40,9 +41,10 @@ import { isVideoLanguageValid, isVideoLicenceValid, isVideoNameValid, - isVideoPrivacyValid + 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 { @@ -58,10 +60,17 @@ import { VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../initializers' +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' @@ -83,7 +92,7 @@ enum ScopeNames { } @Scopes({ - [ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number) => ({ + [ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number, filter?: VideoFilter) => ({ where: { id: { [Sequelize.Op.notIn]: Sequelize.literal( @@ -118,13 +127,19 @@ enum ScopeNames { required: true, include: [ { - attributes: [ 'serverId' ], + attributes: [ 'preferredUsername', 'url', 'serverId' ], model: ActorModel.unscoped(), required: true, + where: VideoModel.buildActorWhereWithFilter(filter), include: [ { attributes: [ 'host' ], - model: ServerModel.unscoped() + model: ServerModel.unscoped(), + required: false + }, + { + model: AvatarModel.unscoped(), + required: false } ] } @@ -169,6 +184,10 @@ enum ScopeNames { attributes: [ 'host' ], model: () => ServerModel.unscoped(), required: false + }, + { + model: () => AvatarModel.unscoped(), + required: false } ] } @@ -293,6 +312,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 @@ -476,15 +501,19 @@ 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: [ { - attributes: [ 'id' ], + attributes: [ 'id', 'url' ], model: VideoShareModel.unscoped(), required: false, where: { @@ -586,7 +615,7 @@ export class VideoModel extends Model { const query = { offset: start, limit: count, - order: [ getSort(sort) ], + order: getSort(sort), include: [ { model: VideoChannelModel, @@ -612,16 +641,16 @@ export class VideoModel extends Model { }) } - static async listForApi (start: number, count: number, sort: string) { + static async listForApi (start: number, count: number, sort: string, filter?: VideoFilter) { 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 ] }) + return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id, filter ] }) .findAndCountAll(query) .then(({ rows, count }) => { return { @@ -635,7 +664,7 @@ export class VideoModel extends Model { const query: IFindOptions = { offset: start, limit: count, - order: [ getSort(sort) ], + order: getSort(sort), where: { name: { [Sequelize.Op.iLike]: '%' + value + '%' @@ -740,6 +769,60 @@ export class VideoModel extends Model { .findOne(options) } + static async getStats () { + const totalLocalVideos = await VideoModel.count({ + where: { + remote: false + } + }) + const totalVideos = await VideoModel.count() + + let totalLocalVideoViews = await VideoModel.sum('views', { + where: { + remote: false + } + }) + // Sequelize could return null... + if (!totalLocalVideoViews) totalLocalVideoViews = 0 + + return { + totalLocalVideos, + totalLocalVideoViews, + totalVideos + } + } + + private static buildActorWhereWithFilter (filter?: VideoFilter) { + if (filter && filter === 'local') { + return { + serverId: null + } + } + + return {} + } + + private static getCategoryLabel (id: number) { + let categoryLabel = VIDEO_CATEGORIES[id] + if (!categoryLabel) categoryLabel = 'Misc' + + return categoryLabel + } + + private static getLicenceLabel (id: number) { + let licenceLabel = VIDEO_LICENCES[id] + if (!licenceLabel) licenceLabel = 'Unknown' + + return licenceLabel + } + + private static getLanguageLabel (id: number) { + let languageLabel = VIDEO_LANGUAGES[id] + if (!languageLabel) languageLabel = 'Unknown' + + return languageLabel + } + getOriginalFile () { if (Array.isArray(this.VideoFiles) === false) return undefined @@ -772,24 +855,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 ) } @@ -831,31 +910,28 @@ 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) + }, nsfw: this.nsfw, description: this.getTruncatedDescription(), - serverHost, isLocal: this.isOwned(), - accountName: this.VideoChannel.Account.name, duration: this.duration, views: this.views, likes: this.likes, @@ -864,11 +940,18 @@ export class VideoModel extends Model { previewPath: this.getPreviewPath(), embedPath: this.getEmbedPath(), createdAt: this.createdAt, - updatedAt: this.updatedAt - } as Video + updatedAt: this.updatedAt, + 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 @@ -876,8 +959,11 @@ export class VideoModel extends Model { if (!privacyLabel) privacyLabel = 'Unknown' const detailsJson = { - privacyLabel, - privacy: this.privacy, + privacy: { + id: this.privacy, + label: privacyLabel + }, + support: this.support, descriptionPath: this.getDescriptionPath(), channel: this.VideoChannel.toFormattedJSON(), account: this.VideoChannel.Account.toFormattedJSON(), @@ -893,8 +979,10 @@ export class VideoModel extends Model { let resolutionLabel = videoFile.resolution + 'p' return { - resolution: videoFile.resolution, - resolutionLabel, + resolution: { + id: videoFile.resolution, + label: resolutionLabel + }, magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs), size: videoFile.size, torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp), @@ -907,7 +995,7 @@ export class VideoModel extends Model { return -1 }) - return Object.assign(formattedJson, detailsJson) as VideoDetails + return Object.assign(formattedJson, detailsJson) } toActivityPubObject (): VideoTorrentObject { @@ -922,8 +1010,8 @@ export class VideoModel extends Model { let language if (this.language) { language = { - identifier: this.language + '', - name: this.getLanguageLabel() + id: this.language + '', + name: VideoModel.getLanguageLabel(this.language) } } @@ -931,7 +1019,7 @@ export class VideoModel extends Model { if (this.category) { category = { identifier: this.category + '', - name: this.getCategoryLabel() + name: VideoModel.getCategoryLabel(this.category) } } @@ -939,7 +1027,7 @@ export class VideoModel extends Model { if (this.licence) { licence = { identifier: this.licence + '', - name: this.getLicenceLabel() + name: VideoModel.getLicenceLabel(this.licence) } } @@ -947,41 +1035,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) { - shares.push(videoShare.url) - } - - 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 = [] @@ -1033,6 +1099,7 @@ export class VideoModel extends Model { updated: this.updatedAt.toISOString(), mediaType: 'text/markdown', content: this.getTruncatedDescription(), + support: this.support, icon: { type: 'Image', url: this.getThumbnailUrl(baseUrlHttp), @@ -1058,6 +1125,44 @@ export class VideoModel extends Model { } } + 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 @@ -1080,10 +1185,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 @@ -1105,7 +1210,7 @@ export class VideoModel extends Model { } } - transcodeOriginalVideofile = async function (resolution: VideoResolution) { + transcodeOriginalVideofile = async function (resolution: VideoResolution, isPortraitMode: boolean) { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR const extname = '.mp4' @@ -1123,7 +1228,8 @@ export class VideoModel extends Model { const transcodeOptions = { inputPath: videoInputPath, outputPath: videoOutputPath, - resolution + resolution, + isPortraitMode } await transcode(transcodeOptions) @@ -1139,37 +1245,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)