aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-12-24 10:40:51 +0100
committerChocobozzz <me@florianbigard.com>2021-12-24 10:40:51 +0100
commitc7cdac440970525d78d257a055899c26f6899a82 (patch)
tree531af934a361aeca81d8f1eacf47036f56eafb1b /shared/models
parentd17c7b4e8c52317bdc874917387b7a49f6cf8b01 (diff)
downloadPeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.gz
PeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.zst
PeerTube-c7cdac440970525d78d257a055899c26f6899a82.zip
Fix type conflict
Diffstat (limited to 'shared/models')
-rw-r--r--shared/models/plugins/plugin-package-json.model.ts10
-rw-r--r--shared/models/server/server-config.model.ts4
2 files changed, 7 insertions, 7 deletions
diff --git a/shared/models/plugins/plugin-package-json.model.ts b/shared/models/plugins/plugin-package-json.model.ts
index b2f92af80..7ce968ff2 100644
--- a/shared/models/plugins/plugin-package-json.model.ts
+++ b/shared/models/plugins/plugin-package-json.model.ts
@@ -1,15 +1,15 @@
1import { PluginClientScope } from './client/plugin-client-scope.type' 1import { PluginClientScope } from './client/plugin-client-scope.type'
2 2
3export type PluginTranslationPaths = { 3export type PluginTranslationPathsJSON = {
4 [ locale: string ]: string 4 [ locale: string ]: string
5} 5}
6 6
7export type ClientScript = { 7export type ClientScriptJSON = {
8 script: string 8 script: string
9 scopes: PluginClientScope[] 9 scopes: PluginClientScope[]
10} 10}
11 11
12export type PluginPackageJson = { 12export type PluginPackageJSON = {
13 name: string 13 name: string
14 version: string 14 version: string
15 description: string 15 description: string
@@ -23,7 +23,7 @@ export type PluginPackageJson = {
23 staticDirs: { [ name: string ]: string } 23 staticDirs: { [ name: string ]: string }
24 css: string[] 24 css: string[]
25 25
26 clientScripts: ClientScript[] 26 clientScripts: ClientScriptJSON[]
27 27
28 translations: PluginTranslationPaths 28 translations: PluginTranslationPathsJSON
29} 29}
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 0e3b4a3d2..8c0e21621 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,5 +1,5 @@
1import { VideoPrivacy } from '../videos/video-privacy.enum' 1import { VideoPrivacy } from '../videos/video-privacy.enum'
2import { ClientScript } from '../plugins/plugin-package-json.model' 2import { ClientScriptJSON } from '../plugins/plugin-package-json.model'
3import { NSFWPolicyType } from '../videos/nsfw-policy.type' 3import { NSFWPolicyType } from '../videos/nsfw-policy.type'
4import { BroadcastMessageLevel } from './broadcast-message-level.type' 4import { BroadcastMessageLevel } from './broadcast-message-level.type'
5 5
@@ -7,7 +7,7 @@ export interface ServerConfigPlugin {
7 name: string 7 name: string
8 version: string 8 version: string
9 description: string 9 description: string
10 clientScripts: { [name: string]: ClientScript } 10 clientScripts: { [name: string]: ClientScriptJSON }
11} 11}
12 12
13export interface ServerConfigTheme extends ServerConfigPlugin { 13export interface ServerConfigTheme extends ServerConfigPlugin {