X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fschedule-video-update.ts;h=b3cf269667f5b173c32866d789f0796ec43400b9;hb=52d6c2e0bf0893e39d0a89fccebad684e9d61ce5;hp=b0952c4316c8e7fd61b42c1be9f2387bdcc7ae84;hpb=5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/schedule-video-update.ts b/server/models/video/schedule-video-update.ts index b0952c431..b3cf26966 100644 --- a/server/models/video/schedule-video-update.ts +++ b/server/models/video/schedule-video-update.ts @@ -1,9 +1,9 @@ import { Op, Transaction } from 'sequelize' import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' -import { MScheduleVideoUpdateFormattable, MScheduleVideoUpdateVideoAll } from '@server/types/models' -import { AttributesOnly } from '@shared/core-utils' +import { MScheduleVideoUpdateFormattable, MScheduleVideoUpdate } from '@server/types/models' +import { AttributesOnly } from '@shared/typescript-utils' import { VideoPrivacy } from '../../../shared/models/videos' -import { ScopeNames as VideoScopeNames, VideoModel } from './video' +import { VideoModel } from './video' @Table({ tableName: 'scheduleVideoUpdate', @@ -62,31 +62,17 @@ export class ScheduleVideoUpdateModel extends Model !!res) } - static listVideosToUpdate (t: Transaction) { + static listVideosToUpdate (transaction?: Transaction) { const query = { where: { updateAt: { [Op.lte]: new Date() } }, - include: [ - { - model: VideoModel.scope( - [ - VideoScopeNames.WITH_WEBTORRENT_FILES, - VideoScopeNames.WITH_STREAMING_PLAYLISTS, - VideoScopeNames.WITH_ACCOUNT_DETAILS, - VideoScopeNames.WITH_BLACKLISTED, - VideoScopeNames.WITH_THUMBNAILS, - VideoScopeNames.WITH_TAGS - ] - ) - } - ], - transaction: t + transaction } - return ScheduleVideoUpdateModel.findAll(query) + return ScheduleVideoUpdateModel.findAll(query) } static deleteByVideoId (videoId: number, t: Transaction) {