Reorganize shared models

4 files changed, 3 insertions, 39 deletions

diff --git a/shared/models/users/user-flag.model.ts b/shared/models/users/user-flag.model.ts
index b94262d5e..b791a1263 100644
--- a/shared/models/users/user-flag.model.ts
+++ b/shared/models/users/user-flag.model.ts
@@ -1,4 +1,4 @@
-export enum UserAdminFlag {
+export const enum UserAdminFlag {
   NONE = 0,
   BYPASS_VIDEO_AUTO_BLACKLIST = 1 << 0
 }
diff --git a/shared/models/users/user-notification-setting.model.ts b/shared/models/users/user-notification-setting.model.ts
index c7590fa8a..473148062 100644
--- a/shared/models/users/user-notification-setting.model.ts
+++ b/shared/models/users/user-notification-setting.model.ts
@@ -1,4 +1,4 @@
-export enum UserNotificationSettingValue {
+export const enum UserNotificationSettingValue {
   NONE = 0,
   WEB = 1 << 0,
   EMAIL = 1 << 1
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts
index 4a7ae4373..4c3d9e7c8 100644
--- a/shared/models/users/user-right.enum.ts
+++ b/shared/models/users/user-right.enum.ts
@@ -1,4 +1,4 @@
-export enum UserRight {
+export const enum UserRight {
   ALL,
 
   MANAGE_USERS,
diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts
index 772988c0c..94413abca 100644
--- a/shared/models/users/user-role.ts
+++ b/shared/models/users/user-role.ts
@@ -1,42 +1,6 @@
-import { UserRight } from './user-right.enum'
-
 // Keep the order
 export enum UserRole {
   ADMINISTRATOR = 0,
   MODERATOR = 1,
   USER = 2
 }
-
-export const USER_ROLE_LABELS: { [ id in UserRole ]: string } = {
-  [UserRole.USER]: 'User',
-  [UserRole.MODERATOR]: 'Moderator',
-  [UserRole.ADMINISTRATOR]: 'Administrator'
-}
-
-const userRoleRights: { [ id in UserRole ]: UserRight[] } = {
-  [UserRole.ADMINISTRATOR]: [
-    UserRight.ALL
-  ],
-
-  [UserRole.MODERATOR]: [
-    UserRight.MANAGE_VIDEO_BLACKLIST,
-    UserRight.MANAGE_ABUSES,
-    UserRight.REMOVE_ANY_VIDEO,
-    UserRight.REMOVE_ANY_VIDEO_CHANNEL,
-    UserRight.REMOVE_ANY_VIDEO_PLAYLIST,
-    UserRight.REMOVE_ANY_VIDEO_COMMENT,
-    UserRight.UPDATE_ANY_VIDEO,
-    UserRight.SEE_ALL_VIDEOS,
-    UserRight.MANAGE_ACCOUNTS_BLOCKLIST,
-    UserRight.MANAGE_SERVERS_BLOCKLIST,
-    UserRight.MANAGE_USERS
-  ],
-
-  [UserRole.USER]: []
-}
-
-export function hasUserRight (userRole: UserRole, userRight: UserRight) {
-  const userRights = userRoleRights[userRole]
-
-  return userRights.includes(UserRight.ALL) || userRights.includes(userRight)
-}