diff options
Diffstat (limited to 'protocols/WhatsApp/src/messages.cpp')
| -rw-r--r-- | protocols/WhatsApp/src/messages.cpp | 45 |
1 files changed, 29 insertions, 16 deletions
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<char*>(msg.c_str());
- recv.timestamp = pMsg->timestamp;
- ProtoChainRecvMsg(hContact, &recv);
+ PROTORECVEVENT recv = { 0 };
+ recv.flags = PREF_UTF;
+ recv.szMessage = const_cast<char*>(msg.c_str());
+ recv.timestamp = pMsg->timestamp;
+ ProtoChainRecvMsg(hContact, &recv);
+ }
m_pConnection->sendMessageReceived(pMsg);
}
|