X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-blacklist-interface.ts;h=5ca4238016cda88b7fe4e1e4970c7989093ecd17;hb=6fcd19ba737f1f5614a56c6925adb882dea43b8d;hp=d4d6528d18f922573c4ce6a5f9d197c10123d05d;hpb=154898b0b7bc1af41fc5a94974e338a3590c90f3;p=github%2FChocobozzz%2FPeerTube.git 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 @@ import * as Sequelize from 'sequelize' +import * as Promise from 'bluebird' + +import { ResultList } from '../../../shared' // Don't use barrel, import just what we need import { BlacklistedVideo as FormatedBlacklistedVideo } from '../../../shared/models/video-blacklist.model' @@ -6,20 +9,15 @@ import { BlacklistedVideo as FormatedBlacklistedVideo } from '../../../shared/mo export namespace BlacklistedVideoMethods { export type ToFormatedJSON = (this: BlacklistedVideoInstance) => FormatedBlacklistedVideo - export type CountTotalCallback = (err: Error, total: number) => void - export type CountTotal = (callback: CountTotalCallback) => void + export type CountTotal = () => Promise - export type ListCallback = (err: Error, backlistedVideoInstances: BlacklistedVideoInstance[]) => void - export type List = (callback: ListCallback) => void + export type List = () => Promise - export type ListForApiCallback = (err: Error, blacklistedVIdeoInstances?: BlacklistedVideoInstance[], total?: number) => void - export type ListForApi = (start: number, count: number, sort: string, callback: ListForApiCallback) => void + export type ListForApi = (start: number, count: number, sort: string) => Promise< ResultList > - export type LoadByIdCallback = (err: Error, blacklistedVideoInstance: BlacklistedVideoInstance) => void - export type LoadById = (id: number, callback: LoadByIdCallback) => void + export type LoadById = (id: number) => Promise - export type LoadByVideoIdCallback = (err: Error, blacklistedVideoInstance: BlacklistedVideoInstance) => void - export type LoadByVideoId = (id: string, callback: LoadByVideoIdCallback) => void + export type LoadByVideoId = (id: string) => Promise } export interface BlacklistedVideoClass { @@ -35,7 +33,8 @@ export interface BlacklistedVideoAttributes { videoId: string } -export interface BlacklistedVideoInstance extends BlacklistedVideoClass, BlacklistedVideoAttributes, Sequelize.Instance { +export interface BlacklistedVideoInstance + extends BlacklistedVideoClass, BlacklistedVideoAttributes, Sequelize.Instance { id: number createdAt: Date updatedAt: Date @@ -43,4 +42,5 @@ export interface BlacklistedVideoInstance extends BlacklistedVideoClass, Blackli toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON } -export interface BlacklistedVideoModel extends BlacklistedVideoClass, Sequelize.Model {} +export interface BlacklistedVideoModel + extends BlacklistedVideoClass, Sequelize.Model {}