X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fplugins%2Fhooks.ts;h=327aaece2d6f762c4cba1431daa39aa8ae05c390;hb=39d117a47d313637cf3ded4c6fa915aa9fd469ee;hp=b694d4118f9a991695dfcb6ec602bcbfd9e1941f;hpb=89cd12756035a146bbcc4db78cd3cd64f2f3d88d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/plugins/hooks.ts b/server/lib/plugins/hooks.ts index b694d4118..327aaece2 100644 --- a/server/lib/plugins/hooks.ts +++ b/server/lib/plugins/hooks.ts @@ -1,7 +1,7 @@ -import { ServerActionHookName, ServerFilterHookName } from '../../../shared/models/plugins/server-hook.model' -import { PluginManager } from './plugin-manager' +import Bluebird from 'bluebird' +import { ServerActionHookName, ServerFilterHookName } from '../../../shared/models' import { logger } from '../../helpers/logger' -import * as Bluebird from 'bluebird' +import { PluginManager } from './plugin-manager' type PromiseFunction = (params: U) => Promise | Bluebird type RawFunction = (params: U) => T @@ -9,7 +9,7 @@ type RawFunction = (params: U) => T // Helpers to run hooks const Hooks = { wrapObject: (result: T, hookName: U) => { - return PluginManager.Instance.runHook(hookName, result) as Promise + return PluginManager.Instance.runHook(hookName, result) }, wrapPromiseFun: async (fun: PromiseFunction, params: U, hookName: V) => { @@ -25,7 +25,7 @@ const Hooks = { }, runAction: (hookName: U, params?: T) => { - PluginManager.Instance.runHook(hookName, params) + PluginManager.Instance.runHook(hookName, undefined, params) .catch(err => logger.error('Fatal hook error.', { err })) } }