summaryrefslogtreecommitdiff
path: root/protocols/FacebookRM/src
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2013-07-04 19:54:49 +0000
committerRobert Pösel <robyer@seznam.cz>2013-07-04 19:54:49 +0000
commit9e68544f66184f21b955260de69cd7758317dea6 (patch)
treef6b2423162d627f03b5d79d07cfd2eb3adb0cc0f /protocols/FacebookRM/src
parentbcbd1e68f4383c751ca0b902b7b82f56532d0d4a (diff)
Facebook: Fixed not receiving sent messages from other instances
git-svn-id: http://svn.miranda-ng.org/main/trunk@5236 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/FacebookRM/src')
-rw-r--r--protocols/FacebookRM/src/json.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index 695c75520c..08556d77be 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -406,13 +406,13 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
char was_id[32];
lltoa(sender_fbid.Value(), was_id, 10);
- // ignore duplicits or messages sent from miranda
- if (ignore_duplicits(proto, mid.Value(), text.Value()))
- continue;
-
// Ignore messages from myself
if (was_id == proto->facy.self_.user_id)
continue;
+
+ // Ignore duplicits or messages sent from miranda
+ if (ignore_duplicits(proto, mid.Value(), text.Value()))
+ continue;
std::string message_text = utils::text::trim(utils::text::special_expressions_decode(utils::text::slashu_to_utf8(text.Value())), true);
if (message_text.empty())
@@ -442,13 +442,13 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
const String& text = messageContent["text"];
const String& mid = messageContent["messageId"];
- // ignore duplicits or messages sent from miranda
- if (ignore_duplicits(proto, mid.Value(), text.Value()))
- continue;
-
// Ignore messages from myself
if (was_id == proto->facy.self_.user_id)
continue;
+
+ // Ignore duplicits or messages sent from miranda
+ if (ignore_duplicits(proto, mid.Value(), text.Value()))
+ continue;
std::string message_text = utils::text::trim(utils::text::special_expressions_decode(utils::text::slashu_to_utf8(text.Value())), true);
if (message_text.empty())