2 files changed, 18 insertions, 5 deletions

diff --git a/shared/models/users/user-notification-setting.model.ts b/shared/models/users/user-notification-setting.model.ts
index 4e2230a76..c7590fa8a 100644
--- a/shared/models/users/user-notification-setting.model.ts
+++ b/shared/models/users/user-notification-setting.model.ts
@@ -5,16 +5,23 @@ export enum UserNotificationSettingValue {
 }
 
 export interface UserNotificationSetting {
-  newVideoFromSubscription: UserNotificationSettingValue
-  newCommentOnMyVideo: UserNotificationSettingValue
   abuseAsModerator: UserNotificationSettingValue
   videoAutoBlacklistAsModerator: UserNotificationSettingValue
+  newUserRegistration: UserNotificationSettingValue
+
+  newVideoFromSubscription: UserNotificationSettingValue
+
   blacklistOnMyVideo: UserNotificationSettingValue
   myVideoPublished: UserNotificationSettingValue
   myVideoImportFinished: UserNotificationSettingValue
-  newUserRegistration: UserNotificationSettingValue
-  newFollow: UserNotificationSettingValue
+
   commentMention: UserNotificationSettingValue
+  newCommentOnMyVideo: UserNotificationSettingValue
+
+  newFollow: UserNotificationSettingValue
   newInstanceFollower: UserNotificationSettingValue
   autoInstanceFollowing: UserNotificationSettingValue
+
+  abuseStateChange: UserNotificationSettingValue
+  abuseNewMessage: UserNotificationSettingValue
 }
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
index 5f7c33976..e2f2234e4 100644
--- a/shared/models/users/user-notification.model.ts
+++ b/shared/models/users/user-notification.model.ts
@@ -1,4 +1,5 @@
 import { FollowState } from '../actors'
+import { AbuseState } from '../moderation'
 
 export enum UserNotificationType {
   NEW_VIDEO_FROM_SUBSCRIPTION = 1,
@@ -21,7 +22,11 @@ export enum UserNotificationType {
 
   NEW_INSTANCE_FOLLOWER = 13,
 
-  AUTO_INSTANCE_FOLLOWING = 14
+  AUTO_INSTANCE_FOLLOWING = 14,
+
+  ABUSE_STATE_CHANGE = 15,
+
+  ABUSE_NEW_MESSAGE = 16
 }
 
 export interface VideoInfo {
@@ -66,6 +71,7 @@ export interface UserNotification {
 
   abuse?: {
     id: number
+    state: AbuseState
 
     video?: VideoInfo