@@ -9,19 +9,11 @@ import {
99import type { FriendRequest } from '../model/friend' ;
1010import { getCachedConverseInfo } from '../cache/cache' ;
1111import type { GroupInfo } from '../model/group' ;
12- import {
13- ChatMessage ,
14- ChatMessageReaction ,
15- fetchConverseLastMessages ,
16- } from '../model/message' ;
12+ import { ChatMessage , ChatMessageReaction } from '../model/message' ;
1713import { socketEventListeners } from '../manager/socket' ;
1814import { showToasts } from '../manager/ui' ;
1915import { t } from '../i18n' ;
20- import {
21- ChatConverseInfo ,
22- ChatConverseType ,
23- fetchUserAck ,
24- } from '../model/converse' ;
16+ import { ChatConverseInfo , ChatConverseType } from '../model/converse' ;
2517import { appendUserDMConverse } from '../model/user' ;
2618import { sharedEvent } from '../event' ;
2719import type { InboxItem } from '../model/inbox' ;
@@ -61,7 +53,7 @@ function initial(socket: AppSocket, store: AppStore) {
6153 console . log ( '初始化Redux上下文...' ) ;
6254
6355 // 立即请求加入房间
64- const conversesP = socket
56+ socket
6557 . request < {
6658 dmConverseIds : string [ ] ;
6759 groupIds : string [ ] ;
@@ -77,30 +69,6 @@ function initial(socket: AppSocket, store: AppStore) {
7769 throw new Error ( 'findAndJoinRoom failed' ) ;
7870 } ) ;
7971
80- Promise . all ( [ conversesP , fetchUserAck ( ) ] ) . then (
81- ( [ { dmConverseIds, textPanelIds } , acks ] ) => {
82- /**
83- * TODO: 这里的逻辑还需要优化
84- * 可能ack和lastMessageMap可以无关?
85- */
86-
87- // 设置已读消息
88- acks . forEach ( ( ackInfo ) => {
89- store . dispatch (
90- chatActions . setConverseAck ( {
91- converseId : ackInfo . converseId ,
92- lastMessageId : ackInfo . lastMessageId ,
93- } )
94- ) ;
95- } ) ;
96-
97- const converseIds = [ ...dmConverseIds , ...textPanelIds ] ;
98- fetchConverseLastMessages ( converseIds ) . then ( ( list ) => {
99- store . dispatch ( chatActions . setLastMessageMap ( list ) ) ;
100- } ) ;
101- }
102- ) ;
103-
10472 // 获取好友列表
10573 socket
10674 . request < { id : string ; nickname ?: string } [ ] > ( 'friend.getAllFriends' )
0 commit comments