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

Improve subroom checks (#5754)

Browse Source
This commit is contained in:
whales 2019-09-15 13:59:00 +09:30 committed by Astrid Halberkamp
parent fc2c69eb99
commit 2f0b8251ab
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/chat-commands.js
View File

@ -1061,6 +1061,9 @@ const commands = {
if (!room.isPrivate) {
return this.errorReply(`This room is already public.`);
}
if (room.parent && room.parent.isPrivate) {
return this.errorReply(`This room's parent ${room.parent.title} must be public for this room to be public.`);
}
if (room.isPersonal) return this.errorReply(`This room can't be made public.`);
if (room.privacySetter && user.can('nooverride', null, room) && !user.can('makeroom')) {
if (!room.privacySetter.has(user.userid)) {
@ -1083,7 +1086,12 @@ const commands = {
}
} else {
const settingName = (setting === true ? 'secret' : setting);
if (room.subRooms) return this.errorReply("Private rooms cannot have subrooms.");
if (room.subRooms) {
if (settingName === 'secret') return this.errorReply("Secret rooms cannot have subrooms.");
for (const subRoom of room.subRooms.values()) {
if (!subRoom.isPrivate) return this.errorReply(`Subroom ${subRoom.title} must be private to make this room private.`);
}
}
if (room.isPrivate === setting) {
if (room.privacySetter && !room.privacySetter.has(user.userid)) {
room.privacySetter.add(user.userid);
@ -1164,7 +1172,10 @@ const commands = {
const main = Rooms.search(target);
if (!main) return this.errorReply(`The room '${target}' does not exist.`);
if (main.isPrivate || !main.chatRoomData) return this.errorReply(`Only public rooms can have subrooms.`);
if (main.parent) return this.errorReply(`Subrooms cannot have subrooms.`);
if (main.isPrivate === true) return this.errorReply(`Only public and hidden rooms cannot have subrooms.`);
if (main.isPrivate && !room.isPrivate) return this.errorReply(`Private rooms cannot have public subrooms.`);
if (!main.chatRoomData) return this.errorReply(`Temporary rooms cannot be parent rooms.`);
if (room === main) return this.errorReply(`You cannot set a room to be a subroom of itself.`);
room.parent = main;