[NEW] Add admin and user setting for notifications

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -377,6 +377,7 @@
   "Desktop": "Desktop",
   "Desktop_Notification_Test": "Desktop Notification Test",
   "Desktop_Notifications": "Desktop Notifications",
+  "Desktop_Notifications_Default_Alert" : "Desktop Notifications Default Alert",
   "Desktop_Notifications_Disabled": "Desktop Notifications are Disabled. Change your browser preferences if you need Notifications enabled.",
   "Desktop_Notifications_Duration": "Desktop Notifications Duration",
   "Desktop_Notifications_Duration_Description": "Seconds to display desktop notification. This may affect OS X Notification Center. Enter 0 to use default browser settings and not affect OS X Notification Center.",
@@ -865,7 +866,6 @@
   "Max_length_is": "Max length is %s",
   "Members_List": "Members List",
   "Mentions": "Mentions",
-  "Mentions_default": "Mentions (default)",
   "Message": "Message",
   "Message_AllowBadWordsFilter": "Allow Message bad words filtering",
   "Message_AllowDeleting": "Allow Message Deleting",
@@ -924,6 +924,7 @@
   "Min_length_is": "Min length is %s",
   "minutes": "minutes",
   "Mobile": "Mobile",
+  "Mobile_Notifications_Default_Alert" : "Mobile Notifications Default Alert",
   "Monday": "Monday",
   "Monitor_history_for_changes_on": "Monitor history for changes on",
   "More_channels": "More channels",
@@ -979,8 +980,12 @@
   "Not_found_or_not_allowed": "Not Found or Not Allowed",
   "Nothing": "Nothing",
   "Nothing_found": "Nothing found",
+  "Notification_Desktop_Default_For" : "Show Desktop Notifications For",
+  "Notification_Mobile_Default_For" : "Push Mobile Notifications For",
   "Notification_Duration": "Notification Duration",
   "Notifications": "Notifications",
+  "Notifications_Max_Room_Members" : "Max room members before disabling all message notifications",
+  "Notifications_Max_Room_Members_Description" : "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
   "Notify_all_in_this_room": "Notify all in this room",
   "Notify_active_in_this_room": "Notify active users in this room",
   "Num_Agents": "# Agents",
@@ -1576,4 +1581,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
+}

packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js

@@ -74,17 +74,37 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	settings.alwaysNotifyMobileUsers = [];
 	settings.dontNotifyMobileUsers = [];
 	settings.desktopNotificationDurations = {};
+	// Don't fetch all users if room exceeds max members
+	const maxMembersForNotification = RocketChat.settings.get('Notifications_Max_Room_Members');
+	const disableAllMessageNotifications = room.usernames.length > maxMembersForNotification && maxMembersForNotification !== 0;
+	const subscriptions = RocketChat.models.Subscriptions.findNotificationPreferencesByRoom(room._id, disableAllMessageNotifications);
+	const userIds = [];
+	subscriptions.forEach((s) => {
+		userIds.push(s.u._id);
+	});
+	const userSettings = {};
+	RocketChat.models.Users.findUsersByIds(userIds, { fields: { 'settings.preferences.desktopNotifications': 1, 'settings.preferences.mobileNotifications': 1 } }).forEach((user) => {
+		userSettings[user._id] = user.settings;
+	});
 
-	const notificationPreferencesByRoom = RocketChat.models.Subscriptions.findNotificationPreferencesByRoom(room._id);
-	notificationPreferencesByRoom.forEach(function(subscription) {
-		if (subscription.desktopNotifications === 'all') {
+	subscriptions.forEach((subscription) => {
+		const preferences = userSettings[subscription.u._id] ? userSettings[subscription.u._id].preferences || {} : {};
+		const userDesktopNotificationPreference = preferences.desktopNotifications !== 'default' ? preferences.desktopNotifications : undefined;
+		const userMobileNotificationPreference = preferences.mobileNotifications !== 'default' ? preferences.mobileNotifications : undefined;
+		// Set defaults if they don't exist
+		const {
+			desktopNotifications = userDesktopNotificationPreference || RocketChat.settings.get('Desktop_Notifications_Default_Alert'),
+			mobilePushNotifications = userMobileNotificationPreference || RocketChat.settings.get('Mobile_Notifications_Default_Alert')
+		} = subscription;
+
+		if (desktopNotifications === 'all' && !disableAllMessageNotifications) {
 			settings.alwaysNotifyDesktopUsers.push(subscription.u._id);
-		} else if (subscription.desktopNotifications === 'nothing') {
+		} else if (desktopNotifications === 'nothing') {
 			settings.dontNotifyDesktopUsers.push(subscription.u._id);
 		}
-		if (subscription.mobilePushNotifications === 'all') {
+		if (mobilePushNotifications === 'all' && !disableAllMessageNotifications) {
 			settings.alwaysNotifyMobileUsers.push(subscription.u._id);
-		} else if (subscription.mobilePushNotifications === 'nothing') {
+		} else if (mobilePushNotifications === 'nothing') {
 			settings.dontNotifyMobileUsers.push(subscription.u._id);
 		}
 		settings.desktopNotificationDurations[subscription.u._id] = subscription.desktopNotificationDuration;

packages/rocketchat-lib/server/models/Users.coffee

@@ -180,6 +180,13 @@ class ModelUsers extends RocketChat.models._Base
 
 		return @find query, options
 
+	findUsersByIds: (ids, options) ->
+		query =
+			_id:
+				$in: ids
+
+		return @find query, options
+
 	# UPDATE
 	addImportIds: (_id, importIds) ->
 		importIds = [].concat(importIds)

packages/rocketchat-lib/server/startup/settings.coffee

@@ -111,6 +111,37 @@ RocketChat.settings.addGroup 'General', ->
 
 	@section 'Notifications', ->
 		@add 'Desktop_Notifications_Duration', 0, { type: 'int', public: true, i18nDescription: 'Desktop_Notification_Durations_Description' }
+		@add 'Desktop_Notifications_Default_Alert', 'all', {
+			type: 'select',
+			values: [{
+				key: 'all',
+				i18nLabel: 'All_messages'
+			}, {
+				key: 'mentions',
+				i18nLabel: 'Mentions'
+			}, {
+				key: 'nothing',
+				i18nLabel: 'Nothing'
+			}],
+			public: true
+		}
+
+		@add 'Mobile_Notifications_Default_Alert', 'mentions', {
+			type: 'select',
+			values: [{
+				key: 'all',
+				i18nLabel: 'All_messages'
+			}, {
+				key: 'mentions',
+				i18nLabel: 'Mentions'
+			}, {
+				key: 'nothing',
+				i18nLabel: 'Nothing'
+			}],
+			public: true
+		}
+
+		@add 'Notifications_Max_Room_Members', 100, { type: 'int', public: true, i18nDescription: 'Notifications_Max_Room_Members_Description' }
 
 	@section 'REST API', ->
 		@add 'API_User_Limit', 500, { type: 'int', public: true, i18nDescription: 'API_User_Limit' }

packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html

@@ -31,8 +31,9 @@ <h2>{{_ "Notifications"}}</h2>
 						<label>{{_ "Desktop"}}</label>
 						<div>
 							{{#if editing 'desktopNotifications'}}
+								<label><input type="radio" name="desktopNotifications" value="default" checked="{{$eq desktopNotifications 'default'}}" /> {{_ "Default"}}</label>
 								<label><input type="radio" name="desktopNotifications" value="all" checked="{{$eq desktopNotifications 'all'}}" /> {{_ "All_messages"}}</label>
-								<label><input type="radio" name="desktopNotifications" value="mentions" checked="{{$eq desktopNotifications 'mentions'}}" /> {{_ "Mentions_default"}}</label>
+								<label><input type="radio" name="desktopNotifications" value="mentions" checked="{{$eq desktopNotifications 'mentions'}}" /> {{_ "Mentions"}}</label>
 								<label><input type="radio" name="desktopNotifications" value="nothing" checked="{{$eq desktopNotifications 'nothing'}}" /> {{_ "Nothing"}}</label>
 								<br />
 								{{#if desktopNotificationDuration}}
@@ -60,8 +61,9 @@ <h2>{{_ "Notifications"}}</h2>
 						<label>{{_ "Mobile"}}</label>
 						<div>
 							{{#if editing 'mobilePushNotifications'}}
+								<label><input type="radio" name="mobilePushNotifications" value="default" checked="{{$eq mobilePushNotifications 'default'}}" /> {{_ "Default"}}</label>
 								<label><input type="radio" name="mobilePushNotifications" value="all" checked="{{$eq mobilePushNotifications 'all'}}" /> {{_ "All_messages"}}</label>
-								<label><input type="radio" name="mobilePushNotifications" value="mentions" checked="{{$eq mobilePushNotifications 'mentions'}}" /> {{_ "Mentions_default"}}</label>
+								<label><input type="radio" name="mobilePushNotifications" value="mentions" checked="{{$eq mobilePushNotifications 'mentions'}}" /> {{_ "Mentions"}}</label>
 								<label><input type="radio" name="mobilePushNotifications" value="nothing" checked="{{$eq mobilePushNotifications 'nothing'}}" /> {{_ "Nothing"}}</label>
 								<button type="button" class="button cancel">{{_ "Cancel"}}</button>
 								<button type="button" class="button primary save">{{_ "Save"}}</button>

packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js

@@ -23,7 +23,7 @@ Template.pushNotificationsFlexTab.helpers({
 				desktopNotifications: 1
 			}
 		});
-		return sub ? sub.desktopNotifications : '';
+		return sub ? sub.desktopNotifications || 'default' : 'default';
 	},
 	mobilePushNotifications() {
 		var sub = ChatSubscription.findOne({
@@ -33,7 +33,7 @@ Template.pushNotificationsFlexTab.helpers({
 				mobilePushNotifications: 1
 			}
 		});
-		return sub ? sub.mobilePushNotifications : '';
+		return sub ? sub.mobilePushNotifications || 'default' : 'default';
 	},
 	emailNotifications() {
 		var sub = ChatSubscription.findOne({
@@ -124,11 +124,7 @@ Template.pushNotificationsFlexTab.helpers({
 				case 'mentions':
 					return t('Mentions');
 				default:
-					if (field === 'emailNotifications') {
-						return t('Use_account_preference');
-					} else {
-						return t('Mentions');
-					}
+					return t('Use_account_preference');
 			}
 		}
 	},

packages/rocketchat-push-notifications/server/models/Subscriptions.js

@@ -17,11 +17,13 @@ RocketChat.models.Subscriptions.updateDesktopNotificationsById = function(_id, d
 		_id: _id
 	};
 
-	const update = {
-		$set: {
-			desktopNotifications: desktopNotifications
-		}
-	};
+	const update = {};
+
+	if (desktopNotifications === 'default') {
+		update.$unset = { desktopNotifications: 1 };
+	} else {
+		update.$set = { desktopNotifications: desktopNotifications };
+	}
 
 	return this.update(query, update);
 };
@@ -45,11 +47,13 @@ RocketChat.models.Subscriptions.updateMobilePushNotificationsById = function(_id
 		_id: _id
 	};
 
-	const update = {
-		$set: {
-			mobilePushNotifications: mobilePushNotifications
-		}
-	};
+	const update = {};
+
+	if (mobilePushNotifications === 'default') {
+		update.$unset = { mobilePushNotifications: 1 };
+	} else {
+		update.$set = { mobilePushNotifications: mobilePushNotifications };
+	}
 
 	return this.update(query, update);
 };
@@ -118,19 +122,22 @@ RocketChat.models.Subscriptions.findDontNotifyMobileUsersByRoomId = function(roo
 	return this.find(query);
 };
 
-RocketChat.models.Subscriptions.findNotificationPreferencesByRoom = function(roomId) {
+RocketChat.models.Subscriptions.findNotificationPreferencesByRoom = function(roomId, explicit) {
 	const query = {
 		rid: roomId,
-		'u._id': {$exists: true},
-		$or: [
+		'u._id': {$exists: true}
+	};
+
+	if (explicit) {
+		query.$or = [
 			{audioNotification: {$exists: true}},
 			{desktopNotifications: {$exists: true}},
 			{desktopNotificationDuration: {$exists: true}},
 			{mobilePushNotifications: {$exists: true}}
-		]
-	};
+		];
+	}
 
-	return this.find(query);
+	return this.find(query, { fields: { 'u._id': 1, desktopNotificationDuration: 1, desktopNotifications: 1, mobilePushNotifications: 1 } });
 };
 
 RocketChat.models.Subscriptions.findWithSendEmailByRoomId = function(roomId) {

packages/rocketchat-ui-account/account/accountPreferences.coffee

@@ -91,6 +91,8 @@ Template.accountPreferences.onCreated ->
 		data.emailNotificationMode = $('select[name=emailNotificationMode]').val()
 		data.highlights = _.compact(_.map($('[name=highlights]').val().split(','), (e) -> return _.trim(e)))
 		data.desktopNotificationDuration = $('input[name=desktopNotificationDuration]').val()
+		data.desktopNotifications = $('#desktopNotifications').find('select').val()
+		data.mobileNotifications = $('#mobileNotifications').find('select').val()
 		data.unreadAlert = $('#unreadAlert').find('input:checked').val()
 
 		Meteor.call 'saveUserPreferences', data, (error, results) ->

packages/rocketchat-ui-account/account/accountPreferences.html

@@ -52,6 +52,28 @@ <h1>{{_ "Messages"}}</h1>
 									{{/if}}
 								</div>
 							</div>
+							<div class="input-line double-col" id="desktopNotifications">
+								<label>{{_ "Notification_Desktop_Default_For"}}</label>
+								<div>
+									<select class="input-monitor" name="desktopNotifications">
+										<option value="default" selected="{{selected 'desktopNotifications' 'default' true}}">{{_ "Default"}}</option>
+										<option value="all" selected="{{selected 'desktopNotifications' 'all' false}}">{{_ "All_messages"}}</option>
+										<option value="mentions" selected="{{selected 'desktopNotifications' 'mentions' false}}">{{_ "Mentions"}}</option>
+										<option value="nothing" selected="{{selected 'desktopNotifications' 'nothing' false}}">{{_ "Nothing"}}</option>
+									</select>
+								</div>
+							</div>
+							<div class="input-line double-col" id="mobileNotifications">
+								<label>{{_ "Notification_Mobile_Default_For"}}</label>
+								<div>
+									<select class="input-monitor" name="mobileNotifications">
+										<option value="default" selected="{{selected 'mobileNotifications' 'default' true}}">{{_ "Default"}}</option>
+										<option value="all" selected="{{selected 'mobileNotifications' 'all' false}}">{{_ "All_messages"}}</option>
+										<option value="mentions" selected="{{selected 'mobileNotifications' 'mentions' false}}">{{_ "Mentions"}}</option>
+										<option value="nothing" selected="{{selected 'mobileNotifications' 'nothing' false}}">{{_ "Nothing"}}</option>
+									</select>
+								</div>
+							</div>
 							<div class="input-line double-col" id="unreadAlert">
 								<label>{{_ "Unread_Alert"}}</label>
 								<div>

server/methods/saveUserPreferences.js

@@ -55,6 +55,14 @@ Meteor.methods({
 				preferences.unreadAlert = settings.unreadAlert === '1' ? true : false;
 			}
 
+			if (settings.desktopNotifications) {
+				preferences.desktopNotifications = settings.desktopNotifications;
+			}
+
+			if (settings.mobileNotifications) {
+				preferences.mobileNotifications = settings.mobileNotifications;
+			}
+
 			preferences.desktopNotificationDuration = settings.desktopNotificationDuration - 0;
 			preferences.viewMode = settings.viewMode || 0;
 			preferences.hideUsernames = settings.hideUsernames === '1';