SkypeWeb: Small optimization

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

3 files changed, 3 insertions, 27 deletions

diff --git a/protocols/SkypeWeb/src/requests/chatrooms.h b/protocols/SkypeWeb/src/requests/chatrooms.h
index 088c096040..2a41798c50 100644
--- a/protocols/SkypeWeb/src/requests/chatrooms.h
+++ b/protocols/SkypeWeb/src/requests/chatrooms.h
@@ -18,30 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _SKYPE_REQUEST_CHATS_H_

 #define _SKYPE_REQUEST_CHATS_H_

 

-class SendChatMessageRequest : public HttpRequest

-{

-public:

-	SendChatMessageRequest(const char *regToken, const char *username, time_t timestamp, const char *message, const char *server = SKYPE_ENDPOINTS_HOST) :

-		HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/19:%s/messages", server, username)

-	{

-		Headers

-			<< 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));

-

-		ptrA data(mir_utf8encodeT(ptrT(json_write(node))));

-		Body << VALUE(data);

-

-		json_delete(node);

-	}

-};

-

 class CreateChatroomRequest : public HttpRequest

 {

 public:

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

 {

 public:

-	SendMessageRequest(const char *regToken, const char *username, time_t timestamp, const char *message, const char *server = SKYPE_ENDPOINTS_HOST) :

-		HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", server, username)

+	SendMessageRequest(const char *regToken, const char *username, time_t timestamp, const char *message, const char *server = SKYPE_ENDPOINTS_HOST, bool isChat = false) :

+		HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/%s:%s/messages", server, isChat?"19":"8", username)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index 80a38fbbee..bd2846f036 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -91,7 +91,7 @@ int CSkypeProto::OnGroupChatEventHook(WPARAM, LPARAM lParam)
 

 			if (IsOnline()) {

 				debugLogA("  > Chat - Outgoing message");

-				SendRequest(new SendChatMessageRequest(RegToken, chat_id, time(NULL), msg, Server));

+				SendRequest(new SendMessageRequest(RegToken, chat_id, time(NULL), msg, Server, true));

 			}

 

 			break;