SkypeWeb: fixed messageid problems (test it!)

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

2 files changed, 8 insertions, 8 deletions

diff --git a/protocols/SkypeWeb/src/requests/chatrooms.h b/protocols/SkypeWeb/src/requests/chatrooms.h
index 68855cb9bf..78c4e5937d 100644
--- a/protocols/SkypeWeb/src/requests/chatrooms.h
+++ b/protocols/SkypeWeb/src/requests/chatrooms.h
@@ -40,7 +40,7 @@ public:
 class SendChatMessageRequest : public HttpRequest

 {

 public:

-	SendChatMessageRequest(const char *to, ULONGLONG timestamp, const char *message, LoginInfo &li) :

+	SendChatMessageRequest(const char *to, time_t timestamp, const char *message, LoginInfo &li) :

 	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/19:%s/messages", li.endpoint.szServer, to)

 	{

 		Headers

@@ -49,7 +49,7 @@ public:
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 		JSONNode node;

 		node 

-			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu", (ULONGLONG)timestamp)) 

+			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu000", (ULONGLONG)timestamp)) 

 			<< JSONNode("messagetype", "RichText") 

 			<< JSONNode("contenttype", "text")

 			<< JSONNode("content", message);

@@ -61,7 +61,7 @@ public:
 class SendChatActionRequest : public HttpRequest

 {

 public:

-	SendChatActionRequest(const char *to, ULONGLONG timestamp, const char *message, LoginInfo &li) :

+	SendChatActionRequest(const char *to, time_t timestamp, const char *message, LoginInfo &li) :

 	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/19:%s/messages", li.endpoint.szServer, to)

 	{

 		Headers

@@ -71,7 +71,7 @@ public:
 

 		JSONNode node(JSON_NODE);

 		node 

-			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu", (ULONGLONG)timestamp))

+			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu000", (ULONGLONG)timestamp))

 			<< JSONNode("messagetype", "RichText")

 			<< JSONNode("contenttype", "text")

 			<< JSONNode("content", message)

diff --git a/protocols/SkypeWeb/src/requests/messages.h b/protocols/SkypeWeb/src/requests/messages.h
index ff706473df..104632ecfd 100644
--- a/protocols/SkypeWeb/src/requests/messages.h
+++ b/protocols/SkypeWeb/src/requests/messages.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class SendMessageRequest : public HttpRequest

 {

 public:

-	SendMessageRequest(const char *username, ULONGLONG timestamp, const char *message, LoginInfo &li) :

+	SendMessageRequest(const char *username, time_t timestamp, const char *message, LoginInfo &li) :

 	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", li.endpoint.szServer, username)

 	{

 		Headers

@@ -31,7 +31,7 @@ public:
 

 		JSONNode node;

 		node 

-			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu", (ULONGLONG)timestamp))

+			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu000", (ULONGLONG)timestamp))

 			<< JSONNode("messagetype", "Text")

 			<< JSONNode("contenttype", "text")

 			<< JSONNode("content", message);

@@ -43,7 +43,7 @@ public:
 class SendActionRequest : public HttpRequest

 {

 public:

-	SendActionRequest(const char *username, ULONGLONG timestamp, const char *message, LoginInfo &li) :

+	SendActionRequest(const char *username, time_t timestamp, const char *message, LoginInfo &li) :

 	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", li.endpoint.szServer, username)

 	{

 		Headers

@@ -56,7 +56,7 @@ public:
 

 		JSONNode node;

 		node 

-			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu", (ULONGLONG)timestamp))

+			<< JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu000", (ULONGLONG)timestamp))

 			<< JSONNode("messagetype", "RichText")

 			<< JSONNode("contenttype", "text")

 			<< JSONNode("content", content)