X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-channel.ts;h=4251afce994d00ab7999b2fb92420b36b8d7bec1;hb=f4001cf408a99049d01a356bfb20a62342de06ea;hp=068c8029d033eb0cec79c446495bc42fa63ae7e2;hpb=d48ff09d27d234425c3e9f091ae9072d8e6d8b7a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 068c8029d..4251afce9 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts @@ -1,44 +1,54 @@ -import * as Sequelize from 'sequelize' import { - AfterDestroy, - AllowNull, - BelongsTo, - Column, - CreatedAt, - DataType, - Default, - ForeignKey, - HasMany, - Is, - IsUUID, - Model, Scopes, - Table, - UpdatedAt + AllowNull, BeforeDestroy, BelongsTo, Column, CreatedAt, DefaultScope, ForeignKey, HasMany, Is, Model, Scopes, Table, + UpdatedAt, Default, DataType } 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' +import { CONSTRAINTS_FIELDS } from '../../initializers' +import { AvatarModel } from '../avatar/avatar' 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, - include: [ { model: () => ServerModel, required: false } ] + model: () => AccountModel.unscoped(), + required: true, + include: [ + { + model: () => ActorModel.unscoped(), + required: true, + include: [ + { + model: () => AvatarModel.unscoped(), + required: false + } + ] + } + ] } ] }, @@ -46,6 +56,11 @@ enum ScopeNames { include: [ () => VideoModel ] + }, + [ScopeNames.WITH_ACTOR]: { + include: [ + () => ActorModel + ] } }) @Table({ @@ -58,30 +73,22 @@ enum ScopeNames { }) 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 + @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNELS.DESCRIPTION.max)) description: string - @AllowNull(false) - @Column - remote: boolean - - @AllowNull(false) - @Is('VideoChannelUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url')) - @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNELS.URL.max)) - url: string + @AllowNull(true) + @Default(null) + @Is('VideoChannelSupport', value => throwIfNotValid(value, isVideoChannelSupportValid, 'support')) + @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNELS.SUPPORT.max)) + support: string @CreatedAt createdAt: Date @@ -89,6 +96,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 @@ -97,7 +116,7 @@ export class VideoChannelModel extends Model { foreignKey: { allowNull: false }, - onDelete: 'CASCADE' + hooks: true }) Account: AccountModel @@ -106,23 +125,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 @@ -142,10 +159,12 @@ export class VideoChannelModel extends Model { const query = { offset: start, limit: count, - order: [ getSort(sort) ] + order: getSort(sort) } - return VideoChannelModel.scope(ScopeNames.WITH_ACCOUNT).findAndCountAll(query) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findAndCountAll(query) .then(({ rows, count }) => { return { total: count, data: rows } }) @@ -153,52 +172,25 @@ 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 loadByUrl (url: string, t?: Sequelize.Transaction) { - const query: IFindOptions = { - where: { - url - } - } - - if (t !== undefined) query.transaction = t - - return VideoChannelModel.scope(ScopeNames.WITH_ACCOUNT).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 loadByIdAndAccount (id: number, accountId: number) { const options = { where: { @@ -207,21 +199,33 @@ export class VideoChannelModel extends Model { } } - return VideoChannelModel.scope(ScopeNames.WITH_ACCOUNT).findOne(options) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findOne(options) } static loadAndPopulateAccount (id: number) { - return VideoChannelModel.scope(ScopeNames.WITH_ACCOUNT).findById(id) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findById(id) } static loadByUUIDAndPopulateAccount (uuid: string) { const options = { - where: { - uuid - } + include: [ + { + model: ActorModel, + required: true, + where: { + uuid + } + } + ] } - return VideoChannelModel.scope(ScopeNames.WITH_ACCOUNT).findOne(options) + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .findOne(options) } static loadAndPopulateAccountAndVideos (id: number) { @@ -231,60 +235,46 @@ export class VideoChannelModel extends Model { ] } - return VideoChannelModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEOS ]).findById(id, options) - } - - isOwned () { - return this.remote === false + return VideoChannelModel + .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEOS ]) + .findById(id, options) } - toFormattedJSON () { - const json = { + toFormattedJSON (): VideoChannel { + const actor = this.Actor.toFormattedJSON() + const videoChannel = { id: this.id, - uuid: this.uuid, - name: this.name, + displayName: this.getDisplayName(), 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 (Array.isArray(this.Videos)) { - json[ 'videos' ] = this.Videos.map(v => v.toFormattedJSON()) - } + if (this.Account) videoChannel.ownerAccount = this.Account.toFormattedJSON() - return json + return Object.assign(actor, videoChannel) } - toActivityPubObject () { - let sharesObject - if (Array.isArray(this.VideoChannelShares)) { - const shares: string[] = [] + toActivityPubObject (): ActivityPubActor { + const obj = this.Actor.toActivityPubObject(this.name, 'VideoChannel') - for (const videoChannelShare of this.VideoChannelShares) { - const shareUrl = getAnnounceActivityPubUrl(this.url, videoChannelShare.Account) - shares.push(shareUrl) - } - - sharesObject = activityPubCollection(shares) - } + return Object.assign(obj, { + summary: this.description, + support: this.support, + attributedTo: [ + { + type: 'Person' as 'Person', + id: this.Account.Actor.url + } + ] + }) + } - 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 - } + getDisplayName () { + return this.name } }