Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-08-27 19:44:50 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix /blockchallenges friends (#8689)

Browse Source
This commit is contained in:
Alexander B
2022-03-16 13:29:18 -05:00
committed by GitHub
parent d780ab74c3
commit 618b8a0ea0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/ladders.ts
View File

@@ -163,11 +163,17 @@ class Ladder extends LadderStore {
connection.popup(`You are already challenging someone. Cancel that challenge before challenging someone else.`);
return false;
}
if (targetUser.settings.blockChallenges && !user.can('bypassblocks', targetUser) && (
targetUser.settings.blockChallenges === true ||
targetUser.settings.blockChallenges === 'friends' && targetUser.friends?.has(user.id) ||
!Users.globalAuth.atLeast(user, targetUser.settings.blockChallenges as AuthLevel)
)) {
let blockChallenge: boolean;
if (typeof targetUser.settings.blockChallenges === 'boolean') {
blockChallenge = targetUser.settings.blockChallenges;
} else if (targetUser.settings.blockChallenges === 'friends') {
blockChallenge = !targetUser.friends?.has(user.id);
} else {
blockChallenge = !Users.globalAuth.atLeast(user, targetUser.settings.blockChallenges);
}
if (blockChallenge && !user.can('bypassblocks', targetUser)) {
connection.popup(`The user '${targetUser.name}' is not accepting challenges right now.`);
Chat.maybeNotifyBlocked('challenge', targetUser, user);
return false;