diff options
| author | George Hazan <ghazan@miranda.im> | 2020-04-24 12:39:41 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-04-24 12:39:48 +0300 |
| commit | 9a6edd6536e64f526d769f8ccc18608c32afc20d (patch) | |
| tree | 0237671616aa2e74537efcd3c19a504dd3a598dd /protocols/ICQ-WIM | |
| parent | 31295f842591810ada5055dd4b419a0e208f3f56 (diff) | |
fixes #2352 (ICQ: входящие отсутствующие в базе сообщения имеют <текущее> время (время их получения Мирандой), а не реальное)
Diffstat (limited to 'protocols/ICQ-WIM')
| -rw-r--r-- | protocols/ICQ-WIM/src/poll.cpp | 2 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/proto.h | 2 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/server.cpp | 5 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/version.h | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp index 4d93f15c65..104e0e6145 100644 --- a/protocols/ICQ-WIM/src/poll.cpp +++ b/protocols/ICQ-WIM/src/poll.cpp @@ -204,7 +204,7 @@ void CIcqProto::ProcessHistData(const JSONNode &ev) __int64 srvLastId = _wtoi64(ev["lastMsgId"].as_mstring()); if (srvLastId > lastMsgId) { debugLogA("We need to retrieve history for %S: %lld > %lld", wszId.c_str(), srvLastId, lastMsgId); - RetrieveUserHistory(hContact, lastMsgId, false); + RetrieveUserHistory(hContact, lastMsgId); } } else { diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index 433b086bf5..3fc7005795 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -156,7 +156,7 @@ INT_PTR CIcqProto::OnMenuLoadHistory(WPARAM hContact, LPARAM) { delSetting(hContact, DB_KEY_LASTMSGID); - RetrieveUserHistory(hContact, 1, true); + RetrieveUserHistory(hContact, 1); return 0; } diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h index df37084f9b..0542497ee4 100644 --- a/protocols/ICQ-WIM/src/proto.h +++ b/protocols/ICQ-WIM/src/proto.h @@ -243,7 +243,7 @@ class CIcqProto : public PROTO<CIcqProto> void MarkAsRead(MCONTACT hContact); void MoveContactToGroup(MCONTACT hContact, const wchar_t *pwszGroup, const wchar_t *pwszNewGroup); bool RetrievePassword(); - void RetrieveUserHistory(MCONTACT, __int64 startMsgId, bool bFromHistory); + void RetrieveUserHistory(MCONTACT, __int64 startMsgId); void RetrieveUserInfo(MCONTACT = INVALID_CONTACT_ID); void SetServerStatus(int iNewStatus); void ShutdownSession(void); diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index cee7078357..6f37950339 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -521,7 +521,7 @@ AsyncHttpRequest* CIcqProto::UserInfoRequest(MCONTACT hContact) return pReq; } -void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId, bool bFromHistory) +void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId) { if (startMsgId == 0) startMsgId = -1; @@ -531,7 +531,6 @@ void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId, bool pReq->flags |= NLHRF_NODUMPSEND; #endif pReq->hContact = hContact; - pReq->pUserInfo = (bFromHistory) ? pReq : nullptr; __int64 patchVer = getId(hContact, DB_KEY_PATCHVER); if (patchVer == 0) @@ -910,7 +909,7 @@ void CIcqProto::OnGetUserHistory(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pR auto &results = root.results(); for (auto &it : results["messages"]) - ParseMessage(pReq->hContact, lastMsgId, it, pReq->pUserInfo != nullptr); + ParseMessage(pReq->hContact, lastMsgId, it, true); setId(pReq->hContact, DB_KEY_LASTMSGID, lastMsgId); } diff --git a/protocols/ICQ-WIM/src/version.h b/protocols/ICQ-WIM/src/version.h index e4e541daf0..0f68bc24e4 100644 --- a/protocols/ICQ-WIM/src/version.h +++ b/protocols/ICQ-WIM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 95 #define __RELEASE_NUM 11 -#define __BUILD_NUM 9 +#define __BUILD_NUM 10 #include <stdver.h> |