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 711ce45f45b925a361198df304ae68350eae6533..43e8ea06720adb607c4207288d5d6d5020a8414a 100644 (file)
--- 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 642496646001a0aff6e9433a2c9b427b581f028d..9edd9daff7c9d2e470432162a9028aef00ac183e 100644 (file)
--- 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 c0e8117b5211ab3097ce90a5f86e4d470708d5b4..3ada99608ccd0fb2a45f2e1a00b6e7aec7385c3a 100644 (file)
--- 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 61010e5a8682e8762f57d63527f7dc9978817ad7..c643e60179832ebd2bd7c8755b9b36cdd0883fa2 100644 (file)
--- 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 859736b2fbf04bf7a51a8f15f40f0f7f991bffab..2c24d81be5a1e9d19cc43893c8ed376af468edfb 100644 (file)
--- 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 cbef05ac07634ae02a586c156e0a971c8c03cedc..e9839229d2d461f7870db89bebddc54f17942116 100644 (file)
--- 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 42fce4bdcfb4d848bfc5f79bab09f683cbe0bc41..a07d911dcb5177a604213c924de62886b8b86b01 100644 (file)
--- 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