From 2fcca210a1f695d7a932b873ae00dc702d42cfeb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 May 2015 14:53:33 +0000 Subject: SkypeWeb to use new json parser git-svn-id: http://svn.miranda-ng.org/main/trunk@13891 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/requests/messages.h | 48 +++++++++++++----------------- 1 file changed, 20 insertions(+), 28 deletions(-) (limited to 'protocols/SkypeWeb/src/requests/messages.h') diff --git a/protocols/SkypeWeb/src/requests/messages.h b/protocols/SkypeWeb/src/requests/messages.h index 3523a95f47..b55d759a22 100644 --- a/protocols/SkypeWeb/src/requests/messages.h +++ b/protocols/SkypeWeb/src/requests/messages.h @@ -28,16 +28,14 @@ public: << CHAR_VALUE("Accept", "application/json, text/javascript") << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken) << CHAR_VALUE("Content-Type", "application/json; charset=UTF-8"); - JSONNODE *node = json_new(5); - json_push_back(node, json_new_i("clientmessageid", timestamp)); - json_push_back(node, json_new_a("messagetype", "RichText")); - json_push_back(node, json_new_a("contenttype", "text")); - json_push_back(node, json_new_a("content", message)); - T2Utf data(ptrT(json_write(node))); - Body << VALUE(data); + JSONNode node(JSON_NODE); + node.push_back(JSONNode("clientmessageid", (long)timestamp)); + node.push_back(JSONNode("messagetype", "RichText")); + node.push_back(JSONNode("contenttype", "text")); + node.push_back(JSONNode("content", message)); - json_delete(node); + Body << VALUE(node.write().c_str()); } }; @@ -55,17 +53,14 @@ public: CMStringA content; content.AppendFormat("%s %s", username, message); - JSONNODE *node = json_new(5); - json_push_back(node, json_new_i("clientmessageid", timestamp)); - json_push_back(node, json_new_a("messagetype", "RichText")); - json_push_back(node, json_new_a("contenttype", "text")); - json_push_back(node, json_new_a("content", content)); - json_push_back(node, json_new_i("skypeemoteoffset", (int)(mir_strlen(username) + 1))); - - T2Utf data(ptrT(json_write(node))); - Body << VALUE(data); + JSONNode node(JSON_NODE); + node.push_back(JSONNode("clientmessageid", (long)timestamp)); + node.push_back(JSONNode("messagetype", "RichText")); + node.push_back(JSONNode("contenttype", "text")); + node.push_back(JSONNode("content", content)); + node.push_back(JSONNode("skypeemoteoffset", (int)(mir_strlen(username) + 1))); - json_delete(node); + Body << VALUE(node.write().c_str()); } }; @@ -82,23 +77,20 @@ public: char *state = (iState == PROTOTYPE_SELFTYPING_ON) ? "Control/Typing" : "Control/ClearTyping"; - JSONNODE *node = json_new(5); - json_push_back(node, json_new_i("clientmessageid", time(NULL))); - json_push_back(node, json_new_a("messagetype", state)); - json_push_back(node, json_new_a("contenttype", "text")); - json_push_back(node, json_new_a("content", "")); - - T2Utf data(ptrT(json_write(node))); - Body << VALUE(data); + JSONNode node(JSON_NODE); + node.push_back(JSONNode("clientmessageid", (long)time(NULL))); + node.push_back(JSONNode("messagetype", state)); + node.push_back(JSONNode("contenttype", "text")); + node.push_back(JSONNode("content", "")); - json_delete(node); + Body << VALUE(node.write().c_str()); } }; class MarkMessageReadRequest : public HttpRequest { public: - MarkMessageReadRequest(const char *username, const char *regToken, LONGLONG msgId = 0, LONGLONG msgTimestamp = 0, bool isChat = false, const char *server = SKYPE_ENDPOINTS_HOST) : + MarkMessageReadRequest(const char *username, const char *regToken, LONGLONG /*msgId*/ = 0, LONGLONG msgTimestamp = 0, bool isChat = false, const char *server = SKYPE_ENDPOINTS_HOST) : HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/users/ME/conversations/%s:%s/properties?name=consumptionhorizon", server, !isChat ? "8" : "19", username) { Headers -- cgit v1.2.3