diff options
Diffstat (limited to 'server/models/user')
-rw-r--r-- | server/models/user/user-interface.ts | 4 | ||||
-rw-r--r-- | server/models/user/user-video-rate-interface.ts | 6 | ||||
-rw-r--r-- | server/models/user/user-video-rate.ts | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/server/models/user/user-interface.ts b/server/models/user/user-interface.ts index 6726e8ab5..fd98a042e 100644 --- a/server/models/user/user-interface.ts +++ b/server/models/user/user-interface.ts | |||
@@ -2,7 +2,7 @@ import * as Sequelize from 'sequelize' | |||
2 | import * as Bluebird from 'bluebird' | 2 | import * as Bluebird from 'bluebird' |
3 | 3 | ||
4 | // Don't use barrel, import just what we need | 4 | // Don't use barrel, import just what we need |
5 | import { User as FormatedUser } from '../../../shared/models/user.model' | 5 | import { UserRole, User as FormatedUser } from '../../../shared/models/user.model' |
6 | 6 | ||
7 | export namespace UserMethods { | 7 | export namespace UserMethods { |
8 | export type IsPasswordMatchCallback = (err: Error, same: boolean) => void | 8 | export type IsPasswordMatchCallback = (err: Error, same: boolean) => void |
@@ -51,7 +51,7 @@ export interface UserAttributes { | |||
51 | username: string | 51 | username: string |
52 | email: string | 52 | email: string |
53 | displayNSFW?: boolean | 53 | displayNSFW?: boolean |
54 | role: string | 54 | role: UserRole |
55 | } | 55 | } |
56 | 56 | ||
57 | export interface UserInstance extends UserClass, UserAttributes, Sequelize.Instance<UserAttributes> { | 57 | export interface UserInstance extends UserClass, UserAttributes, Sequelize.Instance<UserAttributes> { |
diff --git a/server/models/user/user-video-rate-interface.ts b/server/models/user/user-video-rate-interface.ts index e48869fd2..a726639b1 100644 --- a/server/models/user/user-video-rate-interface.ts +++ b/server/models/user/user-video-rate-interface.ts | |||
@@ -1,8 +1,10 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | 2 | ||
3 | import { VideoRateType } from '../../../shared/models/user-video-rate.model' | ||
4 | |||
3 | export namespace UserVideoRateMethods { | 5 | export namespace UserVideoRateMethods { |
4 | export type LoadCallback = (err: Error, userVideoRateInstance: UserVideoRateInstance) => void | 6 | export type LoadCallback = (err: Error, userVideoRateInstance: UserVideoRateInstance) => void |
5 | export type Load = (userId, videoId, transaction, callback) => void | 7 | export type Load = (userId: number, videoId: string, transaction: Sequelize.Transaction, callback: LoadCallback) => void |
6 | } | 8 | } |
7 | 9 | ||
8 | export interface UserVideoRateClass { | 10 | export interface UserVideoRateClass { |
@@ -10,7 +12,7 @@ export interface UserVideoRateClass { | |||
10 | } | 12 | } |
11 | 13 | ||
12 | export interface UserVideoRateAttributes { | 14 | export interface UserVideoRateAttributes { |
13 | type: string | 15 | type: VideoRateType |
14 | } | 16 | } |
15 | 17 | ||
16 | export interface UserVideoRateInstance extends UserVideoRateClass, UserVideoRateAttributes, Sequelize.Instance<UserVideoRateAttributes> { | 18 | export interface UserVideoRateInstance extends UserVideoRateClass, UserVideoRateAttributes, Sequelize.Instance<UserVideoRateAttributes> { |
diff --git a/server/models/user/user-video-rate.ts b/server/models/user/user-video-rate.ts index 68be62fc2..1094eb281 100644 --- a/server/models/user/user-video-rate.ts +++ b/server/models/user/user-video-rate.ts | |||
@@ -67,7 +67,7 @@ function associate (models) { | |||
67 | }) | 67 | }) |
68 | } | 68 | } |
69 | 69 | ||
70 | load = function (userId: number, videoId: number, transaction: Sequelize.Transaction, callback: UserVideoRateMethods.LoadCallback) { | 70 | load = function (userId: number, videoId: string, transaction: Sequelize.Transaction, callback: UserVideoRateMethods.LoadCallback) { |
71 | const options: Sequelize.FindOptions = { | 71 | const options: Sequelize.FindOptions = { |
72 | where: { | 72 | where: { |
73 | userId, | 73 | userId, |