[FIX] Notification preferences being lost when switching view mode (#…

…11295)
RocketChat · Jul 4, 2018 · 013b351 · 013b351
1 parent 5aa08cb
commit 013b351
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 25 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js
@@ -69,23 +69,23 @@ Meteor.methods({
 
 		// propagate changed notification preferences
 		Meteor.defer(() => {
-			if (oldDesktopNotifications !== settings.desktopNotifications) {
+			if (settings.desktopNotifications && oldDesktopNotifications !== settings.desktopNotifications) {
 				if (settings.desktopNotifications === 'default') {
 					RocketChat.models.Subscriptions.clearDesktopNotificationUserPreferences(user._id);
 				} else {
 					RocketChat.models.Subscriptions.updateDesktopNotificationUserPreferences(user._id, settings.desktopNotifications);
 				}
 			}
 
-			if (oldMobileNotifications !== settings.mobileNotifications) {
+			if (settings.mobileNotifications && oldMobileNotifications !== settings.mobileNotifications) {
 				if (settings.mobileNotifications === 'default') {
 					RocketChat.models.Subscriptions.clearMobileNotificationUserPreferences(user._id);
 				} else {
 					RocketChat.models.Subscriptions.updateMobileNotificationUserPreferences(user._id, settings.mobileNotifications);
 				}
 			}
 
-			if (oldEmailNotifications !== settings.emailNotificationMode) {
+			if (settings.emailNotificationMode && oldEmailNotifications !== settings.emailNotificationMode) {
 				if (settings.emailNotificationMode === 'default') {
 					RocketChat.models.Subscriptions.clearEmailNotificationUserPreferences(user._id);
 				} else {

diff --git a/server/startup/migrations/v129.js b/server/startup/migrations/v129.js
@@ -0,0 +1,60 @@
+RocketChat.Migrations.add({
+	version: 129,
+	up() {
+		RocketChat.models.Users.find({
+			$or: [
+				{ 'settings.preferences.desktopNotifications': { $exists: true, $ne: 'default' } },
+				{ 'settings.preferences.mobileNotifications': { $exists: true, $ne: 'default' } },
+				{ 'settings.preferences.emailNotificationMode': { $exists: true, $ne: 'default' } }
+			]
+		}, {
+			fields: {
+				'settings.preferences.desktopNotifications': 1,
+				'settings.preferences.mobileNotifications': 1,
+				'settings.preferences.emailNotificationMode': 1
+			}
+		}).forEach(user => {
+			if (user.settings.preferences.desktopNotifications && user.settings.preferences.desktopNotifications !== 'default') {
+				RocketChat.models.Subscriptions.update({
+					'u._id': user._id,
+					desktopPrefOrigin: 'user',
+					desktopNotifications: null
+				}, {
+					$set: {
+						desktopNotifications: user.settings.preferences.desktopNotifications
+					}
+				}, {
+					multi: true
+				});
+			}
+
+			if (user.settings.preferences.mobileNotifications && user.settings.preferences.mobileNotifications !== 'default') {
+				RocketChat.models.Subscriptions.update({
+					'u._id': user._id,
+					mobilePrefOrigin: 'user',
+					mobilePushNotifications: null
+				}, {
+					$set: {
+						mobilePushNotifications: user.settings.preferences.mobileNotifications
+					}
+				}, {
+					multi: true
+				});
+			}
+
+			if (user.settings.preferences.emailNotificationMode && user.settings.preferences.emailNotificationMode !== 'default') {
+				RocketChat.models.Subscriptions.update({
+					'u._id': user._id,
+					emailPrefOrigin: 'user',
+					emailNotifications: null
+				}, {
+					$set: {
+						emailNotifications: user.settings.preferences.emailNotificationMode === 'disabled' || user.settings.preferences.emailNotificationMode === 'nothing' ? 'nothing' : 'mentions'
+					}
+				}, {
+					multi: true
+				});
+			}
+		});
+	}
+});