X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fschedule-video-update.ts;h=603d556924c7e4f59845963175b4662288758502;hb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;hp=3cf5f6c99b06591fe81260f6479553d348d0eedc;hpb=bbe0f0645ca958d33a3f409b15166609733b663f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/schedule-video-update.ts b/server/models/video/schedule-video-update.ts index 3cf5f6c99..603d55692 100644 --- a/server/models/video/schedule-video-update.ts +++ b/server/models/video/schedule-video-update.ts @@ -1,7 +1,7 @@ -import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Model, Sequelize, Table, UpdatedAt } from 'sequelize-typescript' +import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' import { ScopeNames as VideoScopeNames, VideoModel } from './video' import { VideoPrivacy } from '../../../shared/models/videos' -import { Transaction } from 'sequelize' +import { Op, Transaction } from 'sequelize' @Table({ tableName: 'scheduleVideoUpdate', @@ -51,7 +51,7 @@ export class ScheduleVideoUpdateModel extends Model { attributes: [ 'id' ], where: { updateAt: { - [Sequelize.Op.lte]: new Date() + [Op.lte]: new Date() } } } @@ -64,7 +64,7 @@ export class ScheduleVideoUpdateModel extends Model { const query = { where: { updateAt: { - [Sequelize.Op.lte]: new Date() + [Op.lte]: new Date() } }, include: [ @@ -72,7 +72,9 @@ export class ScheduleVideoUpdateModel extends Model { model: VideoModel.scope( [ VideoScopeNames.WITH_FILES, - VideoScopeNames.WITH_ACCOUNT_DETAILS + VideoScopeNames.WITH_ACCOUNT_DETAILS, + VideoScopeNames.WITH_BLACKLISTED, + VideoScopeNames.WITH_THUMBNAILS ] ) } @@ -83,6 +85,17 @@ export class ScheduleVideoUpdateModel extends Model { return ScheduleVideoUpdateModel.findAll(query) } + static deleteByVideoId (videoId: number, t: Transaction) { + const query = { + where: { + videoId + }, + transaction: t + } + + return ScheduleVideoUpdateModel.destroy(query) + } + toFormattedJSON () { return { updateAt: this.updateAt,