From 846751c98b8704c09234688be6e7e23b837a3739 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 9 Apr 2019 08:18:59 +0200 Subject: [PATCH] Add newInstanceFollower in notification settings --- .../my-account-notification-preferences.component.ts | 6 ++++-- client/src/app/shared/users/user-notification.model.ts | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts index 67ddf54da..34febc457 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts @@ -42,14 +42,16 @@ export class MyAccountNotificationPreferencesComponent implements OnInit { myVideoImportFinished: this.i18n('Video import finished'), newUserRegistration: this.i18n('A new user registered on your instance'), newFollow: this.i18n('You or your channel(s) has a new follower'), - commentMention: this.i18n('Someone mentioned you in video comments') + commentMention: this.i18n('Someone mentioned you in video comments'), + newInstanceFollower: this.i18n('Your instance has a new follower') } this.notificationSettingKeys = Object.keys(this.labelNotifications) as (keyof UserNotificationSetting)[] this.rightNotifications = { videoAbuseAsModerator: UserRight.MANAGE_VIDEO_ABUSES, videoAutoBlacklistAsModerator: UserRight.MANAGE_VIDEO_BLACKLIST, - newUserRegistration: UserRight.MANAGE_USERS + newUserRegistration: UserRight.MANAGE_USERS, + newInstanceFollower: UserRight.MANAGE_SERVER_FOLLOW } this.emailEnabled = this.serverService.getConfig().email.enabled diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index 7d0eb5ea2..76b983152 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -1,4 +1,4 @@ -import { UserNotification as UserNotificationServer, UserNotificationType, VideoInfo, ActorInfo } from '../../../../../shared' +import { ActorInfo, FollowState, UserNotification as UserNotificationServer, UserNotificationType, VideoInfo } from '../../../../../shared' import { Actor } from '@app/shared/actor/actor.model' export class UserNotification implements UserNotificationServer { @@ -39,6 +39,7 @@ export class UserNotification implements UserNotificationServer { actorFollow?: { id: number + state: FollowState follower: ActorInfo & { avatarUrl?: string } following: { type: 'account' | 'channel' -- 2.25.1