diff options
author | Chocobozzz <me@florianbigard.com> | 2020-08-27 09:58:27 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-08-27 09:58:27 +0200 |
commit | 0fecf427d349a416dad149ee5d0b5210b6a43005 (patch) | |
tree | 8698f4c86a908f5f7465db0d36ba610a70773a0a | |
parent | 5520f6658e330391f6439d65ffdaf07b46cefa64 (diff) | |
download | PeerTube-0fecf427d349a416dad149ee5d0b5210b6a43005.tar.gz PeerTube-0fecf427d349a416dad149ee5d0b5210b6a43005.tar.zst PeerTube-0fecf427d349a416dad149ee5d0b5210b6a43005.zip |
Don't use @shared in models
So other projects can use them
-rw-r--r-- | shared/models/activitypub/objects/common-objects.ts | 2 | ||||
-rw-r--r-- | shared/models/moderation/abuse/abuse-message.model.ts | 2 | ||||
-rw-r--r-- | shared/models/plugins/plugin-video-privacy-manager.model.ts | 2 | ||||
-rw-r--r-- | shared/models/server/job.model.ts | 4 | ||||
-rw-r--r-- | shared/models/users/user.model.ts | 2 | ||||
-rw-r--r-- | shared/models/videos/video-file.model.ts | 5 | ||||
-rw-r--r-- | shared/models/videos/video-streaming-playlist.model.ts | 2 |
7 files changed, 10 insertions, 9 deletions
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 @@ | |||
1 | import { AbusePredefinedReasonsString } from '@shared/models' | 1 | import { AbusePredefinedReasonsString } from '../../moderation/abuse/abuse-reason.model' |
2 | 2 | ||
3 | export interface ActivityIdentifierObject { | 3 | export interface ActivityIdentifierObject { |
4 | identifier: string | 4 | 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 @@ | |||
1 | import { AccountSummary } from '@shared/models' | 1 | import { AccountSummary } from '../../actors/account.model' |
2 | 2 | ||
3 | export interface AbuseMessage { | 3 | export interface AbuseMessage { |
4 | id: number | 4 | 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 @@ | |||
1 | import { VideoPrivacy } from '@shared/models/videos/video-privacy.enum' | 1 | import { VideoPrivacy } from '../videos/video-privacy.enum' |
2 | 2 | ||
3 | export interface PluginVideoPrivacyManager { | 3 | export interface PluginVideoPrivacyManager { |
4 | // PUBLIC = 1 | 4 | // 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 @@ | |||
1 | import { SendEmailOptions } from './emailer.model' | ||
2 | import { VideoResolution } from '@shared/models' | ||
3 | import { ContextType } from '../activitypub/context' | 1 | import { ContextType } from '../activitypub/context' |
2 | import { VideoResolution } from '../videos/video-resolution.enum' | ||
3 | import { SendEmailOptions } from './emailer.model' | ||
4 | 4 | ||
5 | export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' | 5 | export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' |
6 | 6 | ||
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' | |||
4 | import { NSFWPolicyType } from '../videos/nsfw-policy.type' | 4 | import { NSFWPolicyType } from '../videos/nsfw-policy.type' |
5 | import { UserNotificationSetting } from './user-notification-setting.model' | 5 | import { UserNotificationSetting } from './user-notification-setting.model' |
6 | import { UserAdminFlag } from './user-flag.model' | 6 | import { UserAdminFlag } from './user-flag.model' |
7 | import { VideoPlaylistType } from '@shared/models' | 7 | import { VideoPlaylistType } from '../videos/playlist/video-playlist-type.model' |
8 | 8 | ||
9 | export interface User { | 9 | export interface User { |
10 | id: number | 10 | 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 @@ | |||
1 | 1 | import { VideoConstant } from './video-constant.model' | |
2 | import { VideoConstant, VideoFileMetadata, VideoResolution } from '@shared/models' | 2 | import { VideoFileMetadata } from './video-file-metadata' |
3 | import { VideoResolution } from './video-resolution.enum' | ||
3 | 4 | ||
4 | export interface VideoFile { | 5 | export interface VideoFile { |
5 | magnetUri: string | 6 | 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 @@ | |||
1 | import { VideoStreamingPlaylistType } from './video-streaming-playlist.type' | 1 | import { VideoStreamingPlaylistType } from './video-streaming-playlist.type' |
2 | import { VideoFile } from '@shared/models/videos/video-file.model' | 2 | import { VideoFile } from './video-file.model' |
3 | 3 | ||
4 | export class VideoStreamingPlaylist { | 4 | export class VideoStreamingPlaylist { |
5 | id: number | 5 | id: number |