fixes #1909 (ICQ-WIM: on startup history of the only contact is synced)

4 files changed, 18 insertions, 17 deletions

diff --git a/protocols/ICQ-WIM/src/http.cpp b/protocols/ICQ-WIM/src/http.cpp
index e8b616fb46..d365b6e06e 100644
--- a/protocols/ICQ-WIM/src/http.cpp
+++ b/protocols/ICQ-WIM/src/http.cpp
@@ -114,8 +114,14 @@ AsyncHttpRequest::AsyncHttpRequest(IcqConnection conn, int iType, const char *sz
 
 void AsyncHttpRequest::ReplaceJsonParam(const JSONNode &n)
 {
+	auto *szNodeName = n.name();
+
 	JSONNode root = JSONNode::parse(m_szParam);
-	root[n.name()] = n;
+	JSONNode& old = root.at(szNodeName);
+	if (old)
+		old = n;
+	else
+		root.push_back(n);
 	m_szParam = root.write().c_str();
 
 	replaceStr(pData, nullptr);
@@ -147,12 +153,12 @@ bool CIcqProto::ExecuteRequest(AsyncHttpRequest *pReq)
 				delete pReq;
 				return false;
 			}
-
-			pReq->ReplaceJsonParam(JSONNode("clientId", m_iRClientId));
-			pReq->ReplaceJsonParam(JSONNode("authToken", m_szRToken));
-			pReq->dataLength = pReq->m_szParam.GetLength();
-			pReq->pData = mir_strdup(pReq->m_szParam);
 		}
+
+		pReq->ReplaceJsonParam(JSONNode("clientId", m_iRClientId));
+		pReq->ReplaceJsonParam(JSONNode("authToken", m_szRToken));
+		pReq->dataLength = pReq->m_szParam.GetLength();
+		pReq->pData = mir_strdup(pReq->m_szParam);
 	}
 
 	debugLogA("Executing request %s:\n%s", pReq->m_reqId, pReq->szUrl);
@@ -191,7 +197,6 @@ bool CIcqProto::ExecuteRequest(AsyncHttpRequest *pReq)
 					return false;
 				}
 
-				pReq->ReplaceJsonParam(JSONNode("authToken", m_szRToken));
 				Push(pReq);
 				return true;
 			}
diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp
index 279e8ce0b2..01bc53200d 100644
--- a/protocols/ICQ-WIM/src/poll.cpp
+++ b/protocols/ICQ-WIM/src/poll.cpp
@@ -139,7 +139,7 @@ void CIcqProto::ProcessHistData(const JSONNode &ev)
 				auto *pReq = new AsyncHttpRequest(CONN_RAPI, REQUEST_POST, ICQ_ROBUST_SERVER, &CIcqProto::OnGetChatInfo);
 				JSONNode request, params; params.set_name("params");
 				params << WCHAR_PARAM("sn", wszId) << INT_PARAM("memberLimit", 100) << CHAR_PARAM("aimSid", m_aimsid);
-				request << CHAR_PARAM("method", "getChatInfo") << CHAR_PARAM("reqId", pReq->m_reqId) << CHAR_PARAM("authToken", m_szRToken) << INT_PARAM("clientId", m_iRClientId) << params;
+				request << CHAR_PARAM("method", "getChatInfo") << CHAR_PARAM("reqId", pReq->m_reqId) << params;
 				pReq->m_szParam = ptrW(json_write(&request));
 				pReq->pUserInfo = si;
 				Push(pReq);
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index 0dc6a223a8..ea9e7f21f9 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -205,8 +205,7 @@ void CIcqProto::MarkReadTimerProc(HWND hwnd, UINT, UINT_PTR id, DWORD)
 		auto *pReq = new AsyncHttpRequest(CONN_RAPI, REQUEST_POST, ICQ_ROBUST_SERVER);
 		JSONNode request, params; params.set_name("params");
 		params << WCHAR_PARAM("sn", ppro->GetUserId(pUser->m_hContact)) << INT64_PARAM("lastRead", ppro->getId(pUser->m_hContact, DB_KEY_LASTMSGID));
-		request << CHAR_PARAM("method", "setDlgStateWim") << CHAR_PARAM("reqId", pReq->m_reqId) 
-			<< CHAR_PARAM("authToken", ppro->m_szRToken) << INT_PARAM("clientId", ppro->m_iRClientId) << params;
+		request << CHAR_PARAM("method", "setDlgStateWim") << CHAR_PARAM("reqId", pReq->m_reqId) << params;
 		pReq->m_szParam = ptrW(json_write(&request));
 		ppro->Push(pReq);
 
@@ -348,8 +347,7 @@ HANDLE CIcqProto::SearchBasic(const wchar_t *pszSearch)
 
 	JSONNode request, params; params.set_name("params");
 	params << WCHAR_PARAM("keyword", pszSearch);
-	request << CHAR_PARAM("method", "search") << CHAR_PARAM("reqId", pReq->m_reqId) << CHAR_PARAM("authToken", m_szRToken)
-		<< INT_PARAM("clientId", m_iRClientId) << params;
+	request << CHAR_PARAM("method", "search") << CHAR_PARAM("reqId", pReq->m_reqId) << params;
 	pReq->m_szParam = ptrW(json_write(&request));
 	Push(pReq);
 	return pReq;
diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp
index e7add0cec7..e39467813e 100644
--- a/protocols/ICQ-WIM/src/server.cpp
+++ b/protocols/ICQ-WIM/src/server.cpp
@@ -397,9 +397,8 @@ bool CIcqProto::RefreshRobustToken()
 	bool bRet = false;
 	auto *tmp = new AsyncHttpRequest(CONN_RAPI, REQUEST_POST, ICQ_ROBUST_SERVER "/genToken");
 
-	time_t ts = TS();
-	tmp << CHAR_PARAM("a", m_szAToken) << CHAR_PARAM("k", ICQ_APP_ID)
-		<< CHAR_PARAM("nonce", CMStringA(FORMAT, "%d-%d", ts, rand() % 10)) << INT_PARAM("ts", TS());
+	int ts = TS();
+	tmp << CHAR_PARAM("a", m_szAToken) << CHAR_PARAM("k", ICQ_APP_ID) << CHAR_PARAM("nonce", CMStringA(FORMAT, "%d-%d", ts, rand() % 10)) << INT_PARAM("ts", TS());
 	CalcHash(tmp);
 	tmp->flags |= NLHRF_PERSISTENT;
 	tmp->nlc = m_ConnPool[CONN_RAPI].s;
@@ -488,8 +487,7 @@ void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId, __int
 	if (endMsgId != -1)
 		params << INT64_PARAM("tillMsgId", endMsgId);
 	params << INT_PARAM("count", 1000) << CHAR_PARAM("aimSid", m_aimsid) << CHAR_PARAM("patchVersion", "1") << CHAR_PARAM("language", "ru-ru");
-	request << CHAR_PARAM("method", "getHistory") << CHAR_PARAM("reqId", pReq->m_reqId) << CHAR_PARAM("authToken", m_szRToken)
-		<< INT_PARAM("clientId", m_iRClientId) << params;
+	request << CHAR_PARAM("method", "getHistory") << CHAR_PARAM("reqId", pReq->m_reqId) << params;
 	pReq->m_szParam = ptrW(json_write(&request));
 	Push(pReq);
 }