From 652e336d86e03685321ec556d5811cc4d8cbf752 Mon Sep 17 00:00:00 2001
From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:37:56 +0900
Subject: [PATCH] =?UTF-8?q?[Update/WIP]=20=E3=83=A1=E3=83=83=E3=82=BB?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E9=80=81=E4=BF=A1=E3=83=AA=E3=82=AF=E3=82=A8?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E6=99=82=E3=81=ABid=E3=82=92=E4=BB=98?=
 =?UTF-8?q?=E4=B8=8E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-ui/logics/useMainFunction.js  |  8 -------
 src-ui/logics/useMessage.js       | 36 +++++++++++++++++--------------
 src-ui/logics/useReceiveRoutes.js |  7 +++++-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src-ui/logics/useMainFunction.js b/src-ui/logics/useMainFunction.js
index cae1c4e6..c91d6785 100644
--- a/src-ui/logics/useMainFunction.js
+++ b/src-ui/logics/useMainFunction.js
@@ -82,12 +82,4 @@ export const useMainFunction = () => {
         },
         currentForegroundStatus: currentForegroundStatus,
     };
-};
-
-const asyncTestFunction = (...args) => {
-    return new Promise((resolve) => {
-        setTimeout(() => {
-            resolve(...args);
-        }, 3000);
-    });
 };
\ No newline at end of file
diff --git a/src-ui/logics/useMessage.js b/src-ui/logics/useMessage.js
index 7522c6cc..5318a896 100644
--- a/src-ui/logics/useMessage.js
+++ b/src-ui/logics/useMessage.js
@@ -10,8 +10,12 @@ export const useMessage = () => {
 
     return {
         sendMessage: (message) => {
-            asyncStdoutToPython({id: "send_message", data: message});
             const uuid = crypto.randomUUID();
+            const send_message_object = {
+                id: uuid,
+                message: message,
+            };
+            asyncStdoutToPython("/controller/callback_messagebox_press_key_enter", send_message_object);
 
             addMessageLogsStatus({
                 id: uuid,
@@ -20,26 +24,16 @@ export const useMessage = () => {
                 created_at: generateTimeData(),
                 messages: {
                     original: message,
-                    translated: [
-                        message,
-                    ],
+                    translated: [],
                 },
             });
-
-            setTimeout(() => {
-                const updateItemById = (id) => (prevItems) => {
-                    return prevItems.map(item => {
-                        if (item.id === id) {
-                            item.status = "ok";
-                        }
-                        return item;
-                    });
-                };
-                updateMessageLogsStatus(updateItemById(uuid));
-            }, 3000);
         },
         currentMessageLogsStatus: currentMessageLogsStatus,
 
+        updateSentMessageLog: (payload) => {
+            const data = payload.data;
+            updateMessageLogsStatus(updateItemById(data.id));
+        },
         addSentMessageLog: (payload) => {
             const data = payload.data;
             const message_object = generateMessageObject(data, "sent");
@@ -72,4 +66,14 @@ const generateMessageObject = (data, category) => {
             translated: [],
         },
     };
+};
+
+
+const updateItemById = (id) => (prev_items) => {
+    return prev_items.map(item => {
+        if (item.id === id) {
+            item.status = "ok";
+        }
+        return item;
+    });
 };
\ No newline at end of file
diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js
index be471b9e..bfd33756 100644
--- a/src-ui/logics/useReceiveRoutes.js
+++ b/src-ui/logics/useReceiveRoutes.js
@@ -9,7 +9,11 @@ export const useReceiveRoutes = () => {
         updateTranscriptionReceiveStatus,
     } = useMainFunction();
 
-    const { addSentMessageLog, addReceivedMessageLog } = useMessage();
+    const {
+        updateSentMessageLog,
+        addSentMessageLog,
+        addReceivedMessageLog,
+    } = useMessage();
 
     const {
         updateSoftwareVersion,
@@ -25,6 +29,7 @@ export const useReceiveRoutes = () => {
 
         "/config/version": updateSoftwareVersion,
 
+        "/controller/callback_messagebox_press_key_enter": updateSentMessageLog,
         "/action/transcription_send_mic_message": addSentMessageLog,
         "/action/transcription_receive_speaker_message": addReceivedMessageLog
     };