From e34b9e9ab0d907a4dbd99359362f5c336c46cc5d Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Tue, 28 Feb 2023 20:14:59 +0800 Subject: [PATCH] fix: session preview msg --- src/routes/chat/SessionList/index.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/routes/chat/SessionList/index.tsx b/src/routes/chat/SessionList/index.tsx index 969008b0..bb7e953b 100644 --- a/src/routes/chat/SessionList/index.tsx +++ b/src/routes/chat/SessionList/index.tsx @@ -34,13 +34,11 @@ const SessionList: FC = ({ tempSession }) => { useEffect(() => { const cSessions = channelIDs.map((id) => { const mids = channelMessage[id]; - // console.log("midssss", mids); - if (!mids || mids.length == 0) { return { key: `channel_${id}`, unreads: 0, id, type: "channel" }; } // 先转换成数字,再排序 - const mid = [...mids].map(mid => +mid).sort().pop(); + const mid = [...mids].sort((a, b) => +a - +b).pop(); return { key: `channel_${id}`, id, mid, type: "channel" }; }); const uSessions = DMs.map((id) => { @@ -49,15 +47,15 @@ const SessionList: FC = ({ tempSession }) => { return { key: `user_${id}`, unreads: 0, id, type: "user" }; } // 先转换成数字,再排序 - const mid = [...mids].map(mid => +mid).sort().pop(); + const mid = [...mids].sort((a, b) => +a - +b).pop(); return { key: `user_${id}`, type: "user", id, mid }; }); - const tmps = [...(cSessions as ChatSession[]), ...(uSessions as ChatSession[])].sort((a, b) => { + const temps = [...(cSessions as ChatSession[]), ...(uSessions as ChatSession[])].sort((a, b) => { const { mid: aMid = 0 } = a; const { mid: bMid = 0 } = b; return bMid - aMid; }); - setSessions(tempSession ? [tempSession, ...tmps] : tmps); + setSessions(tempSession ? [tempSession, ...temps] : temps); }, [ channelIDs, DMs,