[FIX] Notify private settings changes even on public settings changed (…

…#13369)

Closes #11604
Closes #12399

An `else` directive introduced the issue at version 0.67.0: https://github.com/RocketChat/Rocket.Chat/pull/10749/files#diff-ff8f9f02a53856a978c533000a92bd12R70

packages/rocketchat-lib/server/publications/settings.js

@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
 
 Meteor.methods({
 	'public-settings/get'(updatedAt) {
-		this.unblock();
 		const records = RocketChat.models.Settings.findNotHiddenPublic().fetch();
 
 		if (updatedAt instanceof Date) {
@@ -25,33 +24,32 @@ Meteor.methods({
 		}
 		return records;
 	},
-	'private-settings/get'(updatedAt) {
+	'private-settings/get'(updatedAfter) {
 		if (!Meteor.userId()) {
 			return [];
 		}
-		this.unblock();
 		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'view-privileged-setting')) {
 			return [];
 		}
-		const records = RocketChat.models.Settings.findNotHidden().fetch();
-		if (updatedAt instanceof Date) {
-			return {
-				update: records.filter(function(record) {
-					return record._updatedAt > updatedAt;
-				}),
-				remove: RocketChat.models.Settings.trashFindDeletedAfter(updatedAt, {
-					hidden: {
-						$ne: true,
-					},
-				}, {
-					fields: {
-						_id: 1,
-						_deletedAt: 1,
-					},
-				}).fetch(),
-			};
+
+		if (!(updatedAfter instanceof Date)) {
+			return RocketChat.models.Settings.findNotHidden().fetch();
 		}
-		return records;
+
+		const records = RocketChat.models.Settings.findNotHidden({ updatedAfter }).fetch();
+		return {
+			update: records,
+			remove: RocketChat.models.Settings.trashFindDeletedAfter(updatedAfter, {
+				hidden: {
+					$ne: true,
+				},
+			}, {
+				fields: {
+					_id: 1,
+					_deletedAt: 1,
+				},
+			}).fetch(),
+		};
 	},
 });
 
@@ -61,7 +59,7 @@ RocketChat.models.Settings.on('change', ({ clientAction, id, data, diff }) => {
 	}
 	switch (clientAction) {
 		case 'updated':
-		case 'inserted':
+		case 'inserted': {
 			const setting = data || RocketChat.models.Settings.findOneById(id);
 			const value = {
 				_id: setting._id,
@@ -72,15 +70,20 @@ RocketChat.models.Settings.on('change', ({ clientAction, id, data, diff }) => {
 
 			if (setting.public === true) {
 				RocketChat.Notifications.notifyAllInThisInstance('public-settings-changed', clientAction, value);
-			} else {
-				RocketChat.Notifications.notifyLoggedInThisInstance('private-settings-changed', clientAction, setting);
 			}
+			RocketChat.Notifications.notifyLoggedInThisInstance('private-settings-changed', clientAction, setting);
 			break;
+		}
+
+		case 'removed': {
+			const setting = data || RocketChat.models.Settings.findOneById(id, { fields: { public: 1 } });
 
-		case 'removed':
+			if (setting.public === true) {
+				RocketChat.Notifications.notifyAllInThisInstance('public-settings-changed', clientAction, { _id: id });
+			}
 			RocketChat.Notifications.notifyLoggedInThisInstance('private-settings-changed', clientAction, { _id: id });
-			RocketChat.Notifications.notifyAllInThisInstance('public-settings-changed', clientAction, { _id: id });
 			break;
+		}
 	}
 });
 

packages/rocketchat-models/server/models/Settings.js

@@ -81,8 +81,16 @@ export class Settings extends Base {
 		});
 	}
 
-	findNotHidden(options) {
-		return this.find({ hidden: { $ne: true } }, options);
+	findNotHidden({ updatedAfter, ...options } = {}) {
+		const query = {
+			hidden: { $ne: true },
+		};
+
+		if (updatedAfter) {
+			query._updatedAt = { $gt: updatedAfter };
+		}
+
+		return this.find(query, options);
 	}
 
 	findNotHiddenUpdatedAfter(updatedAt) {