From 959b0af8a5d2f46039e6f24680aa7a6974d99c55 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Thu, 4 Dec 2025 15:30:41 +0000
Subject: [PATCH] Preact: Fix DMs not reconnecting

Fixes the thing where, after reconnecting, DMs still looked
disconnected.
---
 play.pokemonshowdown.com/src/client-main.ts     |  2 +-
 play.pokemonshowdown.com/src/panel-chat.tsx     | 17 +++++++++++------
 play.pokemonshowdown.com/src/panel-mainmenu.tsx |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/play.pokemonshowdown.com/src/client-main.ts b/play.pokemonshowdown.com/src/client-main.ts
index 570eddc37..0c4965b0c 100644
--- a/play.pokemonshowdown.com/src/client-main.ts
+++ b/play.pokemonshowdown.com/src/client-main.ts
@@ -970,7 +970,7 @@ export class PSRoom extends PSStreamModel<Args | null> implements RoomOptions {
 	 * the room isn't connected to the game server but to something
 	 * else.
 	 *
-	 * `true` for DMs for historical reasons (TODO: fix)
+	 * 'client-only' for DMs
 	 */
 	connected: 'autoreconnect' | 'client-only' | 'expired' | boolean = false;
 	/**
diff --git a/play.pokemonshowdown.com/src/panel-chat.tsx b/play.pokemonshowdown.com/src/panel-chat.tsx
index 17b678383..3ac73debd 100644
--- a/play.pokemonshowdown.com/src/panel-chat.tsx
+++ b/play.pokemonshowdown.com/src/panel-chat.tsx
@@ -68,8 +68,12 @@ export class ChatRoom extends PSRoom {
 	}
 	override connect() {
 		if (!this.connected || this.connected === 'autoreconnect') {
-			if (this.pmTarget === null) PS.send(`/join ${this.id}`);
-			this.connected = true;
+			if (this.pmTarget === null) {
+				PS.send(`/join ${this.id}`);
+				this.connected = true;
+			} else {
+				this.connected = 'client-only';
+			}
 			this.connectWhenLoggedIn = false;
 		}
 	}
@@ -729,7 +733,6 @@ export class ChatRoom extends PSRoom {
 	}
 
 	override destroy() {
-		if (this.pmTarget) this.connected = false;
 		if (this.battle) {
 			// since battle is defined here, we might as well deallocate it here
 			this.battle.destroy();
@@ -1172,19 +1175,21 @@ export class ChatTextEntry extends preact.Component<{
 	override render() {
 		const { room } = this.props;
 		const OLD_TEXTBOX = false;
-		const canTalk = PS.user.named || room.id === 'dm-';
 		if (room.connected === 'client-only' && room.id.startsWith('battle-')) {
 			return <div
 				class="chat-log-add hasuserlist" onClick={this.focusIfNoSelection} style={{ left: this.props.left || 0 }}
 			><CopyableURLBox url={`https://psim.us/r/${room.id.slice(7)}`} /></div>;
 		}
+
+		const canTalk = PS.user.named || room.id === 'dm-';
+		const connected = room.connected === true || room.connected === 'client-only';
 		return <div
 			class="chat-log-add hasuserlist" onClick={this.focusIfNoSelection} style={{ left: this.props.left || 0 }}
 		>
 			<form class={`chatbox${this.props.tinyLayout ? ' nolabel' : ''}`} style={canTalk ? {} : { display: 'none' }}>
 				<label style={`color:${BattleLog.usernameColor(PS.user.userid)}`}>{PS.user.name}:</label>
 				{OLD_TEXTBOX ? <textarea
-					class={room.connected === true && canTalk ? 'textbox autofocus' : 'textbox disabled'}
+					class={connected && canTalk ? 'textbox autofocus' : 'textbox disabled'}
 					autofocus
 					rows={1}
 					onInput={this.update}
@@ -1192,7 +1197,7 @@ export class ChatTextEntry extends preact.Component<{
 					style={{ resize: 'none', width: '100%', height: '16px', padding: '2px 3px 1px 3px' }}
 					placeholder={PSView.focusPreview(room)}
 				/> : <ChatTextBox
-					disabled={room.connected !== true || !canTalk}
+					disabled={!connected || !canTalk}
 					placeholder={PSView.focusPreview(room)}
 				/>}
 			</form>
diff --git a/play.pokemonshowdown.com/src/panel-mainmenu.tsx b/play.pokemonshowdown.com/src/panel-mainmenu.tsx
index 9ef5ce37c..e3d8825b7 100644
--- a/play.pokemonshowdown.com/src/panel-mainmenu.tsx
+++ b/play.pokemonshowdown.com/src/panel-mainmenu.tsx
@@ -468,7 +468,7 @@ class NewsPanel extends PSRoomPanel {
 	change = (ev: Event) => {
 		const target = ev.currentTarget as HTMLInputElement;
 		if (target.value === '1') {
-			document.cookie = "preactalpha=1; expires=Thu, 1 Dec 2025 12:00:00 UTC; path=/";
+			document.cookie = "preactalpha=1; expires=Thu, 1 Jan 2026 12:00:00 UTC; path=/";
 		} else {
 			document.cookie = "preactalpha=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
 		}