chore: Refactor friendList.ts to improve message read logic

takoserver · Jun 22, 2024 · 29c506d · 29c506d
1 parent 95496cb
commit 29c506d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/islands/Chats/Chat.tsx b/islands/Chats/Chat.tsx
@@ -316,12 +316,9 @@ export default function Home(
                                                             ),
                                                         )
                                                         setMessage("")
-                                                        // deno-lint-ignore no-explicit-any
                                                         setFriendList(
                                                             (prev: any) => {
-                                                                // deno-lint-ignore prefer-const
                                                                 let temp = prev
-                                                                // deno-lint-ignore no-explicit-any
                                                                 temp.map(
                                                                     (
                                                                         data:
@@ -331,7 +328,7 @@ export default function Home(
                                                                             data.roomid ==
                                                                                 roomid
                                                                         ) {
-                                                                            data.lastMessage =
+                                                                            data.latestMessage =
                                                                                 Message
                                                                             data.latestMessageTime =
                                                                                 new Date()

diff --git a/routes/api/v1/chats/friendList.ts b/routes/api/v1/chats/friendList.ts
@@ -114,7 +114,7 @@ export const handler = {
                         }).sort({ timestamp: -1 })
                         const isNewMessage = latestmessage?.read.find(
                             (read: User) =>
-                                read.userid === ctx.state.data.userid && latestmessage.userid !== ctx.state.data.userid,
+                                read.userid === ctx.state.data.userid || latestmessage.userid == ctx.state.data.userid,
                         )
                         const friendResult = {
                             roomName: friendName?.nickName,
@@ -185,7 +185,7 @@ export const handler = {
                         }).sort({ timestamp: -1 })
                         const isNewMessage = latestmessage?.read.find(
                             (read: User) =>
-                                read.userid === ctx.state.data.userid && latestmessage.userid !== ctx.state.data.userid
+                                read.userid === ctx.state.data.userid || latestmessage.userid == ctx.state.data.userid
                         )
                         if (OtherServerUserInfoJson.status === true) {
                             const remoteFriendResult = {