Steam:

- add searching by name
- added contact info updating
- small improvements

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

1 files changed, 155 insertions, 24 deletions

diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index 8e9aa87f9f..6038ca029c 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -18,6 +18,66 @@ void CSteamProto::SetAllContactsStatus(WORD status)
 	}

 }

 

+void CSteamProto::UpdateContact(MCONTACT hContact, const SteamWebApi::FriendApi::Summary *contact)

+{

+	if (hContact && !FindContact(contact->GetSteamId()))

+		return;

+

+	// set common data

+	setWString(hContact, "Nick", contact->GetNickname());

+	setWord(hContact, "Status", SteamToMirandaStatus(contact->GetState()));

+	setString(hContact, "Homepage", contact->GetHomepage());

+	setDword(hContact, "LastEventDateTS", contact->GetLastEvent());

+

+	// set name

+	ptrW realname(mir_wstrdup(contact->GetRealname()));

+	const wchar_t *p = wcschr(realname, ' ');

+	if (p == NULL)

+		setWString(hContact, "FirstName", realname);

+	else

+	{

+		int length = p - (wchar_t*)realname;

+		realname[length] = '\0';

+		setWString(hContact, "LastName", realname);

+		setWString(hContact, "LastName", p + 1);

+	}

+

+	// set country

+	const char *isoCode = contact->GetCountryCode();

+	if (!lstrlenA(isoCode))

+		this->delSetting(hContact, "Country");

+	else

+	{

+		// todo: is should be free()?

+		char *country = (char *)CallService(MS_UTILS_GETCOUNTRYBYISOCODE, (WPARAM)isoCode, 0);

+		setString(hContact, "Country", country);

+	}

+}

+

+void CSteamProto::UpdateContactsThread(void *arg)

+{

+	ptrA steamIds((char*)arg);

+

+	ptrA token(getStringA("TokenSecret"));

+

+	SteamWebApi::FriendApi::Summaries summarues;

+	SteamWebApi::FriendApi::LoadSummaries(m_hNetlibUser, token, steamIds, &summarues);

+

+	if (!summarues.IsSuccess())

+		return;

+

+	for (int i = 0; i < summarues.GetItemCount(); i++)

+	{

+		const SteamWebApi::FriendApi::Summary *contact = summarues.GetAt(i);

+		

+		MCONTACT hContact = this->FindContact(contact->GetSteamId());

+		if (!hContact)

+		{

+			UpdateContact(hContact, contact);

+		}

+	}

+}

+

 MCONTACT CSteamProto::FindContact(const char *steamId)

 {

 	MCONTACT hContact = NULL;

@@ -36,20 +96,19 @@ MCONTACT CSteamProto::FindContact(const char *steamId)
 	return hContact;

 }

 

-MCONTACT CSteamProto::AddContact(const SteamWebApi::FriendApi::Friend &contact)

+MCONTACT CSteamProto::AddContact(const SteamWebApi::FriendApi::Summary *contact)

 {

-	MCONTACT hContact = this->FindContact(contact.GetSteamId());

+	MCONTACT hContact = this->FindContact(contact->GetSteamId());

 	if (!hContact)

 	{

+		// create contact

 		hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

 		CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)this->m_szModuleName);

 

-		setString(hContact, "SteamID", contact.GetSteamId());

-		setWString(hContact, "Nick", contact.GetNickname());

-		setString(hContact, "Homepage", contact.GetHomepage());

-		setDword(hContact, "LastEventDateTS", contact.GetLastEvent());

-		db_set_ws(hContact, "CList", "MyHandle", contact.GetNickname());

+		// update info

+		UpdateContact(hContact, contact);

 

+		// move to default group

 		DBVARIANT dbv;

 		if (!getWString("DefaultGroup", &dbv))

 		{

@@ -68,37 +127,109 @@ void CSteamProto::SearchByIdThread(void* arg)
 

 	ptrA token(getStringA("TokenSecret"));

 

-	SteamWebApi::FriendApi::Friend rFriend;

-	SteamWebApi::FriendApi::LoadSummaries(m_hNetlibUser, token, steamId, &rFriend);

+	SteamWebApi::FriendApi::Summaries summarues;

+	SteamWebApi::FriendApi::LoadSummaries(m_hNetlibUser, token, steamId, &summarues);

 

-	if (!rFriend.IsSuccess())

+	if (!summarues.IsSuccess())

 	{

 		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_FAILED, (HANDLE)STEAM_SEARCH_BYID, 0);

 		return;

 	}

 

-	PROTOSEARCHRESULT psr = { 0 };

-	psr.cbSize = sizeof(psr);

-	psr.flags = PSR_TCHAR;

+	if (summarues.GetItemCount() == 0)

+		return;

+

+	const SteamWebApi::FriendApi::Summary *contact = summarues.GetAt(0);

 

-	psr.id = mir_wstrdup(steamIdW);

-	psr.nick  = mir_wstrdup(rFriend.GetNickname());

+	STEAM_SEARCH_RESULT ssr = { 0 };

+	ssr.hdr.cbSize = sizeof(STEAM_SEARCH_RESULT);

+	ssr.hdr.flags = PSR_TCHAR;

+	

+	ssr.hdr.id = mir_wstrdup(steamIdW);

+	ssr.hdr.nick  = mir_wstrdup(contact->GetNickname());

 

-	const wchar_t *realname = rFriend.GetRealname();

+	const wchar_t *realname = contact->GetRealname();

 	const wchar_t *p = wcschr(realname, ' ');

 	if (p == NULL)

-		psr.firstName = mir_wstrdup(realname);

+		ssr.hdr.firstName = mir_wstrdup(realname);

 	else

 	{

 		int length = p - realname;

-		psr.firstName = (wchar_t*)mir_alloc(sizeof(wchar_t) * (length + 1));

-		wmemcpy(psr.firstName, realname, length);

-		psr.firstName[length] = '\0';

-		psr.lastName = mir_wstrdup(p + 1);

+		ssr.hdr.firstName = (wchar_t*)mir_alloc(sizeof(wchar_t) * (length + 1));

+		wmemcpy(ssr.hdr.firstName, realname, length);

+		ssr.hdr.firstName[length] = '\0';

+		ssr.hdr.lastName = mir_wstrdup(p + 1);

 	}

+	

+	ssr.contact = contact;

 

-	//psr.reserved[0] = &psr;

-

-	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)STEAM_SEARCH_BYID, (LPARAM)&psr);

+	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)STEAM_SEARCH_BYID, (LPARAM)&ssr);

 	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)STEAM_SEARCH_BYID, 0);

+}

+

+void CSteamProto::SearchByNameThread(void* arg)

+{

+	ptrW keywordsW((wchar_t*)arg);

+	ptrA keywords(mir_utf8encodeW(keywordsW));

+

+	ptrA token(getStringA("TokenSecret"));

+

+	SteamWebApi::SearchApi::SearchResult searchResult;

+	SteamWebApi::SearchApi::Search(m_hNetlibUser, token, keywords, &searchResult);

+

+	if (!searchResult.IsSuccess())

+	{

+		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_FAILED, (HANDLE)STEAM_SEARCH_BYNAME, 0);

+		return;

+	}

+	

+	CMStringA steamIds;

+	for (int i = 0; i < searchResult.GetItemCount(); i++)

+	{

+		const SteamWebApi::SearchApi::SearchItem *item = searchResult.GetAt(i);

+		if (steamIds.IsEmpty())

+			steamIds.Append(item->GetSteamId());

+		else

+			steamIds.AppendFormat(",%s", item->GetSteamId());

+	}

+

+	SteamWebApi::FriendApi::Summaries summarues;

+	SteamWebApi::FriendApi::LoadSummaries(m_hNetlibUser, token, steamIds, &summarues);

+

+	if (!summarues.IsSuccess())

+	{

+		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_FAILED, (HANDLE)STEAM_SEARCH_BYNAME, 0);

+		return;

+	}

+

+	for (int i = 0; i < summarues.GetItemCount(); i++)

+	{

+		const SteamWebApi::FriendApi::Summary *contact = summarues.GetAt(i);

+

+		STEAM_SEARCH_RESULT ssr = { 0 };

+		ssr.hdr.cbSize = sizeof(STEAM_SEARCH_RESULT);

+		ssr.hdr.flags = PSR_TCHAR;

+

+		ssr.hdr.id = mir_a2u(contact->GetSteamId());

+		ssr.hdr.nick  = mir_wstrdup(contact->GetNickname());

+

+		const wchar_t *realname = contact->GetRealname();

+		const wchar_t *p = wcschr(realname, ' ');

+		if (p == NULL)

+			ssr.hdr.firstName = mir_wstrdup(realname);

+		else

+		{

+			int length = p - realname;

+			ssr.hdr.firstName = (wchar_t*)mir_alloc(sizeof(wchar_t) * (length + 1));

+			wmemcpy(ssr.hdr.firstName, realname, length);

+			ssr.hdr.firstName[length] = '\0';

+			ssr.hdr.lastName = mir_wstrdup(p + 1);

+		}

+

+		ssr.contact = contact;

+

+		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)STEAM_SEARCH_BYNAME, (LPARAM)&ssr);

+	}

+

+	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)STEAM_SEARCH_BYNAME, 0);

 }
\ No newline at end of file