diff options
Diffstat (limited to 'shared/models')
-rw-r--r-- | shared/models/users/user-flag.model.ts | 2 | ||||
-rw-r--r-- | shared/models/users/user-notification.model.ts | 6 | ||||
-rw-r--r-- | shared/models/users/user-right.enum.ts | 2 | ||||
-rw-r--r-- | shared/models/users/user-role.ts | 2 | ||||
-rw-r--r-- | shared/models/videos/blacklist/video-blacklist.model.ts | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/shared/models/users/user-flag.model.ts b/shared/models/users/user-flag.model.ts index e8b5a5c50..b94262d5e 100644 --- a/shared/models/users/user-flag.model.ts +++ b/shared/models/users/user-flag.model.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | export enum UserAdminFlag { | 1 | export enum UserAdminFlag { |
2 | NONE = 0, | 2 | NONE = 0, |
3 | BYPASS_VIDEO_AUTO_BLOCK = 1 << 0 | 3 | BYPASS_VIDEO_AUTO_BLACKLIST = 1 << 0 |
4 | } | 4 | } |
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts index 2329503a8..e9be1ca7f 100644 --- a/shared/models/users/user-notification.model.ts +++ b/shared/models/users/user-notification.model.ts | |||
@@ -5,8 +5,8 @@ export enum UserNotificationType { | |||
5 | NEW_COMMENT_ON_MY_VIDEO = 2, | 5 | NEW_COMMENT_ON_MY_VIDEO = 2, |
6 | NEW_VIDEO_ABUSE_FOR_MODERATORS = 3, | 6 | NEW_VIDEO_ABUSE_FOR_MODERATORS = 3, |
7 | 7 | ||
8 | BLOCK_ON_MY_VIDEO = 4, | 8 | BLACKLIST_ON_MY_VIDEO = 4, |
9 | UNBLOCK_ON_MY_VIDEO = 5, | 9 | UNBLACKLIST_ON_MY_VIDEO = 5, |
10 | 10 | ||
11 | MY_VIDEO_PUBLISHED = 6, | 11 | MY_VIDEO_PUBLISHED = 6, |
12 | 12 | ||
@@ -17,7 +17,7 @@ export enum UserNotificationType { | |||
17 | NEW_FOLLOW = 10, | 17 | NEW_FOLLOW = 10, |
18 | COMMENT_MENTION = 11, | 18 | COMMENT_MENTION = 11, |
19 | 19 | ||
20 | VIDEO_AUTO_BLOCK_FOR_MODERATORS = 12, | 20 | VIDEO_AUTO_BLACKLIST_FOR_MODERATORS = 12, |
21 | 21 | ||
22 | NEW_INSTANCE_FOLLOWER = 13, | 22 | NEW_INSTANCE_FOLLOWER = 13, |
23 | 23 | ||
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts index 3fb760709..2f88a65de 100644 --- a/shared/models/users/user-right.enum.ts +++ b/shared/models/users/user-right.enum.ts | |||
@@ -20,7 +20,7 @@ export enum UserRight { | |||
20 | MANAGE_ACCOUNTS_BLOCKLIST, | 20 | MANAGE_ACCOUNTS_BLOCKLIST, |
21 | MANAGE_SERVERS_BLOCKLIST, | 21 | MANAGE_SERVERS_BLOCKLIST, |
22 | 22 | ||
23 | MANAGE_VIDEO_BLOCKS, | 23 | MANAGE_VIDEO_BLACKLIST, |
24 | 24 | ||
25 | REMOVE_ANY_VIDEO, | 25 | REMOVE_ANY_VIDEO, |
26 | REMOVE_ANY_VIDEO_CHANNEL, | 26 | REMOVE_ANY_VIDEO_CHANNEL, |
diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts index 30ec5edce..2b08b5850 100644 --- a/shared/models/users/user-role.ts +++ b/shared/models/users/user-role.ts | |||
@@ -19,7 +19,7 @@ const userRoleRights: { [ id in UserRole ]: UserRight[] } = { | |||
19 | ], | 19 | ], |
20 | 20 | ||
21 | [UserRole.MODERATOR]: [ | 21 | [UserRole.MODERATOR]: [ |
22 | UserRight.MANAGE_VIDEO_BLOCKS, | 22 | UserRight.MANAGE_VIDEO_BLACKLIST, |
23 | UserRight.MANAGE_VIDEO_ABUSES, | 23 | UserRight.MANAGE_VIDEO_ABUSES, |
24 | UserRight.REMOVE_ANY_VIDEO, | 24 | UserRight.REMOVE_ANY_VIDEO, |
25 | UserRight.REMOVE_ANY_VIDEO_CHANNEL, | 25 | UserRight.REMOVE_ANY_VIDEO_CHANNEL, |
diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts index e6090b1e9..a6e0ef175 100644 --- a/shared/models/videos/blacklist/video-blacklist.model.ts +++ b/shared/models/videos/blacklist/video-blacklist.model.ts | |||
@@ -1,15 +1,15 @@ | |||
1 | import { Video } from '../video.model' | 1 | import { Video } from '../video.model' |
2 | 2 | ||
3 | export enum VideoBlockType { | 3 | export enum VideoBlacklistType { |
4 | MANUAL = 1, | 4 | MANUAL = 1, |
5 | AUTO_BEFORE_PUBLISHED = 2 | 5 | AUTO_BEFORE_PUBLISHED = 2 |
6 | } | 6 | } |
7 | 7 | ||
8 | export interface VideoBlocklist { | 8 | export interface VideoBlacklist { |
9 | id: number | 9 | id: number |
10 | unfederated: boolean | 10 | unfederated: boolean |
11 | reason?: string | 11 | reason?: string |
12 | type: VideoBlockType | 12 | type: VideoBlacklistType |
13 | 13 | ||
14 | video: Video | 14 | video: Video |
15 | 15 | ||