From 41dfcbd92abd9f16a7fe6ee222f7c710226438c8 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Thu, 26 Feb 2015 05:23:01 +0000 Subject: VKontakte: code cleanup and reorganisation git-svn-id: http://svn.miranda-ng.org/main/trunk@12270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/vk_thread.cpp | 197 ---------------------------------- 1 file changed, 197 deletions(-) (limited to 'protocols/VKontakte/src/vk_thread.cpp') diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index 9e27ba6d36..99b9685001 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -18,7 +18,6 @@ along with this program. If not, see . #include "stdafx.h" UINT_PTR CVkProto::m_timer; - char szBlankUrl[] = "https://oauth.vk.com/blank.html"; static char VK_TOKEN_BEG[] = "access_token="; static char VK_LOGIN_DOMAIN[] = "https://m.vk.com"; @@ -103,50 +102,6 @@ void CVkProto::OnLoggedOut() m_chats.destroy(); } -void CVkProto::SetServerStatus(int iNewStatus) -{ - debugLogA("CVkProto::SetServerStatus %d %d", iNewStatus, m_iStatus); - if (!IsOnline() || iNewStatus < ID_STATUS_OFFLINE) - return; - - int iOldStatus = m_iStatus; - CMString oldStatusMsg = ptrT(db_get_tsa(NULL, m_szModuleName, "OldStatusMsg")); - ptrT ptszListeningToMsg(db_get_tsa(NULL, m_szModuleName, "ListeningTo")); - - if (iNewStatus == ID_STATUS_OFFLINE) { - m_bNeedSendOnline = false; - if (!IsEmpty(ptszListeningToMsg) && m_bSetBroadcast) { - RetrieveStatusMsg(oldStatusMsg); - m_bSetBroadcast = false; - } - m_iStatus = ID_STATUS_OFFLINE; - if (iOldStatus != ID_STATUS_OFFLINE && iOldStatus != ID_STATUS_INVISIBLE) - Push(new AsyncHttpRequest(this, REQUEST_GET, "/method/account.setOffline.json", true, &CVkProto::OnReceiveSmth) - << VER_API); - } - else if (iNewStatus != ID_STATUS_INVISIBLE) { - m_bNeedSendOnline = true; - if (iOldStatus == ID_STATUS_ONLINE) - return; - m_iStatus = ID_STATUS_ONLINE; - Push(new AsyncHttpRequest(this, REQUEST_GET, "/method/account.setOnline.json", true, &CVkProto::OnReceiveSmth) - << VER_API); - } - else { - m_bNeedSendOnline = false; - if (!IsEmpty(ptszListeningToMsg) && m_bSetBroadcast) { - RetrieveStatusMsg(oldStatusMsg); - m_bSetBroadcast = false; - } - m_iStatus = ID_STATUS_INVISIBLE; - if (iOldStatus == ID_STATUS_ONLINE) - Push(new AsyncHttpRequest(this, REQUEST_GET, "/method/account.setOffline.json", true, &CVkProto::OnReceiveSmth) - << VER_API); - } - - ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)iOldStatus, m_iStatus); -} - ///////////////////////////////////////////////////////////////////////////////////////// void CVkProto::OnOAuthAuthorize(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq) @@ -1023,158 +978,6 @@ void CVkProto::PollingThread(void*) ///////////////////////////////////////////////////////////////////////////////////////// -INT_PTR __cdecl CVkProto::SvcSetStatusMsg(WPARAM, LPARAM) -{ - debugLogA("CVkProto::SvcSetStatusMsg"); - if (!IsOnline()) - return 1; - - MsgPopup(NULL, TranslateT("Loading status message from vk.com.\nThis may take some time."), TranslateT("Waiting...")); - - Push(new AsyncHttpRequest(this, REQUEST_GET, "/method/status.get.json", true, &CVkProto::OnReceiveStatusMsg) - << VER_API); - - return 0; -} - -void CVkProto::OnReceiveStatusMsg(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq) -{ - debugLogA("CVkProto::OnReceiveStatusMsg %d", reply->resultCode); - if (reply->resultCode != 200) - return; - - OnReceiveStatus(reply, pReq); - - ptrT ptszOldStatusMsg(db_get_tsa(NULL, m_szModuleName, "OldStatusMsg")); - CMString tszOldStatusMsg(ptszOldStatusMsg); - - ENTER_STRING pForm = { sizeof(pForm) }; - pForm.type = ESF_MULTILINE; - pForm.caption = TranslateT("Enter new status message"); - pForm.ptszInitVal = ptszOldStatusMsg; - pForm.szModuleName = m_szModuleName; - pForm.szDataPrefix = "statusmsgform_"; - - if (!EnterString(&pForm)) - return; - - CMString tszNewStatusMsg(ptrT(pForm.ptszResult)); - if (tszOldStatusMsg == tszNewStatusMsg) - return; - - RetrieveStatusMsg(tszNewStatusMsg); - setTString("OldStatusMsg", ptszOldStatusMsg); -} - - -void CVkProto::OnReceiveStatus(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq) -{ - debugLogA("CVkProto::OnReceiveStatus %d", reply->resultCode); - if (reply->resultCode != 200) - return; - JSONROOT pRoot; - JSONNODE *pResponse = CheckJsonResponse(pReq, reply, pRoot); - if (pResponse == NULL) - return; - - JSONNODE *pAudio = json_get(pResponse, "audio"); - if (pAudio == NULL) { - ptrT ptszStatusText(json_as_string(json_get(pResponse, "text"))); - if (ptszStatusText[0] != TCHAR(9835)) - setTString("OldStatusMsg", ptszStatusText); - } -} - -void CVkProto::RetrieveStatusMsg(const CMString &StatusMsg) -{ - debugLogA("CVkProto::RetrieveStatusMsg"); - if (!IsOnline()) - return; - - Push(new AsyncHttpRequest(this, REQUEST_GET, "/method/status.set.json", true, &CVkProto::OnReceiveSmth) - << TCHAR_PARAM("text", StatusMsg) - << VER_API); -} - -void CVkProto::RetrieveStatusMusic(const CMString &StatusMsg) -{ - debugLogA("CVkProto::RetrieveStatusMusic"); - if (!IsOnline() || m_iStatus == ID_STATUS_INVISIBLE || m_iMusicSendMetod == sendNone) - return; - - CMString code; - ptrT ptszOldStatusMsg(db_get_tsa(0, m_szModuleName, "OldStatusMsg")); - if (StatusMsg.IsEmpty()) { - if (m_iMusicSendMetod == sendBroadcastOnly) - code = "API.audio.setBroadcast();return null;"; - else { - CMString codeformat("API.status.set({text:\"%s\"});return null;"); - code.AppendFormat(codeformat, ptszOldStatusMsg); - } - m_bSetBroadcast = false; - } - else { - if (m_iMusicSendMetod == sendBroadcastOnly) { - CMString codeformat("var StatusMsg=\"%s\";var CntLmt=100;var OldMsg=API.status.get();" - "var Tracks=API.audio.search({\"q\":StatusMsg,\"count\":CntLmt,\"search_own\":1});" - "var Cnt=Tracks.count;if(Cnt>CntLmt){Cnt=CntLmt;}" - "if(Cnt==0){API.audio.setBroadcast();}" - "else{var i=0;var j=0;var Track=\" \";" - "while(iCntLmt){Cnt=CntLmt;}" - "if(Cnt==0){Track=\"♫ \"+StatusMsg;API.status.set({\"text\":Track});}" - "else{var i=0;var j=-1;" - "while(icbSize != sizeof(LISTENINGTOINFO)) - db_unset(NULL, m_szModuleName, "ListeningTo"); - else if (pliInfo->dwFlags & LTI_UNICODE) { - if (ServiceExists(MS_LISTENINGTO_GETPARSEDTEXT)) - tszListeningTo = ptrT((LPWSTR)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)_T("%artist% - %title%"), (LPARAM)pliInfo)); - else - tszListeningTo.Format(_T("%s - %s"), - pliInfo->ptszArtist ? pliInfo->ptszArtist : _T(""), - pliInfo->ptszTitle ? pliInfo->ptszTitle : _T("")); - setTString("ListeningTo", tszListeningTo); - } - RetrieveStatusMusic(tszListeningTo); - return 0; -} - -///////////////////////////////////////////////////////////////////////////////////////// - INT_PTR __cdecl CVkProto::SvcAddAsFriend(WPARAM hContact, LPARAM) { debugLogA("CVkProto::SvcAddAsFriend"); -- cgit v1.2.3