diff options
author | Chocobozzz <me@florianbigard.com> | 2019-03-05 11:30:43 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-03-18 11:17:59 +0100 |
commit | 09979f8959425390b879bce22101a9bc061ae9a0 (patch) | |
tree | a128a50b7c58c070e4b7af44028dfaa03e2d2ef1 /server/models/account | |
parent | df0b219d36bf6852cdf2a7ad09ed4a41c6bccefa (diff) | |
download | PeerTube-09979f8959425390b879bce22101a9bc061ae9a0.tar.gz PeerTube-09979f8959425390b879bce22101a9bc061ae9a0.tar.zst PeerTube-09979f8959425390b879bce22101a9bc061ae9a0.zip |
Refactor video playlist middlewares
Diffstat (limited to 'server/models/account')
-rw-r--r-- | server/models/account/account.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/models/account/account.ts b/server/models/account/account.ts index 3fb766c8a..7cc40f631 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts | |||
@@ -10,7 +10,8 @@ import { | |||
10 | ForeignKey, | 10 | ForeignKey, |
11 | HasMany, | 11 | HasMany, |
12 | Is, | 12 | Is, |
13 | Model, Scopes, | 13 | Model, |
14 | Scopes, | ||
14 | Table, | 15 | Table, |
15 | UpdatedAt | 16 | UpdatedAt |
16 | } from 'sequelize-typescript' | 17 | } from 'sequelize-typescript' |
@@ -26,7 +27,6 @@ import { VideoCommentModel } from '../video/video-comment' | |||
26 | import { UserModel } from './user' | 27 | import { UserModel } from './user' |
27 | import { CONFIG } from '../../initializers' | 28 | import { CONFIG } from '../../initializers' |
28 | import { AvatarModel } from '../avatar/avatar' | 29 | import { AvatarModel } from '../avatar/avatar' |
29 | import { WhereOptions } from 'sequelize' | ||
30 | import { VideoPlaylistModel } from '../video/video-playlist' | 30 | import { VideoPlaylistModel } from '../video/video-playlist' |
31 | 31 | ||
32 | export enum ScopeNames { | 32 | export enum ScopeNames { |
@@ -42,7 +42,7 @@ export enum ScopeNames { | |||
42 | ] | 42 | ] |
43 | }) | 43 | }) |
44 | @Scopes({ | 44 | @Scopes({ |
45 | [ ScopeNames.SUMMARY ]: (whereActor?: WhereOptions<ActorModel>) => { | 45 | [ ScopeNames.SUMMARY ]: (whereActor?: Sequelize.WhereOptions<ActorModel>) => { |
46 | return { | 46 | return { |
47 | attributes: [ 'id', 'name' ], | 47 | attributes: [ 'id', 'name' ], |
48 | include: [ | 48 | include: [ |