diff options
Diffstat (limited to 'server/models/video/video-playlist-element.ts')
-rw-r--r-- | server/models/video/video-playlist-element.ts | 10 |
1 files changed, 4 insertions, 6 deletions
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' | |||
20 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' | 20 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' |
21 | import { CONSTRAINTS_FIELDS } from '../../initializers' | 21 | import { CONSTRAINTS_FIELDS } from '../../initializers' |
22 | import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' | 22 | import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' |
23 | import * as validator from 'validator' | ||
23 | 24 | ||
24 | @Table({ | 25 | @Table({ |
25 | tableName: 'videoPlaylistElement', | 26 | tableName: 'videoPlaylistElement', |
@@ -35,10 +36,6 @@ import { PlaylistElementObject } from '../../../shared/models/activitypub/object | |||
35 | unique: true | 36 | unique: true |
36 | }, | 37 | }, |
37 | { | 38 | { |
38 | fields: [ 'videoPlaylistId', 'position' ], | ||
39 | unique: true | ||
40 | }, | ||
41 | { | ||
42 | fields: [ 'url' ], | 39 | fields: [ 'url' ], |
43 | unique: true | 40 | unique: true |
44 | } | 41 | } |
@@ -143,7 +140,7 @@ export class VideoPlaylistElementModel extends Model<VideoPlaylistElementModel> | |||
143 | return VideoPlaylistElementModel.findOne(query) | 140 | return VideoPlaylistElementModel.findOne(query) |
144 | } | 141 | } |
145 | 142 | ||
146 | static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number) { | 143 | static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number, t?: Sequelize.Transaction) { |
147 | const query = { | 144 | const query = { |
148 | attributes: [ 'url' ], | 145 | attributes: [ 'url' ], |
149 | offset: start, | 146 | offset: start, |
@@ -151,7 +148,8 @@ export class VideoPlaylistElementModel extends Model<VideoPlaylistElementModel> | |||
151 | order: getSort('position'), | 148 | order: getSort('position'), |
152 | where: { | 149 | where: { |
153 | videoPlaylistId | 150 | videoPlaylistId |
154 | } | 151 | }, |
152 | transaction: t | ||
155 | } | 153 | } |
156 | 154 | ||
157 | return VideoPlaylistElementModel | 155 | return VideoPlaylistElementModel |