From 5cf35ef0f12fc51221c6d267999a39caf8bd8a73 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 30 Jan 2015 17:11:31 +0000 Subject: - fix for loosing image or video's caption - fix for processing incoming contacts git-svn-id: http://svn.miranda-ng.org/main/trunk@11957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/messages.cpp | 45 ++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 16 deletions(-) (limited to 'protocols/WhatsApp/src/messages.cpp') diff --git a/protocols/WhatsApp/src/messages.cpp b/protocols/WhatsApp/src/messages.cpp index d5b1325f5f..f1ad83d252 100644 --- a/protocols/WhatsApp/src/messages.cpp +++ b/protocols/WhatsApp/src/messages.cpp @@ -9,25 +9,38 @@ int WhatsAppProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre) void WhatsAppProto::onMessageForMe(FMessage *pMsg, bool paramBoolean) { - bool isChatRoom = !pMsg->remote_resource.empty(); - - std::string msg; - if (!pMsg->media_url.empty()) - msg = pMsg->media_url; - else - msg = pMsg->data; + // someone sent us a contact. launch contact addition dialog + if (pMsg->media_wa_type == FMessage::WA_TYPE_CONTACT) { + MCONTACT hContact = AddToContactList(pMsg->remote_resource, 0, false, pMsg->media_name.c_str()); + + ADDCONTACTSTRUCT acs = { 0 }; + acs.handleType = HANDLE_CONTACT; + acs.hContact = hContact; + acs.szProto = m_szModuleName; + CallServiceSync(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs); + } + else { + bool isChatRoom = !pMsg->remote_resource.empty(); + + std::string msg(pMsg->data); + if (!pMsg->media_url.empty()) { + if (!msg.empty()) + msg.append("\n"); + msg += pMsg->media_url; + } - if (isChatRoom) - msg.insert(0, std::string("[").append(pMsg->notifyname).append("]: ")); + if (isChatRoom) + msg.insert(0, std::string("[").append(pMsg->notifyname).append("]: ")); - MCONTACT hContact = this->AddToContactList(pMsg->key.remote_jid, 0, false, - isChatRoom ? NULL : pMsg->notifyname.c_str(), isChatRoom); + MCONTACT hContact = this->AddToContactList(pMsg->key.remote_jid, 0, false, + isChatRoom ? NULL : pMsg->notifyname.c_str(), isChatRoom); - PROTORECVEVENT recv = { 0 }; - recv.flags = PREF_UTF; - recv.szMessage = const_cast(msg.c_str()); - recv.timestamp = pMsg->timestamp; - ProtoChainRecvMsg(hContact, &recv); + PROTORECVEVENT recv = { 0 }; + recv.flags = PREF_UTF; + recv.szMessage = const_cast(msg.c_str()); + recv.timestamp = pMsg->timestamp; + ProtoChainRecvMsg(hContact, &recv); + } m_pConnection->sendMessageReceived(pMsg); } -- cgit v1.2.3