17 files changed, 58 insertions, 44 deletions

diff --git a/client/src/app/core/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts
index 226075265..a1e23bfbb 100644
--- a/client/src/app/core/auth/auth-user.model.ts
+++ b/client/src/app/core/auth/auth-user.model.ts
@@ -1,16 +1,16 @@
 import { Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { User } from '@app/core/users/user.model'
-import { OAuthUserTokens } from '@root-helpers/users'
-import { hasUserRight } from '@shared/core-utils/users'
+import { hasUserRight } from '@peertube/peertube-core-utils'
 import {
   MyUser as ServerMyUserModel,
   MyUserSpecialPlaylist,
   User as ServerUserModel,
-  UserRight,
+  UserRightType,
   UserRole,
   UserVideoQuota
-} from '@shared/models'
+} from '@peertube/peertube-models'
+import { OAuthUserTokens } from '@root-helpers/users'
 
 export class AuthUser extends User implements ServerMyUserModel {
   oauthTokens: OAuthUserTokens
@@ -42,7 +42,7 @@ export class AuthUser extends User implements ServerMyUserModel {
     this.oauthTokens.refreshToken = refreshToken
   }
 
-  hasRight (right: UserRight) {
+  hasRight (right: UserRightType) {
     return hasUserRight(this.role.id, right)
   }
 
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index 6fe601d8d..bc67ab7a0 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -6,7 +6,7 @@ import { Injectable } from '@angular/core'
 import { Router } from '@angular/router'
 import { Notifier } from '@app/core/notification/notifier.service'
 import { logger, OAuthUserTokens, objectToUrlEncoded, peertubeLocalStorage } from '@root-helpers/index'
-import { HttpStatusCode, MyUser as UserServerModel, OAuthClientLocal, User, UserLogin, UserRefreshToken } from '@shared/models'
+import { HttpStatusCode, MyUser as UserServerModel, OAuthClientLocal, User, UserLogin, UserRefreshToken } from '@peertube/peertube-models'
 import { environment } from '../../../environments/environment'
 import { RestExtractor } from '../rest/rest-extractor.service'
 import { RedirectService } from '../routing'
diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts
index d865c7da2..39e89f6e3 100644
--- a/client/src/app/core/menu/menu.service.ts
+++ b/client/src/app/core/menu/menu.service.ts
@@ -2,7 +2,7 @@ import { fromEvent } from 'rxjs'
 import { debounceTime } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { GlobalIconName } from '@app/shared/shared-icons'
-import { HTMLServerConfig } from '@shared/models/server'
+import { HTMLServerConfig } from '@peertube/peertube-models'
 import { ScreenService } from '../wrappers'
 
 export type MenuLink = {
diff --git a/client/src/app/core/notification/peertube-socket.service.ts b/client/src/app/core/notification/peertube-socket.service.ts
index 50a11e948..15af9a310 100644
--- a/client/src/app/core/notification/peertube-socket.service.ts
+++ b/client/src/app/core/notification/peertube-socket.service.ts
@@ -1,7 +1,7 @@
 import { Subject } from 'rxjs'
 import { ManagerOptions, Socket, SocketOptions } from 'socket.io-client'
 import { Injectable } from '@angular/core'
-import { LiveVideoEventPayload, LiveVideoEventType, UserNotification as UserNotificationServer } from '@shared/models'
+import { LiveVideoEventPayload, LiveVideoEventType, UserNotification as UserNotificationServer } from '@peertube/peertube-models'
 import { environment } from '../../../environments/environment'
 import { AuthService } from '../auth'
 
diff --git a/client/src/app/core/plugins/hooks.service.ts b/client/src/app/core/plugins/hooks.service.ts
index d9fef8389..59c627c05 100644
--- a/client/src/app/core/plugins/hooks.service.ts
+++ b/client/src/app/core/plugins/hooks.service.ts
@@ -3,7 +3,7 @@ import { mergeMap, switchMap } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { PluginService } from '@app/core/plugins/plugin.service'
 import { logger } from '@root-helpers/logger'
-import { ClientActionHookName, ClientFilterHookName, PluginClientScope } from '@shared/models'
+import { ClientActionHookName, ClientFilterHookName, PluginClientScope } from '@peertube/peertube-models'
 import { AuthService, AuthStatus } from '../auth'
 
 type RawFunction<U, T> = (params: U) => T
diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts
index bd8c61d9a..d37b2e5f7 100644
--- a/client/src/app/core/plugins/plugin.service.ts
+++ b/client/src/app/core/plugins/plugin.service.ts
@@ -10,22 +10,22 @@ import { RestExtractor } from '@app/core/rest'
 import { ServerService } from '@app/core/server/server.service'
 import { getDevLocale, isOnDevLocale } from '@app/helpers'
 import { CustomModalComponent } from '@app/modal/custom-modal.component'
-import { PluginInfo, PluginsManager } from '@root-helpers/plugins-manager'
-import { getKeys } from '@shared/core-utils'
-import { getCompleteLocale, isDefaultLocale, peertubeTranslate } from '@shared/core-utils/i18n'
+import { getCompleteLocale, getKeys, isDefaultLocale, peertubeTranslate } from '@peertube/peertube-core-utils'
 import {
   ClientHook,
   ClientHookName,
   PluginClientScope,
   PluginTranslation,
   PluginType,
+  PluginType_Type,
   PublicServerSetting,
   RegisterClientFormFieldOptions,
   RegisterClientRouteOptions,
   RegisterClientSettingsScriptOptions,
   RegisterClientVideoFieldOptions,
   ServerConfigPlugin
-} from '@shared/models'
+} from '@peertube/peertube-models'
+import { PluginInfo, PluginsManager } from '@root-helpers/plugins-manager'
 import { environment } from '../../../environments/environment'
 import { RegisterClientHelpers } from '../../../types/register-client-option.model'
 
@@ -110,7 +110,7 @@ export class PluginService implements ClientHook {
     return this.pluginsManager.removePlugin(plugin)
   }
 
-  nameToNpmName (name: string, type: PluginType) {
+  nameToNpmName (name: string, type: PluginType_Type) {
     const prefix = type === PluginType.PLUGIN
       ? 'peertube-plugin-'
       : 'peertube-theme-'
diff --git a/client/src/app/core/renderer/html-renderer.service.ts b/client/src/app/core/renderer/html-renderer.service.ts
index 7776ccad5..37741c079 100644
--- a/client/src/app/core/renderer/html-renderer.service.ts
+++ b/client/src/app/core/renderer/html-renderer.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { getCustomMarkupSanitizeOptions, getDefaultSanitizeOptions } from '@shared/core-utils/renderer/html'
+import { getCustomMarkupSanitizeOptions, getDefaultSanitizeOptions } from '@peertube/peertube-core-utils'
 import { LinkifierService } from './linkifier.service'
 
 @Injectable()
diff --git a/client/src/app/core/renderer/markdown.service.ts b/client/src/app/core/renderer/markdown.service.ts
index ec3b683bb..907b92232 100644
--- a/client/src/app/core/renderer/markdown.service.ts
+++ b/client/src/app/core/renderer/markdown.service.ts
@@ -1,13 +1,14 @@
 import * as MarkdownIt from 'markdown-it'
 import { Injectable } from '@angular/core'
-import { buildVideoLink, decorateVideoLink } from '@shared/core-utils'
 import {
+  buildVideoLink,
   COMPLETE_RULES,
+  decorateVideoLink,
   ENHANCED_RULES,
   ENHANCED_WITH_HTML_RULES,
   TEXT_RULES,
   TEXT_WITH_HTML_RULES
-} from '@shared/core-utils/renderer/markdown'
+} from '@peertube/peertube-core-utils'
 import { HtmlRendererService } from './html-renderer.service'
 
 type MarkdownParsers = {
diff --git a/client/src/app/core/rest/rest-extractor.service.ts b/client/src/app/core/rest/rest-extractor.service.ts
index c6c1e183f..bcc50c0f4 100644
--- a/client/src/app/core/rest/rest-extractor.service.ts
+++ b/client/src/app/core/rest/rest-extractor.service.ts
@@ -1,10 +1,10 @@
 import { throwError as observableThrowError } from 'rxjs'
+import { HttpHeaderResponse } from '@angular/common/http'
 import { Inject, Injectable, LOCALE_ID } from '@angular/core'
 import { Router } from '@angular/router'
 import { DateFormat, dateToHuman } from '@app/helpers'
+import { HttpStatusCode, HttpStatusCodeType, ResultList } from '@peertube/peertube-models'
 import { logger } from '@root-helpers/logger'
-import { HttpStatusCode, ResultList } from '@shared/models'
-import { HttpHeaderResponse } from '@angular/common/http'
 
 @Injectable()
 export class RestExtractor {
@@ -45,7 +45,11 @@ export class RestExtractor {
     return target
   }
 
-  redirectTo404IfNotFound (obj: { status: number }, type: 'video' | 'other', status = [ HttpStatusCode.NOT_FOUND_404 ]) {
+  redirectTo404IfNotFound (
+    obj: { status: HttpStatusCodeType },
+    type: 'video' | 'other',
+    status: HttpStatusCodeType[] = [ HttpStatusCode.NOT_FOUND_404 ]
+  ) {
     if (obj?.status && status.includes(obj.status)) {
       // Do not use redirectService to avoid circular dependencies
       this.router.navigate([ '/404' ], { state: { type, obj }, skipLocationChange: true })
diff --git a/client/src/app/core/routing/homepage-redirect.component.ts b/client/src/app/core/routing/homepage-redirect.component.ts
index 9e3848038..e9be832e0 100644
--- a/client/src/app/core/routing/homepage-redirect.component.ts
+++ b/client/src/app/core/routing/homepage-redirect.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { is18nPath } from '@shared/core-utils/i18n/i18n'
+import { is18nPath } from '@peertube/peertube-core-utils'
 import { RedirectService } from './redirect.service'
 
 /*
diff --git a/client/src/app/core/routing/meta.service.ts b/client/src/app/core/routing/meta.service.ts
index 97e440faf..d50f0d65a 100644
--- a/client/src/app/core/routing/meta.service.ts
+++ b/client/src/app/core/routing/meta.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core'
 import { Meta, Title } from '@angular/platform-browser'
-import { HTMLServerConfig } from '@shared/models/server'
+import { HTMLServerConfig } from '@peertube/peertube-models'
 import { ServerService } from '../server'
 
 export interface MetaSettings {
diff --git a/client/src/app/core/scoped-tokens/scoped-tokens.service.ts b/client/src/app/core/scoped-tokens/scoped-tokens.service.ts
index 038e5031c..f7d192feb 100644
--- a/client/src/app/core/scoped-tokens/scoped-tokens.service.ts
+++ b/client/src/app/core/scoped-tokens/scoped-tokens.service.ts
@@ -1,7 +1,7 @@
 import { catchError } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { ScopedToken } from '@shared/models/users/user-scoped-token'
+import { ScopedToken } from '@peertube/peertube-models'
 import { environment } from '../../../environments/environment'
 import { RestExtractor } from '../rest'
 
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 41cb4791a..75ac8ddc1 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -3,9 +3,16 @@ import { first, map, share, shareReplay, switchMap, tap } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
 import { Inject, Injectable, LOCALE_ID } from '@angular/core'
 import { getDevLocale, isOnDevLocale } from '@app/helpers'
+import { getCompleteLocale, isDefaultLocale, peertubeTranslate } from '@peertube/peertube-core-utils'
+import {
+  HTMLServerConfig,
+  ServerConfig,
+  ServerStats,
+  VideoConstant,
+  VideoPlaylistPrivacyType,
+  VideoPrivacyType
+} from '@peertube/peertube-models'
 import { logger } from '@root-helpers/logger'
-import { getCompleteLocale, isDefaultLocale, peertubeTranslate } from '@shared/core-utils/i18n'
-import { HTMLServerConfig, ServerConfig, ServerStats, VideoConstant } from '@shared/models'
 import { environment } from '../../../environments/environment'
 
 @Injectable()
@@ -21,8 +28,8 @@ export class ServerService {
   private localeObservable: Observable<any>
   private videoLicensesObservable: Observable<VideoConstant<number>[]>
   private videoCategoriesObservable: Observable<VideoConstant<number>[]>
-  private videoPrivaciesObservable: Observable<VideoConstant<number>[]>
-  private videoPlaylistPrivaciesObservable: Observable<VideoConstant<number>[]>
+  private videoPrivaciesObservable: Observable<VideoConstant<VideoPrivacyType>[]>
+  private videoPlaylistPrivaciesObservable: Observable<VideoConstant<VideoPlaylistPrivacyType>[]>
   private videoLanguagesObservable: Observable<VideoConstant<string>[]>
   private configObservable: Observable<ServerConfig>
 
@@ -123,7 +130,7 @@ export class ServerService {
 
   getVideoPrivacies () {
     if (!this.videoPrivaciesObservable) {
-      this.videoPrivaciesObservable = this.loadAttributeEnum<number>(ServerService.BASE_VIDEO_URL, 'privacies')
+      this.videoPrivaciesObservable = this.loadAttributeEnum<VideoPrivacyType>(ServerService.BASE_VIDEO_URL, 'privacies')
     }
 
     return this.videoPrivaciesObservable.pipe(first())
@@ -131,7 +138,10 @@ export class ServerService {
 
   getVideoPlaylistPrivacies () {
     if (!this.videoPlaylistPrivaciesObservable) {
-      this.videoPlaylistPrivaciesObservable = this.loadAttributeEnum<number>(ServerService.BASE_VIDEO_PLAYLIST_URL, 'privacies')
+      this.videoPlaylistPrivaciesObservable = this.loadAttributeEnum<VideoPlaylistPrivacyType>(
+        ServerService.BASE_VIDEO_PLAYLIST_URL,
+        'privacies'
+      )
     }
 
     return this.videoPlaylistPrivaciesObservable.pipe(first())
diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts
index ead1770ba..22eb5ddd3 100644
--- a/client/src/app/core/theme/theme.service.ts
+++ b/client/src/app/core/theme/theme.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { logger } from '@root-helpers/logger'
 import { capitalizeFirstLetter } from '@root-helpers/string'
 import { UserLocalStorageKeys } from '@root-helpers/users'
-import { HTMLServerConfig, ServerConfigTheme } from '@shared/models'
+import { HTMLServerConfig, ServerConfigTheme } from '@peertube/peertube-models'
 import { environment } from '../../../environments/environment'
 import { AuthService } from '../auth'
 import { PluginService } from '../plugins/plugin.service'
diff --git a/client/src/app/core/users/user-local-storage.service.ts b/client/src/app/core/users/user-local-storage.service.ts
index a87f3b98a..431a57343 100644
--- a/client/src/app/core/users/user-local-storage.service.ts
+++ b/client/src/app/core/users/user-local-storage.service.ts
@@ -1,13 +1,11 @@
-
 import { filter, throttleTime } from 'rxjs'
 import { Injectable } from '@angular/core'
 import { AuthService, AuthStatus } from '@app/core/auth'
+import { objectKeysTyped } from '@peertube/peertube-core-utils'
+import { NSFWPolicyType, UserRoleType, UserUpdateMe } from '@peertube/peertube-models'
 import { getBoolOrDefault } from '@root-helpers/local-storage-utils'
 import { logger } from '@root-helpers/logger'
 import { OAuthUserTokens, UserLocalStorageKeys } from '@root-helpers/users'
-import { objectKeysTyped } from '@shared/core-utils'
-import { UserRole, UserUpdateMe } from '@shared/models'
-import { NSFWPolicyType } from '@shared/models/videos'
 import { ServerService } from '../server'
 import { LocalStorageService } from '../wrappers/storage.service'
 
@@ -61,7 +59,7 @@ export class UserLocalStorageService {
       username: this.localStorageService.getItem(UserLocalStorageKeys.USERNAME),
       email: this.localStorageService.getItem(UserLocalStorageKeys.EMAIL),
       role: {
-        id: parseInt(this.localStorageService.getItem(UserLocalStorageKeys.ROLE), 10) as UserRole,
+        id: parseInt(this.localStorageService.getItem(UserLocalStorageKeys.ROLE), 10) as UserRoleType,
         label: ''
       },
 
@@ -74,7 +72,7 @@ export class UserLocalStorageService {
     username: string
     email: string
     role: {
-      id: UserRole
+      id: UserRoleType
     }
   }) {
     this.localStorageService.setItem(UserLocalStorageKeys.ID, user.id.toString())
diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts
index 54b749a4c..ffc7c2b44 100644
--- a/client/src/app/core/users/user.model.ts
+++ b/client/src/app/core/users/user.model.ts
@@ -1,17 +1,18 @@
 import { Account } from '@app/shared/shared-main/account/account.model'
-import { objectKeysTyped } from '@shared/core-utils'
-import { hasUserRight } from '@shared/core-utils/users'
+import { hasUserRight, objectKeysTyped } from '@peertube/peertube-core-utils'
 import {
   ActorImage,
   HTMLServerConfig,
   NSFWPolicyType,
   User as UserServerModel,
   UserAdminFlag,
+  UserAdminFlagType,
   UserNotificationSetting,
-  UserRight,
+  UserRightType,
   UserRole,
+  UserRoleType,
   VideoChannel
-} from '@shared/models'
+} from '@peertube/peertube-models'
 
 export class User implements UserServerModel {
   id: number
@@ -23,7 +24,7 @@ export class User implements UserServerModel {
   emailPublic: boolean
   nsfwPolicy: NSFWPolicyType
 
-  adminFlags?: UserAdminFlag
+  adminFlags?: UserAdminFlagType
 
   autoPlayVideo: boolean
   autoPlayNextVideo: boolean
@@ -35,7 +36,7 @@ export class User implements UserServerModel {
   videoLanguages: string[]
 
   role: {
-    id: UserRole
+    id: UserRoleType
     label: string
   }
 
@@ -124,7 +125,7 @@ export class User implements UserServerModel {
     }
   }
 
-  hasRight (right: UserRight) {
+  hasRight (right: UserRightType) {
     return hasUserRight(this.role.id, right)
   }
 
diff --git a/client/src/app/core/users/user.service.ts b/client/src/app/core/users/user.service.ts
index b4024c02d..7ad0ee9bf 100644
--- a/client/src/app/core/users/user.service.ts
+++ b/client/src/app/core/users/user.service.ts
@@ -3,7 +3,7 @@ import { catchError, first, map, shareReplay } from 'rxjs/operators'
 import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { AuthService } from '@app/core/auth'
-import { ActorImage, User as UserServerModel, UserUpdateMe, UserVideoQuota } from '@shared/models'
+import { ActorImage, User as UserServerModel, UserUpdateMe, UserVideoQuota } from '@peertube/peertube-models'
 import { environment } from '../../../environments/environment'
 import { RestExtractor } from '../rest'
 import { UserLocalStorageService } from './user-local-storage.service'