Refactor code to use 'timestamp' instead of 'time' in ChatTalkContent

takoserver · Jul 15, 2024 · 0df75fd · 0df75fd
1 parent 23b9931
commit 0df75fd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/components/chatmain.tsx b/components/chatmain.tsx
@@ -13,6 +13,7 @@ function chatmain({ state }: { state: AppStateType }) {
           </div>
           <ChatTalkTitleContent state={state}></ChatTalkTitleContent>
         </div>
+        <div class="mt-[54px]"></div>
         <ChatTalkContent state={state} />
       </div>
       <ChatSend state={state} />

diff --git a/islands/ChatTalkContent.tsx b/islands/ChatTalkContent.tsx
@@ -6,7 +6,8 @@ interface Messages {
   messageid: string;
   userName: string;
   messages: string;
-  time: string;
+  timestamp: string;
+  type: string;
 }
 function ChatTalkMain({ state }: { state: AppStateType }) {
   let SendPrimary = true;
@@ -15,25 +16,25 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
   return (
     <>
       {state.talkData.value.map((data: any, index: number) => {
-        const date = new Date(data.time);
+        const date = new Date(data.timestamp);
         const isEncodeDate = new Date(DateState).toLocaleDateString() !==
           date.toLocaleDateString();
-        DateState = data.time;
-        if (data.type == "message") {
-          if (data.sender == state.userName) {
+        DateState = data.timestamp;
+        if (data.type == "text") {
+          if (data.userName == state.userName) {
             if (SendPrimary) {
               SendPrimary = false;
               OtherPrimary = true;
               return (
                 <>
                   {isEncodeDate && (
                     <ChatDate
-                      date={new Date(data.time)}
+                      date={new Date(data.timestamp)}
                     />
                   )}
                   <ChatSendMessage
                     isRead={data.isRead}
-                    time={data.time}
+                    time={data.timestamp}
                     message={data.message}
                     isPrimary={true}
                     isSendPrimary={true}
@@ -48,12 +49,12 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
                 <>
                   {isEncodeDate && (
                     <ChatDate
-                      date={new Date(data.time)}
+                      date={new Date(data.timestamp)}
                     />
                   )}
                   <ChatSendMessage
                     isRead={data.isRead}
-                    time={data.time}
+                    time={data.timestamp}
                     message={data.message}
                     isPrimary={true}
                     isSendPrimary={false}
@@ -66,12 +67,12 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
               <>
                 {isEncodeDate && (
                   <ChatDate
-                    date={new Date(data.time)}
+                    date={new Date(data.timestamp)}
                   />
                 )}
                 <ChatSendMessage
                   isRead={data.isRead}
-                  time={data.time}
+                  time={data.timestamp}
                   message={data.message}
                   isPrimary={false}
                   isSendPrimary={false}

diff --git a/routes/api/v2/client/talks/friend/data.ts b/routes/api/v2/client/talks/friend/data.ts
@@ -87,7 +87,7 @@ export const handler = {
                 userName: CacheUser.userName,
                 message: message.message,
                 timestamp: message.timestamp,
-                type: message.type,
+                type: message.messageType,
               };
           }
         }
@@ -106,7 +106,7 @@ export const handler = {
                 userName: "Unknown",
                 message: message.message,
                 timestamp: message.timestamp,
-                type: message.type,
+                type: message.messageType,
               };
           }
         }
@@ -117,7 +117,7 @@ export const handler = {
                 userName: userInfo?.userName,
                 message: message.message,
                 timestamp: message.timestamp,
-                type: message.type,
+                type: message.messageType,
               };
         }
       }));