From: Chocobozzz <me@florianbigard.com>
Date: Thu, 27 Aug 2020 07:58:27 +0000 (+0200)
Subject: Don't use @shared in models
X-Git-Tag: v2.4.0~19
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0fecf427d349a416dad149ee5d0b5210b6a43005;hp=5520f6658e330391f6439d65ffdaf07b46cefa64;p=github%2FChocobozzz%2FPeerTube.git

Don't use @shared in models

So other projects can use them
---

diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts
index 711ce45f4..43e8ea067 100644
--- a/shared/models/activitypub/objects/common-objects.ts
+++ b/shared/models/activitypub/objects/common-objects.ts
@@ -1,4 +1,4 @@
-import { AbusePredefinedReasonsString } from '@shared/models'
+import { AbusePredefinedReasonsString } from '../../moderation/abuse/abuse-reason.model'
 
 export interface ActivityIdentifierObject {
   identifier: string
diff --git a/shared/models/moderation/abuse/abuse-message.model.ts b/shared/models/moderation/abuse/abuse-message.model.ts
index 642496646..9edd9daff 100644
--- a/shared/models/moderation/abuse/abuse-message.model.ts
+++ b/shared/models/moderation/abuse/abuse-message.model.ts
@@ -1,4 +1,4 @@
-import { AccountSummary } from '@shared/models'
+import { AccountSummary } from '../../actors/account.model'
 
 export interface AbuseMessage {
   id: number
diff --git a/shared/models/plugins/plugin-video-privacy-manager.model.ts b/shared/models/plugins/plugin-video-privacy-manager.model.ts
index c0e8117b5..3ada99608 100644
--- a/shared/models/plugins/plugin-video-privacy-manager.model.ts
+++ b/shared/models/plugins/plugin-video-privacy-manager.model.ts
@@ -1,4 +1,4 @@
-import { VideoPrivacy } from '@shared/models/videos/video-privacy.enum'
+import { VideoPrivacy } from '../videos/video-privacy.enum'
 
 export interface PluginVideoPrivacyManager {
   // PUBLIC = 1
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index 61010e5a8..c643e6017 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -1,6 +1,6 @@
-import { SendEmailOptions } from './emailer.model'
-import { VideoResolution } from '@shared/models'
 import { ContextType } from '../activitypub/context'
+import { VideoResolution } from '../videos/video-resolution.enum'
+import { SendEmailOptions } from './emailer.model'
 
 export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed'
 
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index 859736b2f..2c24d81be 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -4,7 +4,7 @@ import { UserRole } from './user-role'
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 import { UserNotificationSetting } from './user-notification-setting.model'
 import { UserAdminFlag } from './user-flag.model'
-import { VideoPlaylistType } from '@shared/models'
+import { VideoPlaylistType } from '../videos/playlist/video-playlist-type.model'
 
 export interface User {
   id: number
diff --git a/shared/models/videos/video-file.model.ts b/shared/models/videos/video-file.model.ts
index cbef05ac0..e9839229d 100644
--- a/shared/models/videos/video-file.model.ts
+++ b/shared/models/videos/video-file.model.ts
@@ -1,5 +1,6 @@
-
-import { VideoConstant, VideoFileMetadata, VideoResolution } from '@shared/models'
+import { VideoConstant } from './video-constant.model'
+import { VideoFileMetadata } from './video-file-metadata'
+import { VideoResolution } from './video-resolution.enum'
 
 export interface VideoFile {
   magnetUri: string
diff --git a/shared/models/videos/video-streaming-playlist.model.ts b/shared/models/videos/video-streaming-playlist.model.ts
index 42fce4bdc..a07d911dc 100644
--- a/shared/models/videos/video-streaming-playlist.model.ts
+++ b/shared/models/videos/video-streaming-playlist.model.ts
@@ -1,5 +1,5 @@
 import { VideoStreamingPlaylistType } from './video-streaming-playlist.type'
-import { VideoFile } from '@shared/models/videos/video-file.model'
+import { VideoFile } from './video-file.model'
 
 export class VideoStreamingPlaylist {
   id: number