From aa8f3447bec73d49ee4d76e16752b0cdf85243ee Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 10 Dec 2018 18:38:54 -0200 Subject: [PATCH 1/2] donot emit settings if there are no changes --- packages/rocketchat-lib/server/publications/settings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/publications/settings.js b/packages/rocketchat-lib/server/publications/settings.js index 9f05a9465621f..0a69a5e0583ef 100644 --- a/packages/rocketchat-lib/server/publications/settings.js +++ b/packages/rocketchat-lib/server/publications/settings.js @@ -55,7 +55,10 @@ Meteor.methods({ }, }); -RocketChat.models.Settings.on('change', ({ clientAction, id, data }) => { +RocketChat.models.Settings.on('change', ({ clientAction, id, data, diff }) => { + if (Object.keys(diff).length === 1 && diff._updatedAt) { // avoid useless changes + return; + } switch (clientAction) { case 'updated': case 'inserted': From c5d646d9f3e207a269721388c9bba7162ad6c62f Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Tue, 11 Dec 2018 16:51:17 -0200 Subject: [PATCH 2/2] Update packages/rocketchat-lib/server/publications/settings.js Co-Authored-By: ggazzo --- packages/rocketchat-lib/server/publications/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/publications/settings.js b/packages/rocketchat-lib/server/publications/settings.js index 0a69a5e0583ef..f15667be700d9 100644 --- a/packages/rocketchat-lib/server/publications/settings.js +++ b/packages/rocketchat-lib/server/publications/settings.js @@ -56,7 +56,7 @@ Meteor.methods({ }); RocketChat.models.Settings.on('change', ({ clientAction, id, data, diff }) => { - if (Object.keys(diff).length === 1 && diff._updatedAt) { // avoid useless changes + if (diff && Object.keys(diff).length === 1 && diff._updatedAt) { // avoid useless changes return; } switch (clientAction) {