From ab3d423b1dc514e9db61c170ca14bab49e5280cb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Jan 2024 23:34:30 +0300 Subject: major atavism, PROTORECVEVENT, died with its own set of constants --- protocols/WhatsApp/src/appsync.cpp | 16 ++++++++-------- protocols/WhatsApp/src/message.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'protocols/WhatsApp/src') diff --git a/protocols/WhatsApp/src/appsync.cpp b/protocols/WhatsApp/src/appsync.cpp index 6eb435db02..62ca86b979 100644 --- a/protocols/WhatsApp/src/appsync.cpp +++ b/protocols/WhatsApp/src/appsync.cpp @@ -274,16 +274,16 @@ void WhatsAppProto::ProcessHistorySync(const Wa__HistorySync *pSync) if (!szMessageText.IsEmpty()) { auto *key = pMessage->message->key; - PROTORECVEVENT pre = {}; - pre.timestamp = pMessage->message->messagetimestamp; - pre.szMessage = szMessageText.GetBuffer(); - pre.szMsgId = key->id; - pre.flags = PREF_CREATEREAD; + DB::EventInfo dbei; + dbei.timestamp = pMessage->message->messagetimestamp; + dbei.pBlob = szMessageText.GetBuffer(); + dbei.szId = key->id; + dbei.flags = DBEF_READ; if (key->fromme) - pre.flags |= PREF_SENT; + dbei.flags |= DBEF_SENT; if (pUser->bIsGroupChat) - pre.szUserId = key->participant; - ProtoChainRecvMsg(pUser->hContact, &pre); + dbei.szUserId = key->participant; + ProtoChainRecvMsg(pUser->hContact, dbei); } } } diff --git a/protocols/WhatsApp/src/message.cpp b/protocols/WhatsApp/src/message.cpp index 96f23dde17..a664e49953 100644 --- a/protocols/WhatsApp/src/message.cpp +++ b/protocols/WhatsApp/src/message.cpp @@ -211,17 +211,17 @@ void WhatsAppProto::ProcessMessage(WAMSG type, const Wa__WebMessageInfo &msg) if (!szMessageText.IsEmpty()) { // for chats & group chats store message in profile if (type.bPrivateChat || type.bGroupChat) { - PROTORECVEVENT pre = {}; - pre.timestamp = timestamp; - pre.szMessage = szMessageText.GetBuffer(); - pre.szMsgId = msgId; + DB::EventInfo dbei; + dbei.timestamp = timestamp; + dbei.pBlob = szMessageText.GetBuffer(); + dbei.szId = msgId; if (type.bOffline) - pre.flags |= PREF_CREATEREAD; + dbei.flags |= DBEF_READ; if (key->fromme) - pre.flags |= PREF_SENT; + dbei.flags |= DBEF_SENT; if (pUser->bIsGroupChat) - pre.szUserId = participant; - ProtoChainRecvMsg(pUser->hContact, &pre); + dbei.szUserId = participant; + ProtoChainRecvMsg(pUser->hContact, dbei); } // translate statuses into status messages else if (type.bOtherStatus || type.bDirectStatus || type.bPeerBroadcast || type.bOtherBroadcast) { -- cgit v1.2.3