From 7774e1ced73f710d2a01a07a26baacbd7f19f84d Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sat, 18 Apr 2015 13:04:59 +0000 Subject: SkypeWeb: Login/logout refactoring part 2. SyncHistory improvements. git-svn-id: http://svn.miranda-ng.org/main/trunk@12909 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/requests/endpoint.h | 14 ++++++++++++++ protocols/SkypeWeb/src/requests/history.h | 29 ++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) (limited to 'protocols/SkypeWeb/src/requests') diff --git a/protocols/SkypeWeb/src/requests/endpoint.h b/protocols/SkypeWeb/src/requests/endpoint.h index 428a727b5b..e0fefa07a3 100644 --- a/protocols/SkypeWeb/src/requests/endpoint.h +++ b/protocols/SkypeWeb/src/requests/endpoint.h @@ -33,4 +33,18 @@ public: } }; +class DeleteEndpointRequest : public HttpRequest +{ +public: + DeleteEndpointRequest(const char *regToken, const char *EndpointId, const char *server = SKYPE_ENDPOINTS_HOST) : + HttpRequest(REQUEST_DELETE, FORMAT, "%s/v1/users/ME/endpoints/%s", server, ptrA(mir_urlEncode(EndpointId))) + { + Headers + << CHAR_VALUE("Accept", "application/json, text/javascript") + << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken); + + } +}; + + #endif //_SKYPE_REQUEST_ENDPOINT_H_ diff --git a/protocols/SkypeWeb/src/requests/history.h b/protocols/SkypeWeb/src/requests/history.h index 3f2d3bdf04..f100e47685 100644 --- a/protocols/SkypeWeb/src/requests/history.h +++ b/protocols/SkypeWeb/src/requests/history.h @@ -20,7 +20,7 @@ along with this program. If not, see . class SyncHistoryFirstRequest : public HttpRequest { public: - SyncHistoryFirstRequest(const char *regToken, const char *server = SKYPE_ENDPOINTS_HOST) : + SyncHistoryFirstRequest(const char *regToken, int pageSize = 100, const char *server = SKYPE_ENDPOINTS_HOST) : HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations", server) { Url @@ -34,17 +34,27 @@ public: << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken) << CHAR_VALUE("Content-Type", "application/json; charset = UTF-8"); } + + SyncHistoryFirstRequest(const char *url, const char *regToken) : + HttpRequest(REQUEST_GET, url) + { + + Headers + << CHAR_VALUE("Accept", "application/json, text/javascript") + << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken) + << CHAR_VALUE("Content-Type", "application/json; charset = UTF-8"); + } }; class GetHistoryRequest : public HttpRequest { public: - GetHistoryRequest(const char *regToken, const char *username, LONGLONG timestamp = 0, const char *server = SKYPE_ENDPOINTS_HOST, bool isChat = false) : + GetHistoryRequest(const char *regToken, const char *username, int pageSize = 100, bool isChat = false, LONGLONG timestamp = 0, const char *server = SKYPE_ENDPOINTS_HOST) : HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations/%s:%s/messages", server, isChat ? "19" : "8", ptrA(mir_urlEncode(username))) { Url << INT_VALUE("startTime", timestamp) - << INT_VALUE("pageSize", 100) + << INT_VALUE("pageSize", pageSize) << CHAR_VALUE("view", "msnp24Equivalent") << CHAR_VALUE("targetType", "Passport|Skype|Lync|Thread"); @@ -55,4 +65,17 @@ public: } }; +class GetHistoryOnUrlRequest : public HttpRequest +{ +public: + GetHistoryOnUrlRequest(const char *url, const char *regToken) : + HttpRequest(REQUEST_GET, url) + { + Headers + << CHAR_VALUE("Accept", "application/json, text/javascript") + << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken) + << CHAR_VALUE("Content-Type", "application/json; charset = UTF-8"); + } +}; + #endif //_SKYPE_REQUEST_HISTORY_H_ \ No newline at end of file -- cgit v1.2.3