From 2f1548fda32c3ba9e53913270394eedfacd55986 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 8 Jan 2019 11:26:41 +0100 Subject: Add notifications in the client --- server/lib/notifier.ts | 4 ++-- server/lib/user.ts | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'server/lib') diff --git a/server/lib/notifier.ts b/server/lib/notifier.ts index 2c51d7101..d1b331346 100644 --- a/server/lib/notifier.ts +++ b/server/lib/notifier.ts @@ -436,11 +436,11 @@ class Notifier { private isEmailEnabled (user: UserModel, value: UserNotificationSettingValue) { if (CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION === true && user.emailVerified !== true) return false - return value === UserNotificationSettingValue.EMAIL || value === UserNotificationSettingValue.WEB_NOTIFICATION_AND_EMAIL + return value & UserNotificationSettingValue.EMAIL } private isWebNotificationEnabled (value: UserNotificationSettingValue) { - return value === UserNotificationSettingValue.WEB_NOTIFICATION || value === UserNotificationSettingValue.WEB_NOTIFICATION_AND_EMAIL + return value & UserNotificationSettingValue.WEB } static get Instance () { diff --git a/server/lib/user.ts b/server/lib/user.ts index 9e24e85a0..a39ef6c3d 100644 --- a/server/lib/user.ts +++ b/server/lib/user.ts @@ -98,15 +98,15 @@ export { function createDefaultUserNotificationSettings (user: UserModel, t: Sequelize.Transaction | undefined) { const values: UserNotificationSetting & { userId: number } = { userId: user.id, - newVideoFromSubscription: UserNotificationSettingValue.WEB_NOTIFICATION, - newCommentOnMyVideo: UserNotificationSettingValue.WEB_NOTIFICATION, - myVideoImportFinished: UserNotificationSettingValue.WEB_NOTIFICATION, - myVideoPublished: UserNotificationSettingValue.WEB_NOTIFICATION, - videoAbuseAsModerator: UserNotificationSettingValue.WEB_NOTIFICATION_AND_EMAIL, - blacklistOnMyVideo: UserNotificationSettingValue.WEB_NOTIFICATION_AND_EMAIL, - newUserRegistration: UserNotificationSettingValue.WEB_NOTIFICATION, - commentMention: UserNotificationSettingValue.WEB_NOTIFICATION, - newFollow: UserNotificationSettingValue.WEB_NOTIFICATION + newVideoFromSubscription: UserNotificationSettingValue.WEB, + newCommentOnMyVideo: UserNotificationSettingValue.WEB, + myVideoImportFinished: UserNotificationSettingValue.WEB, + myVideoPublished: UserNotificationSettingValue.WEB, + videoAbuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, + blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, + newUserRegistration: UserNotificationSettingValue.WEB, + commentMention: UserNotificationSettingValue.WEB, + newFollow: UserNotificationSettingValue.WEB } return UserNotificationSettingModel.create(values, { transaction: t }) -- cgit v1.2.3