X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-playlist-element.ts;h=d2d7e2740eeffe03e09f9faa6c8ec2c8ab294494;hb=ceb8f322118b24508abc6dd0bc6813a43610eff3;hp=d76149d1225f77e0981162008dbf6827644a550b;hpb=418d092afa81e2c8fe8ac6838fc4b5eb0af6a782;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-playlist-element.ts b/server/models/video/video-playlist-element.ts index d76149d12..d2d7e2740 100644 --- a/server/models/video/video-playlist-element.ts +++ b/server/models/video/video-playlist-element.ts @@ -1,3 +1,4 @@ +import { AggregateOptions, Op, ScopeOptions, Sequelize, Transaction } from 'sequelize' import { AllowNull, BelongsTo, @@ -13,13 +14,24 @@ import { Table, UpdatedAt } from 'sequelize-typescript' -import { VideoModel } from './video' -import { VideoPlaylistModel } from './video-playlist' -import * as Sequelize from 'sequelize' -import { getSort, throwIfNotValid } from '../utils' -import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { CONSTRAINTS_FIELDS } from '../../initializers' +import validator from 'validator' +import { MUserAccountId } from '@server/types/models' +import { + MVideoPlaylistElement, + MVideoPlaylistElementAP, + MVideoPlaylistElementFormattable, + MVideoPlaylistElementVideoUrlPlaylistPrivacy, + MVideoPlaylistVideoThumbnail +} from '@server/types/models/video/video-playlist-element' import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' +import { VideoPrivacy } from '../../../shared/models/videos' +import { VideoPlaylistElement, VideoPlaylistElementType } from '../../../shared/models/videos/playlist/video-playlist-element.model' +import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' +import { CONSTRAINTS_FIELDS } from '../../initializers/constants' +import { AccountModel } from '../account/account' +import { getSort, throwIfNotValid } from '../utils' +import { ForAPIOptions, ScopeNames as VideoScopeNames, VideoModel } from './video' +import { VideoPlaylistModel } from './video-playlist' @Table({ tableName: 'videoPlaylistElement', @@ -30,29 +42,21 @@ import { PlaylistElementObject } from '../../../shared/models/activitypub/object { fields: [ 'videoId' ] }, - { - fields: [ 'videoPlaylistId', 'videoId' ], - unique: true - }, - { - fields: [ 'videoPlaylistId', 'position' ], - unique: true - }, { fields: [ 'url' ], unique: true } ] }) -export class VideoPlaylistElementModel extends Model { +export class VideoPlaylistElementModel extends Model { @CreatedAt createdAt: Date @UpdatedAt updatedAt: Date - @AllowNull(false) - @Is('VideoPlaylistUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url')) + @AllowNull(true) + @Is('VideoPlaylistUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url', true)) @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_PLAYLISTS.URL.max)) url: string @@ -93,13 +97,13 @@ export class VideoPlaylistElementModel extends Model @BelongsTo(() => VideoModel, { foreignKey: { - allowNull: false + allowNull: true }, - onDelete: 'CASCADE' + onDelete: 'set null' }) Video: VideoModel - static deleteAllOf (videoPlaylistId: number, transaction?: Sequelize.Transaction) { + static deleteAllOf (videoPlaylistId: number, transaction?: Transaction) { const query = { where: { videoPlaylistId @@ -110,7 +114,58 @@ export class VideoPlaylistElementModel extends Model return VideoPlaylistElementModel.destroy(query) } - static loadByPlaylistAndVideo (videoPlaylistId: number, videoId: number) { + static listForApi (options: { + start: number + count: number + videoPlaylistId: number + serverAccount: AccountModel + user?: MUserAccountId + }) { + const accountIds = [ options.serverAccount.id ] + const videoScope: (ScopeOptions | string)[] = [ + VideoScopeNames.WITH_BLACKLISTED + ] + + if (options.user) { + accountIds.push(options.user.Account.id) + videoScope.push({ method: [ VideoScopeNames.WITH_USER_HISTORY, options.user.id ] }) + } + + const forApiOptions: ForAPIOptions = { withAccountBlockerIds: accountIds } + videoScope.push({ + method: [ + VideoScopeNames.FOR_API, forApiOptions + ] + }) + + const findQuery = { + offset: options.start, + limit: options.count, + order: getSort('position'), + where: { + videoPlaylistId: options.videoPlaylistId + }, + include: [ + { + model: VideoModel.scope(videoScope), + required: false + } + ] + } + + const countQuery = { + where: { + videoPlaylistId: options.videoPlaylistId + } + } + + return Promise.all([ + VideoPlaylistElementModel.count(countQuery), + VideoPlaylistElementModel.findAll(findQuery) + ]).then(([ total, data ]) => ({ total, data })) + } + + static loadByPlaylistAndVideo (videoPlaylistId: number, videoId: number): Promise { const query = { where: { videoPlaylistId, @@ -121,9 +176,15 @@ export class VideoPlaylistElementModel extends Model return VideoPlaylistElementModel.findOne(query) } - static loadByPlaylistAndVideoForAP (playlistId: number | string, videoId: number | string) { + static loadById (playlistElementId: number | string): Promise { + return VideoPlaylistElementModel.findByPk(playlistElementId) + } + + static loadByPlaylistAndElementIdForAP ( + playlistId: number | string, + playlistElementId: number + ): Promise { const playlistWhere = validator.isUUID('' + playlistId) ? { uuid: playlistId } : { id: playlistId } - const videoWhere = validator.isUUID('' + videoId) ? { uuid: videoId } : { id: videoId } const query = { include: [ @@ -134,16 +195,18 @@ export class VideoPlaylistElementModel extends Model }, { attributes: [ 'url' ], - model: VideoModel.unscoped(), - where: videoWhere + model: VideoModel.unscoped() } - ] + ], + where: { + id: playlistElementId + } } return VideoPlaylistElementModel.findOne(query) } - static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number) { + static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number, t?: Transaction) { const query = { attributes: [ 'url' ], offset: start, @@ -151,7 +214,8 @@ export class VideoPlaylistElementModel extends Model order: getSort('position'), where: { videoPlaylistId - } + }, + transaction: t } return VideoPlaylistElementModel @@ -161,8 +225,26 @@ export class VideoPlaylistElementModel extends Model }) } - static getNextPositionOf (videoPlaylistId: number, transaction?: Sequelize.Transaction) { + static loadFirstElementWithVideoThumbnail (videoPlaylistId: number): Promise { const query = { + order: getSort('position'), + where: { + videoPlaylistId + }, + include: [ + { + model: VideoModel.scope(VideoScopeNames.WITH_THUMBNAILS), + required: true + } + ] + } + + return VideoPlaylistElementModel + .findOne(query) + } + + static getNextPositionOf (videoPlaylistId: number, transaction?: Transaction) { + const query: AggregateOptions = { where: { videoPlaylistId }, @@ -178,17 +260,18 @@ export class VideoPlaylistElementModel extends Model firstPosition: number, endPosition: number, newPosition: number, - transaction?: Sequelize.Transaction + transaction?: Transaction ) { const query = { where: { videoPlaylistId, position: { - [Sequelize.Op.gte]: firstPosition, - [Sequelize.Op.lte]: endPosition + [Op.gte]: firstPosition, + [Op.lte]: endPosition } }, - transaction + transaction, + validate: false // We use a literal to update the position } return VideoPlaylistElementModel.update({ position: Sequelize.literal(`${newPosition} + "position" - ${firstPosition}`) }, query) @@ -199,13 +282,13 @@ export class VideoPlaylistElementModel extends Model fromPosition: number, toPosition?: number, by = 1, - transaction?: Sequelize.Transaction + transaction?: Transaction ) { const query = { where: { videoPlaylistId, position: { - [Sequelize.Op.gte]: fromPosition + [Op.gte]: fromPosition } }, transaction @@ -214,7 +297,49 @@ export class VideoPlaylistElementModel extends Model return VideoPlaylistElementModel.increment({ position: by }, query) } - toActivityPubObject (): PlaylistElementObject { + getType (this: MVideoPlaylistElementFormattable, displayNSFW?: boolean, accountId?: number) { + const video = this.Video + + if (!video) return VideoPlaylistElementType.DELETED + + // Owned video, don't filter it + if (accountId && video.VideoChannel.Account.id === accountId) return VideoPlaylistElementType.REGULAR + + // Internal video? + if (video.privacy === VideoPrivacy.INTERNAL && accountId) return VideoPlaylistElementType.REGULAR + + if (video.privacy === VideoPrivacy.PRIVATE || video.privacy === VideoPrivacy.INTERNAL) return VideoPlaylistElementType.PRIVATE + + if (video.isBlacklisted() || video.isBlocked()) return VideoPlaylistElementType.UNAVAILABLE + if (video.nsfw === true && displayNSFW === false) return VideoPlaylistElementType.UNAVAILABLE + + return VideoPlaylistElementType.REGULAR + } + + getVideoElement (this: MVideoPlaylistElementFormattable, displayNSFW?: boolean, accountId?: number) { + if (!this.Video) return null + if (this.getType(displayNSFW, accountId) !== VideoPlaylistElementType.REGULAR) return null + + return this.Video.toFormattedJSON() + } + + toFormattedJSON ( + this: MVideoPlaylistElementFormattable, + options: { displayNSFW?: boolean, accountId?: number } = {} + ): VideoPlaylistElement { + return { + id: this.id, + position: this.position, + startTimestamp: this.startTimestamp, + stopTimestamp: this.stopTimestamp, + + type: this.getType(options.displayNSFW, options.accountId), + + video: this.getVideoElement(options.displayNSFW, options.accountId) + } + } + + toActivityPubObject (this: MVideoPlaylistElementAP): PlaylistElementObject { const base: PlaylistElementObject = { id: this.url, type: 'PlaylistElement',