diff --git a/client/methods/deleteMessage.js b/client/methods/deleteMessage.js index 1e5075545ae..13cf855ed60 100644 --- a/client/methods/deleteMessage.js +++ b/client/methods/deleteMessage.js @@ -21,7 +21,7 @@ Meteor.methods({ return false; } const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes'); - if (!forceDelete && (_.isNumber(blockDeleteInMinutes) && blockDeleteInMinutes !== 0)) { + if (!forceDelete && _.isNumber(blockDeleteInMinutes) && blockDeleteInMinutes !== 0) { if (message.ts) { const msgTs = moment(message.ts); if (msgTs) { diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 771c3b65025..05219809472 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -190,7 +190,8 @@ Meteor.startup(function() { const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes'); if (forceDelete) { return true; - } else if ((blockDeleteInMinutes != null && blockDeleteInMinutes !== 0)) { + } + if (blockDeleteInMinutes != null && blockDeleteInMinutes !== 0) { let msgTs; if (message.ts != null) { msgTs = moment(message.ts); diff --git a/packages/rocketchat-lib/server/methods/deleteMessage.js b/packages/rocketchat-lib/server/methods/deleteMessage.js index 877f0229566..829c77e45ea 100644 --- a/packages/rocketchat-lib/server/methods/deleteMessage.js +++ b/packages/rocketchat-lib/server/methods/deleteMessage.js @@ -35,7 +35,7 @@ Meteor.methods({ }); } const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes'); - if ((blockDeleteInMinutes != null && blockDeleteInMinutes !== 0) && !(forceDelete)) { + if (blockDeleteInMinutes != null && blockDeleteInMinutes !== 0 && !forceDelete) { if (originalMessage.ts == null) { return; }