From 631733c975c8ee317cb2300e05276a9f20429b92 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 22 Mar 2021 18:38:16 +0530 Subject: [PATCH 1/5] Updated status message When a user sets custom status and then changes it afterwards to one of the presets "busy", "away", "invisible" or "online", the status message doesn't change according to the preset values instead stays set to the custom message. This commit fixes the issue. --- .../server/methods/setUserStatus.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/user-status/server/methods/setUserStatus.js b/app/user-status/server/methods/setUserStatus.js index adb4aed135fb..163d111ec434 100644 --- a/app/user-status/server/methods/setUserStatus.js +++ b/app/user-status/server/methods/setUserStatus.js @@ -15,17 +15,17 @@ Meteor.methods({ Meteor.call('UserPresence:setDefaultStatus', statusType); } - if (statusText || statusText === '') { - check(statusText, String); - - if (!settings.get('Accounts_AllowUserStatusMessageChange')) { - throw new Meteor.Error('error-not-allowed', 'Not allowed', { + + check(statusText, String); + + if (!settings.get('Accounts_AllowUserStatusMessageChange')) { + throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setUserStatus', - }); - } - - setStatusText(userId, statusText); + }); } + + setStatusText(userId, statusText); + }, }); From 4740aa75048ac109515448710f6136b4b5f13460 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 22 Mar 2021 18:58:51 +0530 Subject: [PATCH 2/5] Update setUserStatus.js --- app/user-status/server/methods/setUserStatus.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/user-status/server/methods/setUserStatus.js b/app/user-status/server/methods/setUserStatus.js index 163d111ec434..7c5e86b45e23 100644 --- a/app/user-status/server/methods/setUserStatus.js +++ b/app/user-status/server/methods/setUserStatus.js @@ -16,15 +16,18 @@ Meteor.methods({ } - check(statusText, String); - - if (!settings.get('Accounts_AllowUserStatusMessageChange')) { - throw new Meteor.Error('error-not-allowed', 'Not allowed', { + if (statusText || statusText === '') { + check(statusText, String); + + if (!settings.get('Accounts_AllowUserStatusMessageChange')) { + throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setUserStatus', - }); + }); + } + setStatusText(userId, statusText); + } else { + setStatusText(userId, statusText); } - - setStatusText(userId, statusText); }, }); From 97dbef69fac9d4cd6ef2e8515b08eb9d279e8256 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 22 Mar 2021 19:09:08 +0530 Subject: [PATCH 3/5] Update setUserStatus.js --- app/user-status/server/methods/setUserStatus.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/user-status/server/methods/setUserStatus.js b/app/user-status/server/methods/setUserStatus.js index 7c5e86b45e23..7db61a38567f 100644 --- a/app/user-status/server/methods/setUserStatus.js +++ b/app/user-status/server/methods/setUserStatus.js @@ -14,7 +14,6 @@ Meteor.methods({ if (statusType) { Meteor.call('UserPresence:setDefaultStatus', statusType); } - if (statusText || statusText === '') { check(statusText, String); From 911bbc1fa6e130309558b6b0ed87c57dff9ded0a Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 22 Mar 2021 19:29:39 +0530 Subject: [PATCH 4/5] Update setUserStatus.js --- app/user-status/server/methods/setUserStatus.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/user-status/server/methods/setUserStatus.js b/app/user-status/server/methods/setUserStatus.js index 7db61a38567f..310025e758cb 100644 --- a/app/user-status/server/methods/setUserStatus.js +++ b/app/user-status/server/methods/setUserStatus.js @@ -10,14 +10,11 @@ Meteor.methods({ if (!userId) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'setUserStatus' }); } - if (statusType) { Meteor.call('UserPresence:setDefaultStatus', statusType); } - if (statusText || statusText === '') { check(statusText, String); - if (!settings.get('Accounts_AllowUserStatusMessageChange')) { throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setUserStatus', @@ -26,8 +23,7 @@ Meteor.methods({ setStatusText(userId, statusText); } else { setStatusText(userId, statusText); - } - + } }, }); From 1fe2075cdee3b7a24fe20db538b1fcfba8e42e95 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 22 Mar 2021 19:41:31 +0530 Subject: [PATCH 5/5] Update setUserStatus.js --- app/user-status/server/methods/setUserStatus.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/user-status/server/methods/setUserStatus.js b/app/user-status/server/methods/setUserStatus.js index 310025e758cb..698f589c34e8 100644 --- a/app/user-status/server/methods/setUserStatus.js +++ b/app/user-status/server/methods/setUserStatus.js @@ -21,9 +21,7 @@ Meteor.methods({ }); } setStatusText(userId, statusText); - } else { - setStatusText(userId, statusText); - } + } else {setStatusText(userId, statusText);} }, });