fix: 🐛 set all user to friend

juzibot · Jul 20, 2023 · e36dba3 · e36dba3
1 parent 8d83e56
commit e36dba3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/helper/pure-function/contact-raw-payload-parser.ts b/src/helper/pure-function/contact-raw-payload-parser.ts
@@ -31,7 +31,7 @@ export function parserContactRawPayload (contactPayload: WhatsAppContactPayload,
 
   const number = contactPayload.number || contactPayload.id.user
 
-  const isFriend = contactPayload.isMyContact && contactPayload.isUser
+  const isFriend = contactPayload.isUser
   return {
     avatar: contactPayload.avatar,
     friend: isFriend,

diff --git a/src/whatsapp/event-handler/message-event-handler.ts b/src/whatsapp/event-handler/message-event-handler.ts
@@ -61,8 +61,8 @@ export default class MessageEventHandler extends WhatsAppBase {
 
     const contactId = message.from
     if (contactId && isContactId(contactId)) {
-      const contactIds = await cacheManager.getContactIdList()
-      const notFriend = !contactIds.find(c => c === contactId)
+      const contact = await cacheManager.getContactOrRoomRawPayload(contactId)
+      const notFriend = !contact?.isMyContact
       if (notFriend) {
         this.emit('friendship', { friendshipId: messageId })
       }
@@ -131,8 +131,8 @@ export default class MessageEventHandler extends WhatsAppBase {
       requestPool.resolveRequest(messageId)
       const receiverId = message.to
       if (receiverId && isContactId(receiverId)) {
-        const contactIds = await cacheManager.getContactIdList()
-        const notFriend = !contactIds.find(c => c === receiverId)
+        const contact = await cacheManager.getContactOrRoomRawPayload(receiverId)
+        const notFriend = !contact?.isMyContact
         if (notFriend) {
           this.emit('friendship', { friendshipId: messageId })
         }