From a56dc4866004ab74984a59edd2f73b1259a5220f Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Sun, 25 Jul 2021 19:04:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=99=BB=E5=BD=95=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=E8=AF=B7=E6=B1=82=E5=8A=A0=E5=85=A5=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/api/socket.ts                     | 4 +++-
 shared/redux/hooks/useConverseMessage.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shared/api/socket.ts b/shared/api/socket.ts
index 34bb3460..a1fd8f4e 100644
--- a/shared/api/socket.ts
+++ b/shared/api/socket.ts
@@ -87,7 +87,9 @@ export function createSocket(token: string): Promise<AppSocket> {
     });
     socket.once('connect', () => {
       // 连接成功
-      resolve(new AppSocket(socket));
+      const appSocket = new AppSocket(socket);
+      appSocket.request('chat.converse.findAndJoinRoom'); // 立即请求加入房间
+      resolve(appSocket);
     });
     socket.once('error', () => {
       reject();
diff --git a/shared/redux/hooks/useConverseMessage.ts b/shared/redux/hooks/useConverseMessage.ts
index 10a825e3..306d8219 100644
--- a/shared/redux/hooks/useConverseMessage.ts
+++ b/shared/redux/hooks/useConverseMessage.ts
@@ -55,7 +55,7 @@ export function useConverseMessage(context: ConverseContext) {
         })
       );
     } else {
-      // 已存在
+      // 已存在会话
       if (!converse.hasFetchedHistory) {
         // 没有获取过历史消息
         // 拉取历史消息