From 21ea42f63008ab3d4a563392edbf6762763df08b Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 22 Jan 2025 09:35:33 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BB=9F=E4=B8=80=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E7=BE=A4=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wai-server/core/baileys/helper.js | 5 +++++
 wai-server/core/baileys/index.js  | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/wai-server/core/baileys/helper.js b/wai-server/core/baileys/helper.js
index ad684ea..7f763f5 100644
--- a/wai-server/core/baileys/helper.js
+++ b/wai-server/core/baileys/helper.js
@@ -20,6 +20,10 @@ const decodeJid = number => {
   }
 };
 
+const isJidPersonal = jid => {
+  return isJidUser(jid) || isJidBroadcast(jid) || isLidUser(jid);
+}
+
 // status: sent read delivered failed
 // 2 sent, 3 delivered, 4 read, 0 error
 const formatStatus = status => {
@@ -79,4 +83,5 @@ module.exports = {
   formatStatus,
   encodeJid,
   decodeJid,
+  isJidPersonal,
 };
diff --git a/wai-server/core/baileys/index.js b/wai-server/core/baileys/index.js
index 120eafa..3352589 100644
--- a/wai-server/core/baileys/index.js
+++ b/wai-server/core/baileys/index.js
@@ -15,7 +15,7 @@ const { writeFile } = require('fs/promises');
 const waEmitter = require('../emitter');
 const serverConfig = require('../../config').server;
 
-const { encodeJid, decodeJid, formatStatus, formatTimestamp, getFileExtension, uint8ArrayToBase64 } = require('./helper');
+const { encodeJid, decodeJid, formatStatus, formatTimestamp, getFileExtension, uint8ArrayToBase64, isJidPersonal } = require('./helper');
 const generateId = require('../../utils/generateId.util');
 const NodeCache = require('node-cache');
 const P = require('pino');
@@ -84,7 +84,7 @@ const createWhatsApp = async phone => {
           // 如果是群发(xxx@broadcast)，participant 是发送人，不然则是 remoteJid
           const remoteNo = isJidBroadcast(msg.key.remoteJid) ? decodeJid(msg.key.participant) : decodeJid(msg.key.remoteJid);
           const externalId = externalIdCache.get(msg.key.id);
-          const isPersonal = isJidUser(msg.key.remoteJid) || isJidBroadcast(msg.key.remoteJid);
+          const isPersonal = isJidPersonal(msg.key.remoteJid);
           const conversationType = isPersonal ? 'individual' : 'group';
           const isGroup = isJidGroup(msg.key.remoteJid);
           let groupSubject = groupSubjectCache.get(msg.key.remoteJid);
@@ -174,7 +174,7 @@ const createWhatsApp = async phone => {
             // 如果是群发(xxx@broadcast)，participant 是发送人，不然则是 remoteJid
             const remoteNo = isJidBroadcast(msg.key.remoteJid) ? decodeJid(msg.key.participant) : decodeJid(msg.key.remoteJid);
             const externalId = externalIdCache.get(msg.key.id);
-            const isPersonal = isJidUser(msg.key.remoteJid) || isJidBroadcast(msg.key.remoteJid);
+            const isPersonal = isJidPersonal(msg.key.remoteJid);
             const conversationType = isPersonal ? 'individual' : 'group';
 
             const emitEventName = msg.key.fromMe ? 'message:updated' : 'message:received';
@@ -224,7 +224,7 @@ const createWhatsApp = async phone => {
         // 如果是群发(xxx@broadcast)，participant 是发送人，不然则是 remoteJid
         const remoteNo = isJidBroadcast(msg.key.remoteJid) ? decodeJid(msg.key.participant) : decodeJid(msg.key.remoteJid);
         const externalId = externalIdCache.get(msg.key.id);
-        const isPersonal = isJidUser(msg.key.remoteJid) || isJidBroadcast(msg.key.remoteJid);
+        const isPersonal = isJidPersonal(msg.key.remoteJid);
         const conversationType = isPersonal ? 'individual' : 'group';
 
         const msgDirection = msg.key.fromMe ? 'outbound' : 'inbound';