X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-channel.ts;h=4a50af265fae906a65f0e060688ef7f1b70ffb7c;hb=6b738c7a31591a83fdcd9c78b6b1f98e543c378b;hp=9b545a4efc1e9ca6595c9782664e83fed9365e6a;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 9b545a4ef..4a50af265 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts @@ -1,33 +1,60 @@ -import * as Sequelize from 'sequelize' import { - AfterDestroy, - AllowNull, - BelongsTo, - Column, - CreatedAt, - DataType, - Default, - ForeignKey, - HasMany, - Is, - IsUUID, - Model, - Table, - UpdatedAt + AllowNull, BeforeDestroy, BelongsTo, Column, CreatedAt, DefaultScope, ForeignKey, HasMany, Is, Model, Scopes, Table, + UpdatedAt, Default } from 'sequelize-typescript' -import { IFindOptions } from 'sequelize-typescript/lib/interfaces/IFindOptions' -import { activityPubCollection } from '../../helpers' -import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub' -import { isVideoChannelDescriptionValid, isVideoChannelNameValid } from '../../helpers/custom-validators/video-channels' -import { CONSTRAINTS_FIELDS } from '../../initializers' -import { getAnnounceActivityPubUrl } from '../../lib/activitypub' -import { sendDeleteVideoChannel } from '../../lib/activitypub/send' +import { ActivityPubActor } from '../../../shared/models/activitypub' +import { VideoChannel } from '../../../shared/models/videos' +import { + isVideoChannelDescriptionValid, isVideoChannelNameValid, + isVideoChannelSupportValid +} from '../../helpers/custom-validators/video-channels' +import { logger } from '../../helpers/logger' +import { sendDeleteActor } from '../../lib/activitypub/send' import { AccountModel } from '../account/account' -import { ServerModel } from '../server/server' +import { ActorModel } from '../activitypub/actor' import { getSort, throwIfNotValid } from '../utils' import { VideoModel } from './video' -import { VideoChannelShareModel } from './video-channel-share' +enum ScopeNames { + WITH_ACCOUNT = 'WITH_ACCOUNT', + WITH_ACTOR = 'WITH_ACTOR', + WITH_VIDEOS = 'WITH_VIDEOS' +} + +@DefaultScope({ + include: [ + { + model: () => ActorModel, + required: true + } + ] +}) +@Scopes({ + [ScopeNames.WITH_ACCOUNT]: { + include: [ + { + model: () => AccountModel, + required: true, + include: [ + { + model: () => ActorModel, + required: true + } + ] + } + ] + }, + [ScopeNames.WITH_VIDEOS]: { + include: [ + () => VideoModel + ] + }, + [ScopeNames.WITH_ACTOR]: { + include: [ + () => ActorModel + ] + } +}) @Table({ tableName: 'videoChannel', indexes: [ @@ -38,30 +65,22 @@ import { VideoChannelShareModel } from './video-channel-share' }) export class VideoChannelModel extends Model { - @AllowNull(false) - @Default(DataType.UUIDV4) - @IsUUID(4) - @Column(DataType.UUID) - uuid: string - @AllowNull(false) @Is('VideoChannelName', value => throwIfNotValid(value, isVideoChannelNameValid, 'name')) @Column name: string @AllowNull(true) + @Default(null) @Is('VideoChannelDescription', value => throwIfNotValid(value, isVideoChannelDescriptionValid, 'description')) @Column description: string - @AllowNull(false) + @AllowNull(true) + @Default(null) + @Is('VideoChannelSupport', value => throwIfNotValid(value, isVideoChannelSupportValid, 'support')) @Column - remote: boolean - - @AllowNull(false) - @Is('VideoChannelUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url')) - @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNELS.URL.max)) - url: string + support: string @CreatedAt createdAt: Date @@ -69,6 +88,18 @@ export class VideoChannelModel extends Model { @UpdatedAt updatedAt: Date + @ForeignKey(() => ActorModel) + @Column + actorId: number + + @BelongsTo(() => ActorModel, { + foreignKey: { + allowNull: false + }, + onDelete: 'cascade' + }) + Actor: ActorModel + @ForeignKey(() => AccountModel) @Column accountId: number @@ -77,7 +108,7 @@ export class VideoChannelModel extends Model { foreignKey: { allowNull: false }, - onDelete: 'CASCADE' + hooks: true }) Account: AccountModel @@ -86,23 +117,21 @@ export class VideoChannelModel extends Model { name: 'channelId', allowNull: false }, - onDelete: 'CASCADE' + onDelete: 'CASCADE', + hooks: true }) Videos: VideoModel[] - @HasMany(() => VideoChannelShareModel, { - foreignKey: { - name: 'channelId', - allowNull: false - }, - onDelete: 'CASCADE' - }) - VideoChannelShares: VideoChannelShareModel[] + @BeforeDestroy + static async sendDeleteIfOwned (instance: VideoChannelModel, options) { + if (!instance.Actor) { + instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel + } - @AfterDestroy - static sendDeleteIfOwned (instance: VideoChannelModel) { - if (instance.isOwned()) { - return sendDeleteVideoChannel(instance, undefined) + if (instance.Actor.isOwned()) { + logger.debug('Sending delete of actor of video channel %s.', instance.Actor.url) + + return sendDeleteActor(instance.Actor, options.transaction) } return undefined @@ -122,17 +151,12 @@ export class VideoChannelModel extends Model { const query = { offset: start, limit: count, - order: [ getSort(sort) ], - include: [ - { - model: AccountModel, - required: true, - include: [ { model: ServerModel, required: false } ] - } - ] + order: getSort(sort) } - return VideoChannelModel.findAndCountAll(query) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findAndCountAll(query) .then(({ rows, count }) => { return { total: count, data: rows } }) @@ -140,202 +164,110 @@ export class VideoChannelModel extends Model { static listByAccount (accountId: number) { const query = { - order: [ getSort('createdAt') ], + order: getSort('createdAt'), include: [ { model: AccountModel, where: { id: accountId }, - required: true, - include: [ { model: ServerModel, required: false } ] + required: true } ] } - return VideoChannelModel.findAndCountAll(query) + return VideoChannelModel + .findAndCountAll(query) .then(({ rows, count }) => { return { total: count, data: rows } }) } - static loadByUUID (uuid: string, t?: Sequelize.Transaction) { - const query: IFindOptions = { - where: { - uuid - } - } - - if (t !== undefined) query.transaction = t - - return VideoChannelModel.findOne(query) - } - - static loadByUrl (url: string, t?: Sequelize.Transaction) { - const query: IFindOptions = { - where: { - url - }, - include: [ AccountModel ] - } - - if (t !== undefined) query.transaction = t - - return VideoChannelModel.findOne(query) - } - - static loadByUUIDOrUrl (uuid: string, url: string, t?: Sequelize.Transaction) { - const query: IFindOptions = { - where: { - [ Sequelize.Op.or ]: [ - { uuid }, - { url } - ] - } - } - - if (t !== undefined) query.transaction = t - - return VideoChannelModel.findOne(query) - } - - static loadByHostAndUUID (fromHost: string, uuid: string, t?: Sequelize.Transaction) { - const query: IFindOptions = { - where: { - uuid - }, - include: [ - { - model: AccountModel, - include: [ - { - model: ServerModel, - required: true, - where: { - host: fromHost - } - } - ] - } - ] - } - - if (t !== undefined) query.transaction = t - - return VideoChannelModel.findOne(query) - } - static loadByIdAndAccount (id: number, accountId: number) { const options = { where: { id, accountId - }, - include: [ - { - model: AccountModel, - include: [ { model: ServerModel, required: false } ] - } - ] + } } - return VideoChannelModel.findOne(options) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findOne(options) } static loadAndPopulateAccount (id: number) { - const options = { - include: [ - { - model: AccountModel, - include: [ { model: ServerModel, required: false } ] - } - ] - } - - return VideoChannelModel.findById(id, options) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findById(id) } static loadByUUIDAndPopulateAccount (uuid: string) { const options = { - where: { - uuid - }, include: [ { - model: AccountModel, - include: [ { model: ServerModel, required: false } ] + model: ActorModel, + required: true, + where: { + uuid + } } ] } - return VideoChannelModel.findOne(options) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findOne(options) } static loadAndPopulateAccountAndVideos (id: number) { const options = { include: [ - { - model: AccountModel, - include: [ { model: ServerModel, required: false } ] - }, VideoModel ] } - return VideoChannelModel.findById(id, options) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEOS ]) + .findById(id, options) } - isOwned () { - return this.remote === false - } - - toFormattedJSON () { - const json = { + toFormattedJSON (): VideoChannel { + const actor = this.Actor.toFormattedJSON() + const videoChannel = { id: this.id, - uuid: this.uuid, - name: this.name, + displayName: this.name, description: this.description, - isLocal: this.isOwned(), + support: this.support, + isLocal: this.Actor.isOwned(), createdAt: this.createdAt, - updatedAt: this.updatedAt + updatedAt: this.updatedAt, + ownerAccount: undefined, + videos: undefined } - if (this.Account !== undefined) { - json[ 'owner' ] = { - name: this.Account.name, - uuid: this.Account.uuid + if (this.Account) { + videoChannel.ownerAccount = { + id: this.Account.id, + uuid: this.Account.Actor.uuid } } - if (Array.isArray(this.Videos)) { - json[ 'videos' ] = this.Videos.map(v => v.toFormattedJSON()) - } - - return json + return Object.assign(actor, videoChannel) } - toActivityPubObject () { - let sharesObject - if (Array.isArray(this.VideoChannelShares)) { - const shares: string[] = [] - - for (const videoChannelShare of this.VideoChannelShares) { - const shareUrl = getAnnounceActivityPubUrl(this.url, videoChannelShare.Account) - shares.push(shareUrl) - } - - sharesObject = activityPubCollection(shares) - } + toActivityPubObject (): ActivityPubActor { + const obj = this.Actor.toActivityPubObject(this.name, 'VideoChannel') - return { - type: 'VideoChannel' as 'VideoChannel', - id: this.url, - uuid: this.uuid, - content: this.description, - name: this.name, - published: this.createdAt.toISOString(), - updated: this.updatedAt.toISOString(), - shares: sharesObject - } + return Object.assign(obj, { + summary: this.description, + support: this.support, + attributedTo: [ + { + type: 'Person' as 'Person', + id: this.Account.Actor.url + } + ] + }) } }