parameters unification between JSON & HTTP

3 files changed, 1 insertions, 88 deletions

diff --git a/protocols/Discord/src/gateway.cpp b/protocols/Discord/src/gateway.cpp
index 0f59b9382e..228e6bad25 100644
--- a/protocols/Discord/src/gateway.cpp
+++ b/protocols/Discord/src/gateway.cpp
@@ -220,7 +220,7 @@ void CDiscordProto::GatewayThreadWorker()
 		debugLogA("Got packet: buffer = %d, opcode = %d, headerSize = %d, final = %d, masked = %d", bufSize, hdr.opCode, hdr.headerSize, hdr.bIsFinal, hdr.bIsMasked);
 
 		// we have some additional data, not only opcode
-		if (bufSize > hdr.headerSize) {
+		if ((size_t)bufSize > hdr.headerSize) {
 			size_t currPacketSize = bufSize - hdr.headerSize;
 			netbuf.append(buf, bufSize);
 			while (currPacketSize < hdr.payloadSize) {
diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index 56c04ef157..5970ce26d3 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -26,64 +26,11 @@ struct AsyncHttpRequest : public NETLIBHTTPREQUEST, public MZeroedObject
 	void *pUserInfo;
 };
 
-struct PARAM
-{
-	LPCSTR szName;
-	__forceinline PARAM(LPCSTR _name) : szName(_name)
-	{}
-};
-
-struct BOOL_PARAM : public PARAM
-{
-	bool bValue;
-	__forceinline BOOL_PARAM(LPCSTR _name, bool _value) :
-		PARAM(_name), bValue(_value)
-	{}
-};
-AsyncHttpRequest* operator<<(AsyncHttpRequest*, const BOOL_PARAM&);
-
-struct INT_PARAM : public PARAM
-{
-	int iValue;
-	__forceinline INT_PARAM(LPCSTR _name, int _value) :
-		PARAM(_name), iValue(_value)
-	{}
-};
 AsyncHttpRequest* operator<<(AsyncHttpRequest*, const INT_PARAM&);
-
-struct INT64_PARAM : public PARAM
-{
-	SnowFlake iValue;
-	__forceinline INT64_PARAM(LPCSTR _name, SnowFlake _value) :
-		PARAM(_name), iValue(_value)
-	{}
-};
 AsyncHttpRequest* operator<<(AsyncHttpRequest*, const INT64_PARAM&);
-
-struct CHAR_PARAM : public PARAM
-{
-	LPCSTR szValue;
-	__forceinline CHAR_PARAM(LPCSTR _name, LPCSTR _value) :
-		PARAM(_name), szValue(_value)
-	{}
-};
 AsyncHttpRequest* operator<<(AsyncHttpRequest*, const CHAR_PARAM&);
-
-struct WCHAR_PARAM : public PARAM
-{
-	LPCWSTR wszValue;
-	__forceinline WCHAR_PARAM(LPCSTR _name, LPCWSTR _value) :
-		PARAM(_name), wszValue(_value)
-	{}
-};
 AsyncHttpRequest* operator<<(AsyncHttpRequest*, const WCHAR_PARAM&);
 
-JSONNode& operator<<(JSONNode &json, const INT_PARAM &param);
-JSONNode& operator<<(JSONNode &json, const INT64_PARAM &param);
-JSONNode& operator<<(JSONNode &json, const BOOL_PARAM &param);
-JSONNode& operator<<(JSONNode &json, const CHAR_PARAM &param);
-JSONNode& operator<<(JSONNode &json, const WCHAR_PARAM &param);
-
 /////////////////////////////////////////////////////////////////////////////////////////
 
 struct CDiscordRole : public MZeroedObject
diff --git a/protocols/Discord/src/utils.cpp b/protocols/Discord/src/utils.cpp
index 2c0b254930..0b37e53167 100644
--- a/protocols/Discord/src/utils.cpp
+++ b/protocols/Discord/src/utils.cpp
@@ -42,40 +42,6 @@ int StrToStatus(const CMStringW &str)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-JSONNode& operator<<(JSONNode &json, const INT_PARAM &param)
-{
-	json.push_back(JSONNode(param.szName, param.iValue));
-	return json;
-}
-
-JSONNode& operator<<(JSONNode &json, const INT64_PARAM &param)
-{
-	char tmp[100];
-	_i64toa_s(param.iValue, tmp, _countof(tmp), 10);
-	json.push_back(JSONNode(param.szName, tmp));
-	return json;
-}
-
-JSONNode& operator<<(JSONNode &json, const BOOL_PARAM &param)
-{
-	json.push_back(JSONNode(param.szName, param.bValue));
-	return json;
-}
-
-JSONNode& operator<<(JSONNode &json, const CHAR_PARAM &param)
-{
-	json.push_back(JSONNode(param.szName, param.szValue));
-	return json;
-}
-
-JSONNode& operator<<(JSONNode &json, const WCHAR_PARAM &param)
-{
-	json.push_back(JSONNode(param.szName, ptrA(mir_utf8encodeW(param.wszValue)).get()));
-	return json;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
 time_t StringToDate(const CMStringW &str)
 {
 	struct tm T = { 0 };