X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-playlist-element.ts;h=a2bd225a16f84cb8a45313748e5b84495376905c;hb=9c6ca37fc1512a99d420ea90707cebcd06cdc970;hp=5530e0492d6463db06e95361fdc4788abad66e09;hpb=07b1a18aa678d260009a93e36606c5c5f585723d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-playlist-element.ts b/server/models/video/video-playlist-element.ts index 5530e0492..a2bd225a1 100644 --- a/server/models/video/video-playlist-element.ts +++ b/server/models/video/video-playlist-element.ts @@ -20,6 +20,7 @@ import { getSort, throwIfNotValid } from '../utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { CONSTRAINTS_FIELDS } from '../../initializers' import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' +import * as validator from 'validator' @Table({ tableName: 'videoPlaylistElement', @@ -34,10 +35,6 @@ import { PlaylistElementObject } from '../../../shared/models/activitypub/object fields: [ 'videoPlaylistId', 'videoId' ], unique: true }, - { - fields: [ 'videoPlaylistId', 'position' ], - unique: true - }, { fields: [ 'url' ], unique: true @@ -143,7 +140,7 @@ export class VideoPlaylistElementModel extends Model return VideoPlaylistElementModel.findOne(query) } - static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number) { + static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number, t?: Sequelize.Transaction) { const query = { attributes: [ 'url' ], offset: start, @@ -151,7 +148,8 @@ export class VideoPlaylistElementModel extends Model order: getSort('position'), where: { videoPlaylistId - } + }, + transaction: t } return VideoPlaylistElementModel