From c7cdac440970525d78d257a055899c26f6899a82 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 24 Dec 2021 10:40:51 +0100
Subject: Fix type conflict

---
 shared/models/plugins/plugin-package-json.model.ts | 10 +++++-----
 shared/models/server/server-config.model.ts        |  4 ++--
 shared/server-commands/server/plugins-command.ts   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'shared')

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 @@
 import { PluginClientScope } from './client/plugin-client-scope.type'
 
-export type PluginTranslationPaths = {
+export type PluginTranslationPathsJSON = {
   [ locale: string ]: string
 }
 
-export type ClientScript = {
+export type ClientScriptJSON = {
   script: string
   scopes: PluginClientScope[]
 }
 
-export type PluginPackageJson = {
+export type PluginPackageJSON = {
   name: string
   version: string
   description: string
@@ -23,7 +23,7 @@ export type PluginPackageJson = {
   staticDirs: { [ name: string ]: string }
   css: string[]
 
-  clientScripts: ClientScript[]
+  clientScripts: ClientScriptJSON[]
 
-  translations: PluginTranslationPaths
+  translations: PluginTranslationPathsJSON
 }
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 @@
 import { VideoPrivacy } from '../videos/video-privacy.enum'
-import { ClientScript } from '../plugins/plugin-package-json.model'
+import { ClientScriptJSON } from '../plugins/plugin-package-json.model'
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 import { BroadcastMessageLevel } from './broadcast-message-level.type'
 
@@ -7,7 +7,7 @@ export interface ServerConfigPlugin {
   name: string
   version: string
   description: string
-  clientScripts: { [name: string]: ClientScript }
+  clientScripts: { [name: string]: ClientScriptJSON }
 }
 
 export interface ServerConfigTheme extends ServerConfigPlugin {
diff --git a/shared/server-commands/server/plugins-command.ts b/shared/server-commands/server/plugins-command.ts
index 1c44711da..bb1277a7c 100644
--- a/shared/server-commands/server/plugins-command.ts
+++ b/shared/server-commands/server/plugins-command.ts
@@ -8,7 +8,7 @@ import {
   PeerTubePlugin,
   PeerTubePluginIndex,
   PeertubePluginIndexList,
-  PluginPackageJson,
+  PluginPackageJSON,
   PluginTranslation,
   PluginType,
   PublicServerSetting,
@@ -245,7 +245,7 @@ export class PluginsCommand extends AbstractCommand {
     return writeJSON(path, json)
   }
 
-  getPackageJSON (npmName: string): Promise<PluginPackageJson> {
+  getPackageJSON (npmName: string): Promise<PluginPackageJSON> {
     const path = this.getPackageJSONPath(npmName)
 
     return readJSON(path)
-- 
cgit v1.2.3