yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 10:19:35 +02:00
Code Issues Releases Wiki Activity

Fix type conflict

Browse source
This commit is contained in:
Chocobozzz 2021-12-24 10:40:51 +01:00
parent d17c7b4e8c
commit c7cdac4409
No known key found for this signature in database
GPG key ID: 583A612D890159BE
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/lib/plugins/plugin-manager.ts
View file

@ -5,7 +5,7 @@ import { basename, join } from 'path'
import { decachePlugin } from '@server/helpers/decache'
import { MOAuthTokenUser, MUser } from '@server/types/models'
import { getCompleteLocale } from '@shared/core-utils'
import { ClientScript, PluginPackageJson, PluginTranslation, PluginTranslationPaths, RegisterServerHookOptions } from '@shared/models'
import { ClientScriptJSON, PluginPackageJSON, PluginTranslation, PluginTranslationPathsJSON, RegisterServerHookOptions } from '@shared/models'
import { getHookType, internalRunHook } from '../../../shared/core-utils/plugins/hooks'
import { PluginType } from '../../../shared/models/plugins/plugin.type'
import { ServerHook, ServerHookName } from '../../../shared/models/plugins/server/server-hook.model'
@ -31,7 +31,7 @@ export interface RegisteredPlugin {
path: string
staticDirs: { [name: string]: string }
clientScripts: { [name: string]: ClientScript }
clientScripts: { [name: string]: ClientScriptJSON }
css: string[]
@ -392,7 +392,7 @@ export class PluginManager implements ServerHook {
registerHelpers = result.registerStore
}
const clientScripts: { [id: string]: ClientScript } = {}
const clientScripts: { [id: string]: ClientScriptJSON } = {}
for (const c of packageJSON.clientScripts) {
clientScripts[c.script] = c
}
@ -415,7 +415,7 @@ export class PluginManager implements ServerHook {
await this.addTranslations(plugin, npmName, packageJSON.translations)
}
private async registerPlugin (plugin: PluginModel, pluginPath: string, packageJSON: PluginPackageJson) {
private async registerPlugin (plugin: PluginModel, pluginPath: string, packageJSON: PluginPackageJSON) {
const npmName = PluginModel.buildNpmName(plugin.name, plugin.type)
// Delete cache if needed
@ -442,7 +442,7 @@ export class PluginManager implements ServerHook {
// ###################### Translations ######################
private async addTranslations (plugin: PluginModel, npmName: string, translationPaths: PluginTranslationPaths) {
private async addTranslations (plugin: PluginModel, npmName: string, translationPaths: PluginTranslationPathsJSON) {
for (const locale of Object.keys(translationPaths)) {
const path = translationPaths[locale]
const json = await readJSON(join(this.getPluginPath(plugin.name, plugin.type), path))
@ -513,7 +513,7 @@ export class PluginManager implements ServerHook {
private getPackageJSON (pluginName: string, pluginType: PluginType) {
const pluginPath = join(this.getPluginPath(pluginName, pluginType), 'package.json')
return readJSON(pluginPath) as Promise<PluginPackageJson>
return readJSON(pluginPath) as Promise<PluginPackageJSON>
}
private getPluginPath (pluginName: string, pluginType: PluginType) {
@ -572,7 +572,7 @@ export class PluginManager implements ServerHook {
}
}
private sanitizeAndCheckPackageJSONOrThrow (packageJSON: PluginPackageJson, pluginType: PluginType) {
private sanitizeAndCheckPackageJSONOrThrow (packageJSON: PluginPackageJSON, pluginType: PluginType) {
if (!packageJSON.staticDirs) packageJSON.staticDirs = {}
if (!packageJSON.css) packageJSON.css = []
if (!packageJSON.clientScripts) packageJSON.clientScripts = []