From 6fcd19ba737f1f5614a56c6925adb882dea43b8d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 5 Jul 2017 13:26:25 +0200 Subject: Move to promises Closes https://github.com/Chocobozzz/PeerTube/issues/74 --- .../models/request/request-video-qadu-interface.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'server/models/request/request-video-qadu-interface.ts') diff --git a/server/models/request/request-video-qadu-interface.ts b/server/models/request/request-video-qadu-interface.ts index 805771cda..9a172a4d4 100644 --- a/server/models/request/request-video-qadu-interface.ts +++ b/server/models/request/request-video-qadu-interface.ts @@ -1,5 +1,7 @@ import * as Sequelize from 'sequelize' +import * as Promise from 'bluebird' +import { AbstractRequestClass, AbstractRequestToPodClass } from './abstract-request-interface' import { VideoInstance } from '../video' import { PodInstance } from '../pod' @@ -14,20 +16,16 @@ export type RequestsVideoQaduGrouped = { } export namespace RequestVideoQaduMethods { - export type CountTotalRequestsCallback = (err: Error, total: number) => void - export type CountTotalRequests = (callback: CountTotalRequestsCallback) => void + export type CountTotalRequests = () => Promise - export type ListWithLimitAndRandomCallback = (err: Error, requestsGrouped?: RequestsVideoQaduGrouped) => void - export type ListWithLimitAndRandom = (limitPods: number, limitRequestsPerPod: number, callback: ListWithLimitAndRandomCallback) => void + export type ListWithLimitAndRandom = (limitPods: number, limitRequestsPerPod: number) => Promise - export type RemoveByRequestIdsAndPodCallback = () => void - export type RemoveByRequestIdsAndPod = (ids: number[], podId: number, callback: RemoveByRequestIdsAndPodCallback) => void + export type RemoveByRequestIdsAndPod = (ids: number[], podId: number) => Promise - export type RemoveAllCallback = () => void - export type RemoveAll = (callback: RemoveAllCallback) => void + export type RemoveAll = () => Promise } -export interface RequestVideoQaduClass { +export interface RequestVideoQaduClass extends AbstractRequestClass, AbstractRequestToPodClass { countTotalRequests: RequestVideoQaduMethods.CountTotalRequests listWithLimitAndRandom: RequestVideoQaduMethods.ListWithLimitAndRandom removeByRequestIdsAndPod: RequestVideoQaduMethods.RemoveByRequestIdsAndPod @@ -38,11 +36,13 @@ export interface RequestVideoQaduAttributes { type: RequestVideoQaduType } -export interface RequestVideoQaduInstance extends RequestVideoQaduClass, RequestVideoQaduAttributes, Sequelize.Instance { +export interface RequestVideoQaduInstance + extends RequestVideoQaduClass, RequestVideoQaduAttributes, Sequelize.Instance { id: number Pod: PodInstance Video: VideoInstance } -export interface RequestVideoQaduModel extends RequestVideoQaduClass, Sequelize.Model {} +export interface RequestVideoQaduModel + extends RequestVideoQaduClass, Sequelize.Model {} -- cgit v1.2.3