diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-12-24 10:40:51 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-12-24 10:40:51 +0100 |
| commit | c7cdac440970525d78d257a055899c26f6899a82 (patch) | |
| tree | 531af934a361aeca81d8f1eacf47036f56eafb1b /server/helpers | |
| parent | d17c7b4e8c52317bdc874917387b7a49f6cf8b01 (diff) | |
| download | PeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.gz PeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.zst PeerTube-c7cdac440970525d78d257a055899c26f6899a82.zip | |
Fix type conflict
Diffstat (limited to 'server/helpers')
| -rw-r--r-- | server/helpers/custom-validators/plugins.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/helpers/custom-validators/plugins.ts b/server/helpers/custom-validators/plugins.ts index f2d4efb32..60b29dc89 100644 --- a/server/helpers/custom-validators/plugins.ts +++ b/server/helpers/custom-validators/plugins.ts | |||
| @@ -2,7 +2,7 @@ import { exists, isArray, isSafePath } from './misc' | |||
| 2 | import validator from 'validator' | 2 | import validator from 'validator' |
| 3 | import { PluginType } from '../../../shared/models/plugins/plugin.type' | 3 | import { PluginType } from '../../../shared/models/plugins/plugin.type' |
| 4 | import { CONSTRAINTS_FIELDS } from '../../initializers/constants' | 4 | import { CONSTRAINTS_FIELDS } from '../../initializers/constants' |
| 5 | import { PluginPackageJson } from '../../../shared/models/plugins/plugin-package-json.model' | 5 | import { PluginPackageJSON } from '../../../shared/models/plugins/plugin-package-json.model' |
| 6 | import { isUrlValid } from './activitypub/misc' | 6 | import { isUrlValid } from './activitypub/misc' |
| 7 | 7 | ||
| 8 | const PLUGINS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.PLUGINS | 8 | const PLUGINS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.PLUGINS |
| @@ -84,7 +84,7 @@ function isThemeNameValid (name: string) { | |||
| 84 | return isPluginNameValid(name) | 84 | return isPluginNameValid(name) |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | function isPackageJSONValid (packageJSON: PluginPackageJson, pluginType: PluginType) { | 87 | function isPackageJSONValid (packageJSON: PluginPackageJSON, pluginType: PluginType) { |
| 88 | let result = true | 88 | let result = true |
| 89 | const badFields: string[] = [] | 89 | const badFields: string[] = [] |
| 90 | 90 | ||