Icq: user addition

3 files changed, 115 insertions, 47 deletions

diff --git a/protocols/Icq10/src/proto.cpp b/protocols/Icq10/src/proto.cpp
index 9c34760ffb..5f47b960e4 100644
--- a/protocols/Icq10/src/proto.cpp
+++ b/protocols/Icq10/src/proto.cpp
@@ -85,7 +85,30 @@ void CIcqProto::OnShutdown()
 
 MCONTACT CIcqProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
 {
-	return 0;
+	if (mir_wstrlen(psr->id.w) == 0)
+		return 0;
+
+	DWORD dwUin = _wtol(psr->id.w);
+	if (auto *p = FindContactByUIN(dwUin))
+		return p->m_hContact;
+
+	MCONTACT hContact = db_add_contact();
+	Proto_AddToContact(hContact, m_szModuleName);
+	setDword(hContact, "UIN", dwUin);
+	{
+		mir_cslock l(m_csCache);
+		m_arCache.insert(new IcqCacheItem(dwUin, hContact));
+	}
+
+	if (psr->nick.w)
+		setWString(hContact, "Nick", psr->nick.w);
+	if (psr->firstName.w)
+		setWString(hContact, "FirstName", psr->firstName.w);
+	if (psr->lastName.w)
+		setWString(hContact, "LastName", psr->lastName.w);
+
+	db_set_b(hContact, "CList", "NotOnList", 1);
+	return hContact;
 }
 
 MCONTACT CIcqProto::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)
@@ -109,7 +132,6 @@ int CIcqProto::AuthDeny(MEVENT hDbEvent, const wchar_t* szReason)
 	return 1; // Failure
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // PSR_AUTH
 
@@ -123,7 +145,13 @@ int CIcqProto::AuthRecv(MCONTACT hContact, PROTORECVEVENT* pre)
 
 int CIcqProto::AuthRequest(MCONTACT hContact, const wchar_t* szMessage)
 {
-	return 1; // Failure
+	auto *pReq = new AsyncHttpRequest(CONN_MAIN, REQUEST_POST, ICQ_API_SERVER "/buddylist/addBuddy", &CIcqProto::OnAddBuddy);
+	pReq << CHAR_PARAM("f", "json") << CHAR_PARAM("aimsid", m_aimsid) << CHAR_PARAM("r", pReq->m_reqId) << WCHAR_PARAM("authorizationMsg", szMessage)
+		<< INT_PARAM("buddy", getDword(hContact, "UIN")) << CHAR_PARAM("group", "General") << INT_PARAM("preAuthorized", 1);
+	pReq->flags |= NLHRF_NODUMPSEND;
+	pReq->pUserInfo = (void*)hContact;
+	Push(pReq);
+	return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Icq10/src/proto.h b/protocols/Icq10/src/proto.h
index b2524b1939..f6346ac1b5 100644
--- a/protocols/Icq10/src/proto.h
+++ b/protocols/Icq10/src/proto.h
@@ -69,13 +69,17 @@ class CIcqProto : public PROTO<CIcqProto>
 	void     ConnectionFailed(int iReason);
 	void     OnLoggedIn(void);
 	void     OnLoggedOut(void);
+	MCONTACT ParseBuddyInfo(const JSONNode &buddy);
+	void     RetrieveUserInfo(MCONTACT);
 	void     SetServerStatus(int iNewStatus);
 	void     ShutdownSession(void);
 	void     StartSession(void);
 
+	void     OnAddBuddy(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 	void     OnAddClient(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 	void     OnCheckPassword(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 	void     OnFetchEvents(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
+	void     OnGetUserInfo(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 	void     OnReceiveAvatar(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 	void     OnSearchResults(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 	void     OnSendMessage(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
diff --git a/protocols/Icq10/src/server.cpp b/protocols/Icq10/src/server.cpp
index 6d3c1b4da8..e3db21620f 100644
--- a/protocols/Icq10/src/server.cpp
+++ b/protocols/Icq10/src/server.cpp
@@ -68,6 +68,55 @@ void CIcqProto::OnLoggedOut()
 	setAllContactStatuses(ID_STATUS_OFFLINE, false);
 }
 
+MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy)
+{
+	DWORD dwUin = _wtol(buddy["aimId"].as_mstring());
+
+	auto *pCache = FindContactByUIN(dwUin);
+	if (pCache == nullptr) {
+		MCONTACT hContact = db_add_contact();
+		Proto_AddToContact(hContact, m_szModuleName);
+		setDword(hContact, "UIN", dwUin);
+		pCache = new IcqCacheItem(dwUin, hContact);
+		{
+			mir_cslock l(m_csCache);
+			m_arCache.insert(pCache);
+		}
+	}
+
+	MCONTACT hContact = pCache->m_hContact;
+	pCache->m_bInList = true;
+
+	CMStringW wszNick(buddy["friendly"].as_mstring());
+	if (!wszNick.IsEmpty())
+		setWString(hContact, "Nick", wszNick);
+
+	setDword(hContact, "Status", StatusFromString(buddy["state"].as_mstring()));
+
+	int lastLogin = buddy["lastseen"].as_int();
+	if (lastLogin)
+		setDword(hContact, "LoginTS", lastLogin);
+
+	CMStringW wszStatus(buddy["statusMsg"].as_mstring());
+	if (wszStatus.IsEmpty())
+		db_unset(hContact, "CList", "StatusMsg");
+	else
+		db_set_ws(hContact, "CList", "StatusMsg", wszStatus);
+
+	CMStringW wszIconId(buddy["iconId"].as_mstring());
+	CMStringW oldIconID(getMStringW(hContact, "IconId"));
+	if (wszIconId != oldIconID) {
+		setWString(hContact, "IconId", wszIconId);
+
+		CMStringA szUrl(buddy["buddyIcon"].as_mstring());
+		auto *p = new AsyncHttpRequest(CONN_MAIN, REQUEST_GET, szUrl, &CIcqProto::OnReceiveAvatar);
+		p->pUserInfo = (void*)hContact;
+		Push(p);
+	}
+
+	return hContact;
+}
+
 bool CIcqProto::RefreshRobustToken()
 {
 	if (!m_szRToken.IsEmpty())
@@ -115,6 +164,14 @@ bool CIcqProto::RefreshRobustToken()
 	return bRet;
 }
 
+void CIcqProto::RetrieveUserInfo(MCONTACT hContact)
+{
+	auto *pReq = new AsyncHttpRequest(CONN_MAIN, REQUEST_GET, ICQ_API_SERVER "/presence/get", &CIcqProto::OnGetUserInfo);
+	pReq->flags |= NLHRF_NODUMPSEND;
+	pReq << CHAR_PARAM("f", "json") << CHAR_PARAM("aimsid", m_aimsid) << INT_PARAM("mdir", 1) << INT_PARAM("t", getDword(hContact, "UIN"));
+	Push(pReq);
+}
+
 void CIcqProto::SetServerStatus(int iStatus)
 {
 	int iOldStatus = m_iStatus; m_iStatus = iStatus;
@@ -177,6 +234,17 @@ void CIcqProto::StartSession()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+void CIcqProto::OnAddBuddy(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pReq)
+{
+	MCONTACT hContact = (MCONTACT)pReq->pUserInfo;
+
+	JsonReply root(pReply);
+	if (root.error() == 200) {
+		RetrieveUserInfo(getDword(hContact, "UIN"));
+		db_unset(hContact, "CList", "NotOnList");
+	}
+}
+
 void CIcqProto::OnAddClient(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pReq)
 {
 	bool *pRet = (bool*)pReq->pUserInfo;
@@ -230,6 +298,17 @@ void CIcqProto::OnCheckPassword(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest*)
 	StartSession();
 }
 
+void CIcqProto::OnGetUserInfo(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest*)
+{
+	JsonReply root(pReply);
+	if (root.error() != 200)
+		return;
+
+	const JSONNode &data = root.data();
+	for (auto &it : data["users"])
+		ParseBuddyInfo(it);
+}
+
 void CIcqProto::OnStartSession(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest*)
 {
 	JsonReply root(pReply);
@@ -341,50 +420,7 @@ void CIcqProto::ProcessBuddyList(const JSONNode &ev)
 		Clist_GroupCreate(0, szGroup);
 
 		for (auto &buddy : it["buddies"]) {
-			DWORD dwUin = _wtol(buddy["aimId"].as_mstring());
-
-			auto *pCache = FindContactByUIN(dwUin);
-			if (pCache == nullptr) {
-				MCONTACT hContact = db_add_contact();
-				Proto_AddToContact(hContact, m_szModuleName);
-				setDword(hContact, "UIN", dwUin);
-				pCache = new IcqCacheItem(dwUin, hContact);
-				{
-					mir_cslock l(m_csCache);
-					m_arCache.insert(pCache);
-				}
-			}
-
-			MCONTACT hContact = pCache->m_hContact;
-			pCache->m_bInList = true;
-
-			CMStringW wszNick(buddy["friendly"].as_mstring());
-			if (!wszNick.IsEmpty())
-				setWString(hContact, "Nick", wszNick);
-
-			setDword(hContact, "Status", StatusFromString(buddy["state"].as_mstring()));
-
-			int lastLogin = buddy["lastseen"].as_int();
-			if (lastLogin)
-				setDword(hContact, "LoginTS", lastLogin);
-
-			CMStringW wszStatus(buddy["statusMsg"].as_mstring());
-			if (wszStatus.IsEmpty())
-				db_unset(hContact, "CList", "StatusMsg");
-			else
-				db_set_ws(hContact, "CList", "StatusMsg", wszStatus);
-
-			CMStringW wszIconId(buddy["iconId"].as_mstring());
-			CMStringW oldIconID(getMStringW(hContact, "IconId"));
-			if (wszIconId != oldIconID) {
-				setWString(hContact, "IconId", wszIconId);
-
-				CMStringA szUrl(buddy["buddyIcon"].as_mstring());
-				auto *p = new AsyncHttpRequest(CONN_MAIN, REQUEST_GET, szUrl, &CIcqProto::OnReceiveAvatar);
-				p->pUserInfo = (void*)hContact;
-				Push(p);
-			}
-
+			MCONTACT hContact = ParseBuddyInfo(buddy);
 			db_set_ws(hContact, "CList", "Group", szGroup);
 		}
 	}