diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-25 18:09:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-25 18:09:42 +0000 |
| commit | 99bea7a69e782c02d371f94a2988d49d0825fd7e (patch) | |
| tree | 17331d8d614c1fe1751a351030a790bbfa5eae29 /protocols/FacebookRM/src/process.cpp | |
| parent | fae17e42b5d32ff133426893ca115310d499ab64 (diff) | |
FB json parsing rewritten for new headers
git-svn-id: http://svn.miranda-ng.org/main/trunk@13832 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/FacebookRM/src/process.cpp')
| -rw-r--r-- | protocols/FacebookRM/src/process.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp index fe9651aff0..6cc40d8391 100644 --- a/protocols/FacebookRM/src/process.cpp +++ b/protocols/FacebookRM/src/process.cpp @@ -631,7 +631,7 @@ void FacebookProto::ReceiveMessages(std::vector<facebook_message*> messages, boo for (std::vector<facebook_message*>::size_type i = 0; i < messages.size(); i++) { MCONTACT hContact = messages[i]->isChat - ? ChatIDToHContact(std::tstring(_A2T(messages[i]->thread_id.c_str()))) + ? ChatIDToHContact(messages[i]->thread_id) : ContactIDToHContact(messages[i]->user_id); if (hContact == NULL) @@ -676,9 +676,9 @@ void FacebookProto::ReceiveMessages(std::vector<facebook_message*> messages, boo debugLogA(" < Got chat message ID: %s", messages[i]->message_id.c_str()); facebook_chatroom *fbc; - std::tstring tthread_id = _A2T(messages[i]->thread_id.c_str()); + std::string tthread_id = messages[i]->thread_id.c_str(); - std::map<std::tstring, facebook_chatroom*>::iterator it = facy.chat_rooms.find(tthread_id); + auto it = facy.chat_rooms.find(tthread_id); if (it != facy.chat_rooms.end()) { fbc = it->second; } @@ -698,12 +698,12 @@ void FacebookProto::ReceiveMessages(std::vector<facebook_message*> messages, boo MCONTACT hChatContact = NULL; // RM TODO: better use check if chatroom exists/is in db/is online... no? // like: if (ChatIDToHContact(tthread_id) == NULL) { - ptrA users(GetChatUsers(tthread_id.c_str())); + ptrA users(GetChatUsers(fbc->thread_id.c_str())); if (users == NULL) { AddChat(fbc->thread_id.c_str(), fbc->chat_name.c_str()); hChatContact = ChatIDToHContact(fbc->thread_id); // Set thread id (TID) for later - setTString(hChatContact, FACEBOOK_KEY_TID, fbc->thread_id.c_str()); + setString(hChatContact, FACEBOOK_KEY_TID, fbc->thread_id.c_str()); for (std::map<std::string, std::string>::iterator jt = fbc->participants.begin(); jt != fbc->participants.end(); ++jt) { AddChatContact(fbc->thread_id.c_str(), jt->first.c_str(), jt->second.c_str()); @@ -737,7 +737,7 @@ void FacebookProto::ReceiveMessages(std::vector<facebook_message*> messages, boo // TODO: support also system messages (rename chat, user quit, etc.)! (here? or it is somewhere else? // ... we must add some new "type" field into facebook_message structure and use it also for Pokes and similar) - UpdateChat(tthread_id.c_str(), messages[i]->user_id.c_str(), messages[i]->sender_name.c_str(), messages[i]->message_text.c_str(), messages[i]->time); + UpdateChat(fbc->thread_id.c_str(), messages[i]->user_id.c_str(), messages[i]->sender_name.c_str(), messages[i]->message_text.c_str(), messages[i]->time); // Automatically mark message as read because chatroom doesn't support onRead event (yet) hChatContacts->insert(hChatContact); // std::set checks duplicates at insert automatically |