Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-02 22:08:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

/blockpms no longer blocks challenges

Browse Source 
It makes the interaction of /blockpms, /blockchallenges, and
/away a lot more straightforward.
This commit is contained in:
Guangcong Luo 2015-03-25 05:26:09 -04:00
parent a4c3417cd1
commit 33dd974882
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands.js
View File

@ -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) {

4
config/commands.js
View File

@ -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;