Change name of settings; add migration

packages/rocketchat-custom-sounds/client/lib/CustomSounds.js

@@ -25,7 +25,7 @@ class CustomSounds {
 
 	remove(sound) {
 		const list = this.list.get();
-		delete this.list[sound._id];
+		delete list[sound._id];
 		this.list.set(list);
 		$('#' + sound._id).remove();
 	}

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

@@ -504,6 +504,7 @@
   "File_exceeds_allowed_size_of_bytes": "File exceeds allowed size of __size__.",
   "File_not_allowed_direct_messages": "File sharing not allowed in direct messages.",
   "File_type_is_not_accepted": "File type is not accepted.",
+  "File_uploaded": "File uploaded",
   "FileUpload": "File Upload",
   "FileUpload_Enabled": "File Uploads Enabled",
   "FileUpload_Disabled": "File uploads are disabled.",

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

@@ -12,7 +12,7 @@ class ModelSubscriptions extends RocketChat.models._Base
 		@tryEnsureIndex { 'unread': 1 }
 		@tryEnsureIndex { 'ts': 1 }
 		@tryEnsureIndex { 'ls': 1 }
-		@tryEnsureIndex { 'audioNotifications': 1 }, { sparse: 1 }
+		@tryEnsureIndex { 'audioNotification': 1 }, { sparse: 1 }
 		@tryEnsureIndex { 'desktopNotifications': 1 }, { sparse: 1 }
 		@tryEnsureIndex { 'mobilePushNotifications': 1 }, { sparse: 1 }
 		@tryEnsureIndex { 'emailNotifications': 1 }, { sparse: 1 }

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

@@ -9,21 +9,21 @@
 					<li>
 						<label>{{_ "Audio"}}</label>
 						<div>
-							{{#if editing 'audioNotifications'}}
+							{{#if editing 'audioNotification'}}
 								<label>
-									<select name="audioNotifications" class="audio">
-										<option value="none" selected="{{$eq audioNotifications 'none'}}">{{_ "None"}}</option>
-										<option value="" selected="{{$eq audioNotifications ''}}">{{_ "Use_account_preference"}} ({{_ "Default"}})</option>
-										<option value="chime" selected="{{$eq audioNotifications 'chime'}}">Chime</option>
+									<select name="audioNotification" class="audio">
+										<option value="none" selected="{{$eq audioNotification 'none'}}">{{_ "None"}}</option>
+										<option value="" selected="{{$eq audioNotification ''}}">{{_ "Use_account_preference"}} ({{_ "Default"}})</option>
+										<option value="chime" selected="{{$eq audioNotification 'chime'}}">Chime</option>
 										{{#each audioAssets}}
-											<option value="{{_id}}" selected="{{$eq audioNotifications _id}}">{{name}}</option>
+											<option value="{{_id}}" selected="{{$eq audioNotification _id}}">{{name}}</option>
 										{{/each}}
 									</select>
 								</label>
 								<button type="button" class="button cancel">{{_ "Cancel"}}</button>
 								<button type="button" class="button primary save">{{_ "Save"}}</button>
 							{{else}}
-								<span class="current-setting">{{audioValue}} <i class="icon-play-circled" data-play="{{audioNotifications}}"></i> <i class="icon-pencil" data-edit="audioNotifications"></i></span>
+								<span class="current-setting">{{audioValue}} <i class="icon-play-circled" data-play="{{audioNotification}}"></i> <i class="icon-pencil" data-edit="audioNotification"></i></span>
 							{{/if}}
 						</div>
 					</li>

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

@@ -5,15 +5,15 @@ Template.pushNotificationsFlexTab.helpers({
 	audioAssets() {
 		return RocketChat.CustomSounds && RocketChat.CustomSounds.getList && RocketChat.CustomSounds.getList() || [];
 	},
-	audioNotifications() {
+	audioNotification() {
 		const sub = ChatSubscription.findOne({
 			rid: Session.get('openedRoom')
 		}, {
 			fields: {
-				audioNotifications: 1
+				audioNotification: 1
 			}
 		});
-		return sub ? sub.audioNotifications || '' : '';
+		return sub ? sub.audioNotification || '' : '';
 	},
 	desktopNotifications() {
 		var sub = ChatSubscription.findOne({
@@ -88,10 +88,10 @@ Template.pushNotificationsFlexTab.helpers({
 			rid: Session.get('openedRoom')
 		}, {
 			fields: {
-				audioNotifications: 1
+				audioNotification: 1
 			}
 		});
-		const audio = sub ? sub.audioNotifications || '': '';
+		const audio = sub ? sub.audioNotification || '': '';
 		if (audio === 'none') {
 			return t('None');
 		} else if (audio === '') {
@@ -159,7 +159,7 @@ Template.pushNotificationsFlexTab.onCreated(function() {
 
 	this.validateSetting = (field) => {
 		switch (field) {
-			case 'audioNotifications':
+			case 'audioNotification':
 				return true;
 			default:
 				const value = this.$('input[name='+ field +']:checked').val();
@@ -175,7 +175,7 @@ Template.pushNotificationsFlexTab.onCreated(function() {
 		const field = this.editing.get();
 		let value;
 		switch (field) {
-			case 'audioNotifications':
+			case 'audioNotification':
 				value = this.$('select[name='+field+']').val();
 				break;
 			default:
@@ -236,7 +236,7 @@ Template.pushNotificationsFlexTab.events({
 				$audio[0].play();
 			}
 		} else {
-			audio = Meteor.user() && Meteor.user().settings && Meteor.user().settings.preferences && Meteor.user().settings.preferences.audioNotifications || 'chime';
+			audio = Meteor.user() && Meteor.user().settings && Meteor.user().settings.preferences && Meteor.user().settings.preferences.newMessageNotification || 'chime';
 			if (audio && audio !== 'none') {
 				let $audio = $('audio#' + audio);
 				if ($audio && $audio[0] && $audio[0].play) {
@@ -246,7 +246,7 @@ Template.pushNotificationsFlexTab.events({
 		}
 	},
 
-	'change select[name=audioNotifications]'(e) {
+	'change select[name=audioNotification]'(e) {
 		e.preventDefault();
 		let audio = $(e.currentTarget).val();
 		if (audio && audio !== 'none') {

packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js

@@ -8,11 +8,11 @@ Meteor.methods({
 		check(field, String);
 		check(value, String);
 
-		if (['audioNotifications', 'desktopNotifications', 'mobilePushNotifications', 'emailNotifications', 'unreadAlert'].indexOf(field) === -1) {
+		if (['audioNotification', 'desktopNotifications', 'mobilePushNotifications', 'emailNotifications', 'unreadAlert'].indexOf(field) === -1) {
 			throw new Meteor.Error('error-invalid-settings', 'Invalid settings field', { method: 'saveNotificationSettings' });
 		}
 
-		if (field !== 'audioNotifications' && ['all', 'mentions', 'nothing', 'default'].indexOf(value) === -1) {
+		if (field !== 'audioNotification' && ['all', 'mentions', 'nothing', 'default'].indexOf(value) === -1) {
 			throw new Meteor.Error('error-invalid-settings', 'Invalid settings value', { method: 'saveNotificationSettings' });
 		}
 
@@ -22,8 +22,8 @@ Meteor.methods({
 		}
 
 		switch (field) {
-			case 'audioNotifications':
-				RocketChat.models.Subscriptions.updateAudioNotificationsById(subscription._id, value);
+			case 'audioNotification':
+				RocketChat.models.Subscriptions.updateAudioNotificationById(subscription._id, value);
 				break;
 			case 'desktopNotifications':
 				RocketChat.models.Subscriptions.updateDesktopNotificationsById(subscription._id, value);

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

-RocketChat.models.Subscriptions.updateAudioNotificationsById = function(_id, audioNotifications) {
+RocketChat.models.Subscriptions.updateAudioNotificationById = function(_id, audioNotification) {
 	const query = {
 		_id: _id
 	};
 
 	const update = {
 		$set: {
-			audioNotifications: audioNotifications
+			audioNotification: audioNotification
 		}
 	};
 
@@ -123,7 +123,7 @@ RocketChat.models.Subscriptions.findNotificationPreferencesByRoom = function(roo
 		rid: roomId,
 		'u._id': {$exists: true},
 		$or: [
-			{audioNotifications: {$exists: true}},
+			{audioNotification: {$exists: true}},
 			{desktopNotifications: {$exists: true}},
 			{desktopNotificationDuration: {$exists: true}},
 			{mobilePushNotifications: {$exists: true}}

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

@@ -3,8 +3,8 @@ Template.accountPreferences.helpers
 	audioAssets: ->
 		return RocketChat.CustomSounds && RocketChat.CustomSounds.getList && RocketChat.CustomSounds.getList() || [];
 
-	audioNotifications: ->
-		return Meteor.user()?.settings?.preferences?.audioNotifications || 'chime'
+	newMessageNotification: ->
+		return Meteor.user()?.settings?.preferences?.newMessageNotification || 'chime'
 
 	newRoomNotification: ->
 		return Meteor.user()?.settings?.preferences?.newRoomNotification || 'door'
@@ -76,7 +76,7 @@ Template.accountPreferences.onCreated ->
 			reload = true
 
 		data.newRoomNotification = $('select[name=newRoomNotification]').val()
-		data.audioNotifications = $('select[name=audioNotifications]').val()
+		data.newMessageNotification = $('select[name=newMessageNotification]').val()
 		data.useEmojis = $('input[name=useEmojis]:checked').val()
 		data.convertAsciiEmoji = $('input[name=convertAsciiEmoji]:checked').val()
 		data.saveMobileBandwidth = $('input[name=saveMobileBandwidth]:checked').val()

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

@@ -183,11 +183,11 @@
 							<div class="input-line double-col">
 								<label>{{_ "New_Message_Notification"}}</label>
 								<div>
-									<select name="audioNotifications" class="audio">
-										<option value="none" selected="{{$eq audioNotifications 'none'}}">{{_ "None"}}</option>
-										<option value="chime" selected="{{$eq audioNotifications 'chime'}}">Chime ({{_ "Default"}})</option>
+									<select name="newMessageNotification" class="audio">
+										<option value="none" selected="{{$eq newMessageNotification 'none'}}">{{_ "None"}}</option>
+										<option value="chime" selected="{{$eq newMessageNotification 'chime'}}">Chime ({{_ "Default"}})</option>
 										{{#each audioAssets}}
-											<option value="{{_id}}" selected="{{$eq audioNotifications _id}}">{{name}}</option>
+											<option value="{{_id}}" selected="{{$eq newMessageNotification _id}}">{{name}}</option>
 										{{/each}}
 									</select>
 								</div>

packages/rocketchat-ui/lib/notification.coffee

@@ -49,15 +49,13 @@
 
 	newMessage: ->
 		if not Session.equals('user_' + Meteor.userId() + '_status', 'busy')
-			sub = ChatSubscription.findOne({ rid: Session.get('openedRoom') }, { fields: { audioNotifications: 1 } });
-			if sub?.audioNotifications isnt 'none'
-				if sub?.audioNotifications
-					$("audio##{sub.audioNotifications}")[0].play()
-				else if Meteor.user()?.settings?.preferences?.audioNotifications isnt 'none'
-					if Meteor.user()?.settings?.preferences?.audioNotifications
-						$("audio##{Meteor.user().settings.preferences.audioNotifications}")[0].play()
-					else
-						$('audio#chime')[0].play()
+			newMessageNotification = Meteor.user()?.settings?.preferences?.newMessageNotification || 'chime'
+			sub = ChatSubscription.findOne({ rid: Session.get('openedRoom') }, { fields: { audioNotification: 1 } });
+			if sub?.audioNotification isnt 'none'
+				if sub?.audioNotification
+					$("audio##{sub.audioNotification}")[0].play()
+				else if newMessageNotification isnt 'none'
+					$("audio##{newMessageNotification}")[0].play()
 
 	newRoom: (rid, withSound = true) ->
 		Tracker.nonreactive ->
@@ -78,16 +76,11 @@
 		$('.link-room-' + rid).removeClass('new-room-highlight')
 
 Tracker.autorun ->
+	newRoomNotification = Meteor.user()?.settings?.preferences?.newRoomNotification || 'door'
 	if Session.get('newRoomSound')?.length > 0
 		Tracker.nonreactive ->
-			if not Session.equals('user_' + Meteor.userId() + '_status', 'busy') and Meteor.user()?.settings?.preferences?.newRoomNotification isnt 'none'
-				if Meteor.user()?.settings?.preferences?.newRoomNotification
-					$("audio#{Meteor.user().settings.preferences.newRoomNotification}").each ->
-						this.play?()
-				else
-					$("audio#door").each ->
-						this.play?()
+			if not Session.equals('user_' + Meteor.userId() + '_status', 'busy') and newRoomNotification isnt 'none'
+				$("audio##{newRoomNotification}")?[0]?.play?()
 	else
-		$('audio#door').each ->
-			this.pause?()
-			this.currentTime = 0
+		$("audio##{newRoomNotification}")?[0]?.pause?()
+		$("audio##{newRoomNotification}")?[0]?.currentTime = 0

server/methods/saveUserPreferences.coffee

@@ -12,8 +12,8 @@ Meteor.methods
 			if settings.newRoomNotification?
 				preferences.newRoomNotification = settings.newRoomNotification
 
-			if settings.audioNotifications?
-				preferences.audioNotifications = settings.audioNotifications
+			if settings.newMessageNotification?
+				preferences.newMessageNotification = settings.newMessageNotification
 
 			if settings.useEmojis?
 				preferences.useEmojis = if settings.useEmojis is "1" then true else false

server/publications/subscription.coffee

@@ -12,7 +12,7 @@ fields =
 	roles: 1
 	unread: 1
 	archived: 1
-	audioNotifications: 1
+	audioNotification: 1
 	desktopNotifications: 1
 	desktopNotificationDuration: 1
 	mobilePushNotifications: 1

server/startup/migrations/v077.js

+RocketChat.Migrations.add({
+	version: 77,
+	up: function() {
+		if (RocketChat && RocketChat.models && RocketChat.models.Users) {
+			RocketChat.models.Users.update({ newMessageNotification: false }, { $set: { newMessageNotification: 'none' } }, { multi: true });
+			RocketChat.models.Users.update({ newMessageNotification: true }, { $unset: { newMessageNotification: 1 } }, { multi: true });
+			RocketChat.models.Users.update({ newRoomNotification: false }, { $set: { newRoomNotification: 'none' } }, { multi: true });
+			RocketChat.models.Users.update({ newRoomNotification: true }, { $unset: { newRoomNotification: 1 } }, { multi: true });
+		}
+	}
+});