diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-07-05 13:26:25 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-07-05 14:14:16 +0200 |
commit | 6fcd19ba737f1f5614a56c6925adb882dea43b8d (patch) | |
tree | 3365a96d82bc7f00ae504a568725c8e914150cf8 /server/models/video/video-blacklist-interface.ts | |
parent | 5fe7e898316e18369c3e1aba307b55077adc7bfb (diff) | |
download | PeerTube-6fcd19ba737f1f5614a56c6925adb882dea43b8d.tar.gz PeerTube-6fcd19ba737f1f5614a56c6925adb882dea43b8d.tar.zst PeerTube-6fcd19ba737f1f5614a56c6925adb882dea43b8d.zip |
Move to promises
Closes https://github.com/Chocobozzz/PeerTube/issues/74
Diffstat (limited to 'server/models/video/video-blacklist-interface.ts')
-rw-r--r-- | server/models/video/video-blacklist-interface.ts | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/server/models/video/video-blacklist-interface.ts b/server/models/video/video-blacklist-interface.ts index d4d6528d1..5ca423801 100644 --- a/server/models/video/video-blacklist-interface.ts +++ b/server/models/video/video-blacklist-interface.ts | |||
@@ -1,4 +1,7 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | import * as Promise from 'bluebird' | ||
3 | |||
4 | import { ResultList } from '../../../shared' | ||
2 | 5 | ||
3 | // Don't use barrel, import just what we need | 6 | // Don't use barrel, import just what we need |
4 | import { BlacklistedVideo as FormatedBlacklistedVideo } from '../../../shared/models/video-blacklist.model' | 7 | import { BlacklistedVideo as FormatedBlacklistedVideo } from '../../../shared/models/video-blacklist.model' |
@@ -6,20 +9,15 @@ import { BlacklistedVideo as FormatedBlacklistedVideo } from '../../../shared/mo | |||
6 | export namespace BlacklistedVideoMethods { | 9 | export namespace BlacklistedVideoMethods { |
7 | export type ToFormatedJSON = (this: BlacklistedVideoInstance) => FormatedBlacklistedVideo | 10 | export type ToFormatedJSON = (this: BlacklistedVideoInstance) => FormatedBlacklistedVideo |
8 | 11 | ||
9 | export type CountTotalCallback = (err: Error, total: number) => void | 12 | export type CountTotal = () => Promise<number> |
10 | export type CountTotal = (callback: CountTotalCallback) => void | ||
11 | 13 | ||
12 | export type ListCallback = (err: Error, backlistedVideoInstances: BlacklistedVideoInstance[]) => void | 14 | export type List = () => Promise<BlacklistedVideoInstance[]> |
13 | export type List = (callback: ListCallback) => void | ||
14 | 15 | ||
15 | export type ListForApiCallback = (err: Error, blacklistedVIdeoInstances?: BlacklistedVideoInstance[], total?: number) => void | 16 | export type ListForApi = (start: number, count: number, sort: string) => Promise< ResultList<BlacklistedVideoInstance> > |
16 | export type ListForApi = (start: number, count: number, sort: string, callback: ListForApiCallback) => void | ||
17 | 17 | ||
18 | export type LoadByIdCallback = (err: Error, blacklistedVideoInstance: BlacklistedVideoInstance) => void | 18 | export type LoadById = (id: number) => Promise<BlacklistedVideoInstance> |
19 | export type LoadById = (id: number, callback: LoadByIdCallback) => void | ||
20 | 19 | ||
21 | export type LoadByVideoIdCallback = (err: Error, blacklistedVideoInstance: BlacklistedVideoInstance) => void | 20 | export type LoadByVideoId = (id: string) => Promise<BlacklistedVideoInstance> |
22 | export type LoadByVideoId = (id: string, callback: LoadByVideoIdCallback) => void | ||
23 | } | 21 | } |
24 | 22 | ||
25 | export interface BlacklistedVideoClass { | 23 | export interface BlacklistedVideoClass { |
@@ -35,7 +33,8 @@ export interface BlacklistedVideoAttributes { | |||
35 | videoId: string | 33 | videoId: string |
36 | } | 34 | } |
37 | 35 | ||
38 | export interface BlacklistedVideoInstance extends BlacklistedVideoClass, BlacklistedVideoAttributes, Sequelize.Instance<BlacklistedVideoAttributes> { | 36 | export interface BlacklistedVideoInstance |
37 | extends BlacklistedVideoClass, BlacklistedVideoAttributes, Sequelize.Instance<BlacklistedVideoAttributes> { | ||
39 | id: number | 38 | id: number |
40 | createdAt: Date | 39 | createdAt: Date |
41 | updatedAt: Date | 40 | updatedAt: Date |
@@ -43,4 +42,5 @@ export interface BlacklistedVideoInstance extends BlacklistedVideoClass, Blackli | |||
43 | toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON | 42 | toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON |
44 | } | 43 | } |
45 | 44 | ||
46 | export interface BlacklistedVideoModel extends BlacklistedVideoClass, Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes> {} | 45 | export interface BlacklistedVideoModel |
46 | extends BlacklistedVideoClass, Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes> {} | ||