From 71341b1fbaf6459c580c70260007eda55a3b6ee8 Mon Sep 17 00:00:00 2001 From: Aurastic <33085835+ISenseAura@users.noreply.github.com> Date: Sun, 15 Mar 2026 14:19:59 +0530 Subject: [PATCH] Preact: properly extract targetRoomId from roomId in UserOptionsPanel (#2568) --- play.pokemonshowdown.com/src/panel-popups.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/play.pokemonshowdown.com/src/panel-popups.tsx b/play.pokemonshowdown.com/src/panel-popups.tsx index a2c28c459..67eab3d8a 100644 --- a/play.pokemonshowdown.com/src/panel-popups.tsx +++ b/play.pokemonshowdown.com/src/panel-popups.tsx @@ -1,5 +1,5 @@ import preact from "../js/lib/preact"; -import { toID, toRoomid, toUserid, Dex } from "./battle-dex"; +import { toID, toRoomid, toUserid, Dex, PSUtils } from "./battle-dex"; import type { ID } from "./battle-dex-data"; import { BattleLog } from "./battle-log"; import { PSLoginServer } from "./client-connection"; @@ -230,7 +230,7 @@ class UserOptionsPanel extends PSRoomPanel { data?: Record, }; getTargets() { - const [, targetUser, targetRoomid] = this.props.room.id.split('-'); + const [, targetUser, targetRoomid] = PSUtils.splitFirst(this.props.room.id, '-', 2); let targetRoom = (PS.rooms[targetRoomid] || null) as ChatRoom | null; if (targetRoom?.type !== 'chat') targetRoom = targetRoom?.getParent() as ChatRoom; if (targetRoom?.type !== 'chat') targetRoom = targetRoom?.getParent() as ChatRoom;