From 57890ac884743d836690db5058185db1e6dea5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Fri, 6 Feb 2015 10:00:00 +0000 Subject: Facebook: Fix loading sent messages via other instances (website) to wrong contact in Miranda; Version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@12018 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/json.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'protocols/FacebookRM/src/json.cpp') diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index 3a08e928fa..b24afdb330 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -557,7 +557,7 @@ int facebook_json_parser::parse_messages(std::string *data, std::vector< faceboo if (!message->isChat && !message->isIncoming) { message->sender_name.clear(); - message->user_id = proto->ThreadIDToContactID(message->thread_id); // TODO: Check if we have contact with this user_id in friendlist and otherwise do something different? + message->user_id = !other_user_id.empty() ? other_user_id : proto->ThreadIDToContactID(message->thread_id); // TODO: Check if we have contact with this user_id in friendlist and otherwise do something different? } messages->push_back(message); -- cgit v1.2.3