From a15871560f80e07386c1dabb8370cd2664ecfd1f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 31 Jan 2020 16:56:52 +0100 Subject: Move to eslint --- server/lib/plugins/plugin-index.ts | 4 ++-- server/lib/plugins/plugin-manager.ts | 44 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'server/lib/plugins') diff --git a/server/lib/plugins/plugin-index.ts b/server/lib/plugins/plugin-index.ts index 25b4f3c61..dcdfba28c 100644 --- a/server/lib/plugins/plugin-index.ts +++ b/server/lib/plugins/plugin-index.ts @@ -31,7 +31,7 @@ async function listAvailablePluginsFromIndex (options: PeertubePluginIndexList) logger.debug('Got result from PeerTube index.', { body }) - await addInstanceInformation(body) + addInstanceInformation(body) return body as ResultList } catch (err) { @@ -40,7 +40,7 @@ async function listAvailablePluginsFromIndex (options: PeertubePluginIndexList) } } -async function addInstanceInformation (result: ResultList) { +function addInstanceInformation (result: ResultList) { for (const d of result.data) { d.installed = PluginManager.Instance.isRegistered(d.npmName) d.name = PluginModel.normalizePluginName(d.npmName) diff --git a/server/lib/plugins/plugin-manager.ts b/server/lib/plugins/plugin-manager.ts index 7ebdabd34..73f7a71ce 100644 --- a/server/lib/plugins/plugin-manager.ts +++ b/server/lib/plugins/plugin-manager.ts @@ -55,30 +55,30 @@ export interface HookInformationValue { } type AlterableVideoConstant = 'language' | 'licence' | 'category' -type VideoConstant = { [ key in number | string ]: string } +type VideoConstant = { [key in number | string]: string } type UpdatedVideoConstant = { - [ name in AlterableVideoConstant ]: { - [ npmName: string ]: { - added: { key: number | string, label: string }[], + [name in AlterableVideoConstant]: { + [npmName: string]: { + added: { key: number | string, label: string }[] deleted: { key: number | string, label: string }[] } } } type PluginLocalesTranslations = { - [ locale: string ]: PluginTranslation + [locale: string]: PluginTranslation } export class PluginManager implements ServerHook { private static instance: PluginManager - private registeredPlugins: { [ name: string ]: RegisteredPlugin } = {} - private settings: { [ name: string ]: RegisterServerSettingOptions[] } = {} - private hooks: { [ name: string ]: HookInformationValue[] } = {} + private registeredPlugins: { [name: string]: RegisteredPlugin } = {} + private settings: { [name: string]: RegisterServerSettingOptions[] } = {} + private hooks: { [name: string]: HookInformationValue[] } = {} private translations: PluginLocalesTranslations = {} - private updatedVideoConstants: UpdatedVideoConstant = { + private readonly updatedVideoConstants: UpdatedVideoConstant = { language: {}, licence: {}, category: {} @@ -133,7 +133,7 @@ export class PluginManager implements ServerHook { // ###################### Hooks ###################### - async runHook (hookName: ServerHookName, result?: T, params?: any): Promise { + async runHook (hookName: ServerHookName, result?: T, params?: any): Promise { if (!this.hooks[hookName]) return Promise.resolve(result) const hookType = getHookType(hookName) @@ -312,7 +312,7 @@ export class PluginManager implements ServerHook { clientScripts[c.script] = c } - this.registeredPlugins[ npmName ] = { + this.registeredPlugins[npmName] = { npmName, name: plugin.name, type: plugin.type, @@ -438,7 +438,7 @@ export class PluginManager implements ServerHook { const plugins: RegisteredPlugin[] = [] for (const npmName of Object.keys(this.registeredPlugins)) { - const plugin = this.registeredPlugins[ npmName ] + const plugin = this.registeredPlugins[npmName] if (plugin.type !== type) continue plugins.push(plugin) @@ -518,11 +518,11 @@ export class PluginManager implements ServerHook { } } - private addConstant (parameters: { - npmName: string, - type: AlterableVideoConstant, - obj: VideoConstant, - key: T, + private addConstant (parameters: { + npmName: string + type: AlterableVideoConstant + obj: VideoConstant + key: T label: string }) { const { npmName, type, obj, key, label } = parameters @@ -545,10 +545,10 @@ export class PluginManager implements ServerHook { return true } - private deleteConstant (parameters: { - npmName: string, - type: AlterableVideoConstant, - obj: VideoConstant, + private deleteConstant (parameters: { + npmName: string + type: AlterableVideoConstant + obj: VideoConstant key: T }) { const { npmName, type, obj, key } = parameters @@ -604,7 +604,7 @@ export class PluginManager implements ServerHook { const { result: packageJSONValid, badFields } = isPackageJSONValid(packageJSON, pluginType) if (!packageJSONValid) { const formattedFields = badFields.map(f => `"${f}"`) - .join(', ') + .join(', ') throw new Error(`PackageJSON is invalid (invalid fields: ${formattedFields}).`) } -- cgit v1.2.3