Facebook: Revert REQUEST_NOTIFICATIONS_READ change to fix marking notifications as read

git-svn-id: http://svn.miranda-ng.org/main/trunk@16274 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 9 insertions, 7 deletions

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 0996625777..703378120b 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -498,7 +498,13 @@ std::string facebook_client::choose_action(RequestType request_type, std::string
 		return "/ajax/mercury/change_read_status.php?__a=1";
 
 	case REQUEST_NOTIFICATIONS_READ:
-		return "/ajax/notifications/mark_read.php?__a=1";
+	{
+		std::string action = "/ajax/notifications/mark_read.php?__a=1";
+		if (get_data != NULL) {
+			action += "&" + (*get_data);
+		}
+		return action;
+	}
 
 	case REQUEST_TYPING_SEND:
 		return "/ajax/messaging/typ.php?__a=1";
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 9fed01e483..7501fe117e 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -924,16 +924,12 @@ void FacebookProto::ReadNotificationWorker(void *p)
 		return;
 	}
 
-	std::string data = "alert_ids%5B0%5D=" + utils::url::encode(*id);
-	data += "&seen=true";
+	std::string data = "seen=0&asyncSignal=&__dyn=&__rev=&__req=&alert_ids%5B0%5D=" + utils::url::encode(*id);
 	data += "&fb_dtsg=" + facy.dtsg_;
 	data += "&__user=" + facy.self_.user_id;
 	data += "&ttstamp=" + facy.ttstamp_;
-	data += "&__dyn=" + facy.__dyn();
-	data += "&__req=" + facy.__req();
-	data += "&__rev=" + facy.__rev();
 
-	facy.flap(REQUEST_NOTIFICATIONS_READ, &data); // NOTE: Request revised 11.2.2016
+	facy.flap(REQUEST_NOTIFICATIONS_READ, NULL, &data); // NOTE: Request revised 11.2.2016 (we're not using the main website request, as it doesn't work, but still the old one with GET parameters)
 
 	delete id;
 }