diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-12-12 17:36:12 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-12-12 17:36:12 +0000 |
| commit | 0e9f894eb6895a7817da08859f5b5848545b43ba (patch) | |
| tree | d99c21742551d0bc644c0c20d2f722a494338e7e | |
| parent | d681e8ce525d8f7fb3b5e0e00bf75d9f4d830034 (diff) | |
minor code restructurizing
git-svn-id: http://svn.miranda-ng.org/main/trunk@7151 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/VKontakte/src/vk_proto.h | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_thread.cpp | 72 |
2 files changed, 50 insertions, 24 deletions
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h index 9f4d9f29fe..84a145ad05 100644 --- a/protocols/VKontakte/src/vk_proto.h +++ b/protocols/VKontakte/src/vk_proto.h @@ -114,6 +114,8 @@ struct CVkProto : public PROTO<CVkProto> void RetrieveFriends();
void OnReceiveFriends(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
+ void MarkMessagesRead(const CMStringA &mids);
+ void RetrieveMessagesByIds(const CMStringA &mids);
void RetrieveUnreadMessages();
void OnReceiveMessages(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
void OnSendMessage(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index 743797917d..7ef08b4b6e 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -354,15 +354,40 @@ void CVkProto::OnReceiveFriends(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq /////////////////////////////////////////////////////////////////////////////////////////
+void CVkProto::MarkMessagesRead(const CMStringA &mids)
+{
+ if (mids.IsEmpty())
+ return;
+
+ HttpParam params[] = {
+ { "mids", mids },
+ { "access_token", m_szAccessToken }
+ };
+ PushAsyncHttpRequest(REQUEST_GET, "/method/messages.markAsRead.json", true, &CVkProto::OnReceiveSmth, SIZEOF(params), params);
+}
+
+void CVkProto::RetrieveMessagesByIds(const CMStringA &mids)
+{
+ if (mids.IsEmpty())
+ return;
+
+ HttpParam params[] = {
+ { "mids", mids },
+ { "access_token", m_szAccessToken }
+ };
+ PushAsyncHttpRequest(REQUEST_GET, "/method/messages.getById.json", true, &CVkProto::OnReceiveMessages, SIZEOF(params), params);
+}
+
void CVkProto::RetrieveUnreadMessages()
{
debugLogA("CVkProto::RetrieveMessages");
HttpParam params[] = {
- { "code", "return{\"msgs\":API.messages.get({\"filters\":1})};" },
+ { "filters", "1" },
+ { "preview_length", "0" },
{ "access_token", m_szAccessToken }
};
- PushAsyncHttpRequest(REQUEST_GET, "/method/execute.json", true, &CVkProto::OnReceiveMessages, SIZEOF(params), params);
+ PushAsyncHttpRequest(REQUEST_GET, "/method/messages.get.json", true, &CVkProto::OnReceiveMessages, SIZEOF(params), params);
}
void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
@@ -380,7 +405,7 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe if (pMsgs == NULL)
pMsgs = pResponse;
- CMStringA mids;
+ CMStringA mids, lmids;
int numMessages = json_as_int( json_at(pMsgs, 0));
for (int i=1; i <= numMessages; i++) {
@@ -388,12 +413,24 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe if (pMsg == NULL)
continue;
- int mid = json_as_int( json_get(pMsg, "mid"));
- int datetime = json_as_int( json_get(pMsg, "date"));
- int isOut = json_as_int( json_get(pMsg, "out"));
- int uid = json_as_int( json_get(pMsg, "uid"));
- int isRead = json_as_int( json_get(pMsg, "read_state"));
+ char szMid[40];
+ int mid = json_as_int(json_get(pMsg, "mid"));
+ _itoa(mid, szMid, 10);
+
+ // VK documentation lies: even if you specified preview_length=0,
+ // long messages get cut out. So we need to retrieve them from scratch
ptrT ptszBody( json_as_string( json_get(pMsg, "body")));
+/* if (_tcslen(ptszBody) > 100) {
+ if (!lmids.IsEmpty())
+ lmids.AppendChar(',');
+ lmids.Append(szMid);
+ continue;
+ }
+ */
+ int datetime = json_as_int(json_get(pMsg, "date"));
+ int isOut = json_as_int(json_get(pMsg, "out"));
+ int uid = json_as_int(json_get(pMsg, "uid"));
+ int isRead = json_as_int(json_get(pMsg, "read_state"));
JSONNODE *pAttachments = json_get(pMsg, "attachments");
if (pAttachments != NULL) {
@@ -419,8 +456,6 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe ptszBody = mir_tstrdup(tszBody);
}
- char szMid[40];
- _itoa(mid, szMid, 10);
HANDLE hContact = FindUser(uid, true);
PROTORECVEVENT recv = { 0 };
@@ -441,13 +476,8 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe mids.Append(szMid);
}
- if (!mids.IsEmpty()) {
- HttpParam params[] = {
- { "mids", mids },
- { "access_token", m_szAccessToken }
- };
- PushAsyncHttpRequest(REQUEST_GET, "/method/messages.markAsRead.json", true, &CVkProto::OnReceiveSmth, SIZEOF(params), params);
- }
+ MarkMessagesRead(mids);
+ RetrieveMessagesByIds(lmids);
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -526,13 +556,7 @@ void CVkProto::PollUpdates(JSONNODE *pUpdates) }
}
- if ( !mids.IsEmpty()) {
- HttpParam params[] = {
- { "mids", mids },
- { "access_token", m_szAccessToken }
- };
- PushAsyncHttpRequest(REQUEST_GET, "/method/messages.getById.json", true, &CVkProto::OnReceiveMessages, SIZEOF(params), params);
- }
+ RetrieveMessagesByIds(mids);
}
int CVkProto::PollServer()
|