From 9d278c87aa706d2c730d4ed51ee4e874d80a5554 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:09:56 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=96=87=E5=AD=97=E8=B5=B7=E3=81=93?= =?UTF-8?q?=E3=81=97=E3=81=95=E3=82=8C=E3=81=9F=E3=83=A1=E3=83=83=E3=82=BB?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=82=92=E3=83=AD=E3=82=B0=E3=81=AB=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=EF=BC=88=E3=82=B9=E3=83=94=E3=83=BC=E3=82=AB=E3=83=BC?= =?UTF-8?q?=EF=BC=89=EF=BC=88=E7=BF=BB=E8=A8=B3=E6=9C=AA=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-ui/logics/useMessage.js | 54 ++++++++++++++++--------------- src-ui/logics/useReceiveRoutes.js | 5 +-- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src-ui/logics/useMessage.js b/src-ui/logics/useMessage.js index 25bd42db..7522c6cc 100644 --- a/src-ui/logics/useMessage.js +++ b/src-ui/logics/useMessage.js @@ -12,16 +12,12 @@ export const useMessage = () => { sendMessage: (message) => { asyncStdoutToPython({id: "send_message", data: message}); const uuid = crypto.randomUUID(); - const date = new Date().toLocaleTimeString( - "ja-JP", - {hour12: false, hour: "2-digit", minute:"2-digit"}, - ); addMessageLogsStatus({ id: uuid, category: "sent", status: "pending", - created_at: date, + created_at: generateTimeData(), messages: { original: message, translated: [ @@ -44,30 +40,36 @@ export const useMessage = () => { }, currentMessageLogsStatus: currentMessageLogsStatus, - addMessageLogsStatus: (payload) => { + addSentMessageLog: (payload) => { const data = payload.data; - const message_object = { - id: crypto.randomUUID(), - created_at: new Date().toLocaleTimeString( - "ja-JP", - {hour12: false, hour: "2-digit", minute:"2-digit"}, - ), - category: "sent", - status: "ok", - messages : { - original: data.message, - translated: [], - }, - }; + const message_object = generateMessageObject(data, "sent"); + addMessageLogsStatus(message_object); + }, + addReceivedMessageLog: (payload) => { + const data = payload.data; + const message_object = generateMessageObject(data, "received"); addMessageLogsStatus(message_object); }, }; }; -// const asyncTestFunction = (...args) => { -// return new Promise((resolve) => { -// setTimeout(() => { -// resolve(...args); -// }, 3000); -// }); -// }; \ No newline at end of file +const generateTimeData = () => { + const data = new Date().toLocaleTimeString( + "ja-JP", + {hour12: false, hour: "2-digit", minute: "2-digit"}, + ); + return data; +}; + +const generateMessageObject = (data, category) => { + return { + id: crypto.randomUUID(), + created_at: generateTimeData(), + category: category, + status: "ok", + messages: { + original: data.message, + translated: [], + }, + }; +}; \ No newline at end of file diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index b666735c..be471b9e 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -9,7 +9,7 @@ export const useReceiveRoutes = () => { updateTranscriptionReceiveStatus, } = useMainFunction(); - const { addMessageLogsStatus } = useMessage(); + const { addSentMessageLog, addReceivedMessageLog } = useMessage(); const { updateSoftwareVersion, @@ -25,7 +25,8 @@ export const useReceiveRoutes = () => { "/config/version": updateSoftwareVersion, - "/action/transcription_send_mic_message": addMessageLogsStatus + "/action/transcription_send_mic_message": addSentMessageLog, + "/action/transcription_receive_speaker_message": addReceivedMessageLog }; const receiveRoutes = (parsed_data) => {