diff --git a/commands.js b/commands.js index aba7a16b37..dbf0a3c651 100644 --- a/commands.js +++ b/commands.js @@ -169,9 +169,9 @@ var commands = exports.commands = { user.ignorePMs = true; if (target in Config.groups) { user.ignorePMs = target; - return this.sendReply("You are now blocking private messages (including challenges), except from staff and " + target + "."); + return this.sendReply("You are now blocking private messages, except from staff and " + target + "."); } - return this.sendReply("You are now blocking private messages (including challenges), except from staff."); + return this.sendReply("You are now blocking private messages, except from staff."); }, unblockpm: 'unignorepms', @@ -1909,7 +1909,7 @@ var commands = exports.commands = { if (!targetUser || !targetUser.connected) { return this.popupReply("The user '" + this.targetUsername + "' was not found."); } - if ((targetUser.blockChallenges || targetUser.ignorePMs) && !user.can('bypassblocks', targetUser)) { + if (targetUser.blockChallenges && !user.can('bypassblocks', targetUser)) { return this.popupReply("The user '" + this.targetUsername + "' is not accepting challenges right now."); } if (Config.pmmodchat) { diff --git a/config/commands.js b/config/commands.js index d3e40072e5..840a6c5b68 100644 --- a/config/commands.js +++ b/config/commands.js @@ -1681,7 +1681,7 @@ var commands = exports.commands = { } if (target === 'away' || target === 'idle') { matched = true; - this.sendReply("/away - Blocks challenges and private messages separately. Different from /blockpms in that it will still block challenges if you're staff. Unblock them with /back."); + this.sendReply("/away - Blocks challenges and private messages. Unblock them with /back."); } if (target === 'blockchallenges') { matched = true; @@ -1689,7 +1689,7 @@ var commands = exports.commands = { } if (target === 'blockpms' || target === 'ignorepms') { matched = true; - this.sendReply("/blockpms - Blocks private messages (including challenges). Unblock them with /unignorepms."); + this.sendReply("/blockpms - Blocks private messages. Unblock them with /unignorepms."); } if (target === 'back') { matched = true;