Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-03-21 17:50:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preact: properly extract targetRoomId from roomId in UserOptionsPanel (#2568)

Browse Source
This commit is contained in:
Aurastic 2026-03-15 14:19:59 +05:30 committed by GitHub
parent a5de51e93d
commit 71341b1fba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
play.pokemonshowdown.com/src/panel-popups.tsx
View File

@ -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<string, string>,
};
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;