From e90aeeee83fa4a5ee2dbbbb49a71a63068298dfc Mon Sep 17 00:00:00 2001 From: Zerapium Date: Thu, 17 Jul 2025 19:46:39 +0530 Subject: [PATCH 1/3] autojoin minimized rooms --- play.pokemonshowdown.com/src/client-main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play.pokemonshowdown.com/src/client-main.ts b/play.pokemonshowdown.com/src/client-main.ts index 35646bb3a..ee57eb395 100644 --- a/play.pokemonshowdown.com/src/client-main.ts +++ b/play.pokemonshowdown.com/src/client-main.ts @@ -2656,7 +2656,7 @@ export const PS = new class extends PSModel { if (!PS.server.registered) return; let autojoins: string[] = []; let autojoinCount = 0; - let rooms = this.rightRoomList; + let rooms = [...this.rightRoomList, ...this.leftRoomList, ...this.miniRoomList]; for (let roomid of rooms) { let room = PS.rooms[roomid] as ChatRoom; if (!room) return; From 041c2d9c45ac07cfdd5ef70f098ba00ded269a16 Mon Sep 17 00:00:00 2001 From: Zerapium Date: Fri, 18 Jul 2025 12:45:01 +0530 Subject: [PATCH 2/3] do not allow sending messages to expired rooms --- play.pokemonshowdown.com/src/client-main.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/play.pokemonshowdown.com/src/client-main.ts b/play.pokemonshowdown.com/src/client-main.ts index ee57eb395..75ab7251e 100644 --- a/play.pokemonshowdown.com/src/client-main.ts +++ b/play.pokemonshowdown.com/src/client-main.ts @@ -1694,6 +1694,7 @@ export class PSRoom extends PSStreamModel implements RoomOptions { this.sendDirect(msg); } sendDirect(msg: string) { + if (this.connected === 'expired') return this.add(`This room has expired (you can't chat in it anymore)`); PS.send(msg, this.id); } destroy() { From 06facb1ea3b15d31e836e2b73fce789e468b933c Mon Sep 17 00:00:00 2001 From: Zerapium Date: Fri, 18 Jul 2025 12:47:20 +0530 Subject: [PATCH 3/3] revert --- play.pokemonshowdown.com/src/client-main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/play.pokemonshowdown.com/src/client-main.ts b/play.pokemonshowdown.com/src/client-main.ts index 75ab7251e..ee57eb395 100644 --- a/play.pokemonshowdown.com/src/client-main.ts +++ b/play.pokemonshowdown.com/src/client-main.ts @@ -1694,7 +1694,6 @@ export class PSRoom extends PSStreamModel implements RoomOptions { this.sendDirect(msg); } sendDirect(msg: string) { - if (this.connected === 'expired') return this.add(`This room has expired (you can't chat in it anymore)`); PS.send(msg, this.id); } destroy() {