From 59f3fea8403cfc3c6b813f01c2927c7e66fb2b32 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Tue, 7 Jan 2025 11:25:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(wai):=20=E5=A4=9A=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E6=B6=88=E6=81=AF,=20=E5=AD=98=E5=82=A8=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/core/handler/whatsappHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wai-server/core/handler/whatsappHandler.js b/wai-server/core/handler/whatsappHandler.js index 674cc5c..861d304 100644 --- a/wai-server/core/handler/whatsappHandler.js +++ b/wai-server/core/handler/whatsappHandler.js @@ -175,7 +175,7 @@ const setupMessageHandler = () => { // 存储文件 const filePath = messageData[messageData.type].filePath; const webLink = await uploadMediaFile(filePath); - waiContentFieldsToDB.link = webLink; + waiContentFieldsToDB.IVADS_link = webLink; } const msgRow = await upsertOutboundMessage( From 6372e27d589ad5da89ec2d3f6d3a0a464ddcfcf7 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Tue, 7 Jan 2025 11:27:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(wai):=20=E5=A4=9A=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E6=B6=88=E6=81=AF,=20=E5=AD=98=E5=82=A8=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/core/handler/whatsappHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wai-server/core/handler/whatsappHandler.js b/wai-server/core/handler/whatsappHandler.js index 861d304..75037c0 100644 --- a/wai-server/core/handler/whatsappHandler.js +++ b/wai-server/core/handler/whatsappHandler.js @@ -170,7 +170,7 @@ const setupMessageHandler = () => { upsertFields.evt_id = webhookBody.id; const pusher = { customerProfile_id: waiMessage.customerProfile?.id || '', customerProfile_name: waiMessage.customerProfile?.name || '' }; const record = objectMapper(waiMessage, { from: 'from', to: 'to', status: 'msg_status', type: 'msgtype' }, false); - const waiContentFieldsToDB = waiContentToDB(messageData); + const waiContentFieldsToDB = messageData.type ? waiContentToDB(messageData) : {}; if (['image', 'sticker', 'audio', 'video', 'document'].includes(waiMessage.type)) { // 存储文件 const filePath = messageData[messageData.type].filePath; From b6d96607a2564bb03f5078c634c9ad6760dcf9f6 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Tue, 7 Jan 2025 11:50:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?perf(wai):=20=E9=81=BF=E5=85=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=AD=98=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/core/handler/whatsappHandler.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wai-server/core/handler/whatsappHandler.js b/wai-server/core/handler/whatsappHandler.js index 75037c0..bb6ecfb 100644 --- a/wai-server/core/handler/whatsappHandler.js +++ b/wai-server/core/handler/whatsappHandler.js @@ -8,7 +8,7 @@ const { sessionStore } = require('..'); const { createWhatsApp } = require('../../core/baileys'); const { updateConnection, addCurrentConnection, resetConnection, getConnection } = require('../../services/connections.service'); const { getOutboundMessage, upsertOutboundMessage } = require('../../services/outbound_messages.service'); -const { objectMapper, pick } = require('../../utils/commons.util'); +const { objectMapper, pick, isEmpty } = require('../../utils/commons.util'); const { logger, getUserLogger } = require('../../utils/logger.util'); const { DbData, waiContentToDB, uploadMediaFile } = require('../../helper/wai.msg.helper'); @@ -50,7 +50,7 @@ const webhookBodyBuilder = (messageData, messageType) => { id: uniqueMsgId(messageData) || messageData.id || generateId(), wamid: messageData.id || '', // direction: directionField[messageType], - status: statusMapped?.[messageData.status] || messageData.status || '', + status: messageData.direction === 'inbound' ? '' : statusMapped?.[messageData.status] || messageData.status || '', externalId: messageData?.externalId || '', }, }; @@ -171,7 +171,7 @@ const setupMessageHandler = () => { const pusher = { customerProfile_id: waiMessage.customerProfile?.id || '', customerProfile_name: waiMessage.customerProfile?.name || '' }; const record = objectMapper(waiMessage, { from: 'from', to: 'to', status: 'msg_status', type: 'msgtype' }, false); const waiContentFieldsToDB = messageData.type ? waiContentToDB(messageData) : {}; - if (['image', 'sticker', 'audio', 'video', 'document'].includes(waiMessage.type)) { + if (isEmpty(savedMsg.IVADS_link) && ['image', 'sticker', 'audio', 'video', 'document'].includes(waiMessage.type)) { // 存储文件 const filePath = messageData[messageData.type].filePath; const webLink = await uploadMediaFile(filePath); From 9bef019d0958b9c31ed328404d2f93d2d0c70808 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Tue, 7 Jan 2025 12:50:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(wai):=20=E5=BC=95=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/helper/wai.msg.helper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wai-server/helper/wai.msg.helper.js b/wai-server/helper/wai.msg.helper.js index 2a33152..3548913 100644 --- a/wai-server/helper/wai.msg.helper.js +++ b/wai-server/helper/wai.msg.helper.js @@ -62,7 +62,7 @@ const mediaMsg = { filename: row.IVADS_filename, }, type: row.msgtype, - ...(row.context_id ? { context: { message_id: row.context_id, from: row.context_from } } : {}), + ...(row.context_id ? { context: { id: row.context_id, from: row.context_from } } : {}), }), }; @@ -103,7 +103,7 @@ const waiMsgTypeMapped = { DbData: row => ({ type: 'text', text: { body: row.text_body, preview_url: row.text_preview_url }, - ...(row.context_id ? { context: { message_id: row.context_id, from: row.context_from } } : {}), + ...(row.context_id ? { context: { id: row.context_id, from: row.context_from } } : {}), }), }, image: { From c0d70f810d47ed47539743d3caf912d1dae0fdfd Mon Sep 17 00:00:00 2001 From: Lei OT Date: Tue, 7 Jan 2025 12:51:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?perf(=E5=89=8D=E7=AB=AF):=20=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=B6=88=E6=81=AF=E5=9C=A8=E5=BC=95=E7=94=A8/?= =?UTF-8?q?=E6=9C=80=E8=BF=91=20=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/channel/bubbleMsgUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/channel/bubbleMsgUtils.js b/src/channel/bubbleMsgUtils.js index cab1361..2e36da9 100644 --- a/src/channel/bubbleMsgUtils.js +++ b/src/channel/bubbleMsgUtils.js @@ -550,7 +550,7 @@ export const whatsappMsgTypeMapped = { width: 'auto', height: 200, alt: msg.image?.caption || '', - message: msg.image?.caption || '', + message: msg.image?.caption || '[图片]', }), }, sticker: {