Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-11 18:55:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow /blockpms to block locked and semilocked users (#5923)

Browse Source
This commit is contained in:
Lusamine
2019-10-31 22:04:52 -05:00
committed by Guangcong Luo
parent c2d71d43f7
commit 684b03e2f3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/chat-commands.js
View File

@@ -679,7 +679,7 @@ const commands = {
if (target in Config.groups) {
user.blockPMs = target;
this.sendReply(`You are now blocking private messages, except from staff and ${target}.`);
} else if (target === 'autoconfirmed' || target === 'trusted') {
} else if (target === 'autoconfirmed' || target === 'trusted' || target === 'unlocked') {
user.blockPMs = target;
this.sendReply(`You are now blocking private messages, except from staff and ${target} users.`);
} else {
@@ -691,7 +691,7 @@ const commands = {
},
blockpmshelp: [
`/blockpms - Blocks private messages except from staff. Unblock them with /unblockpms.`,
`/blockpms [ac/trusted/+] - Blocks private messages except from staff and the specified group.`,
`/blockpms [unlocked/ac/trusted/+] - Blocks private messages except from staff and the specified group.`,
],
'!unblockpms': true,

1
server/users.ts
View File

@@ -623,6 +623,7 @@ export class User extends Chat.MessageContext {
}
authAtLeast(minAuth: string, room: BasicChatRoom | null = null) {
if (!minAuth || minAuth === ' ') return true;
if (minAuth === 'unlocked') return !(this.locked || this.semilocked);
if (minAuth === 'trusted' && this.trusted) return true;
if (minAuth === 'autoconfirmed' && this.autoconfirmed) return true;