From 6e82820f46d0e9a817ef0419be1547e2441cb22e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 27 May 2024 13:28:26 +0300 Subject: =?UTF-8?q?fixes=20#4439=20(ICQ:=20=D0=B0=D0=B2=D1=82=D0=BE=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BD=D0=B5=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20=D1=81=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/ICQ-WIM/src/poll.cpp | 4 ++-- protocols/ICQ-WIM/src/proto.h | 10 ++++++-- protocols/ICQ-WIM/src/server.cpp | 49 +++++++++++++++++++++++++++++++++++----- protocols/ICQ-WIM/src/stdafx.h | 1 + 4 files changed, 54 insertions(+), 10 deletions(-) (limited to 'protocols') diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp index 1a7c72b2f0..c46a489017 100644 --- a/protocols/ICQ-WIM/src/poll.cpp +++ b/protocols/ICQ-WIM/src/poll.cpp @@ -241,10 +241,10 @@ LBL_SkipPatch: debugLogA("Proceeding with empty cache for %d", hContact); for (auto &it : ev["intro"]["messages"]) - ParseMessage(hContact, lastMsgId, it, false, false); + ParseMessage(hContact, lastMsgId, it, 0); for (auto &it : ev["tail"]["messages"]) - ParseMessage(hContact, lastMsgId, it, false, true); + ParseMessage(hContact, lastMsgId, it, PM::CreateRead); setId(hContact, DB_KEY_LASTMSGID, lastMsgId); if (pUser) { diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h index f198ed76e7..61ce296697 100644 --- a/protocols/ICQ-WIM/src/proto.h +++ b/protocols/ICQ-WIM/src/proto.h @@ -243,14 +243,20 @@ class CIcqProto : public PROTO void Json2int(MCONTACT, const JSONNode&, const char *szJson, const char *szSetting, bool bIsPartial); void Json2string(MCONTACT, const JSONNode&, const char *szJson, const char *szSetting, bool bIsPartial); MCONTACT ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact = INVALID_CONTACT_ID, bool bIsPartial = false); - void ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNode &msg, bool bCreateRead, bool bLocalTime); void ParseMessagePart(MCONTACT hContact, const JSONNode &msg, IcqFileInfo *&pFileInfo); IcqFileInfo* RetrieveFileInfo(MCONTACT hContact, const CMStringW &wszUrl); void RetrievePatches(MCONTACT hContact); int StatusFromPresence(const JSONNode &presence, MCONTACT hContact); void ProcessPatchVersion(MCONTACT hContact, __int64 currPatch); void ProcessStatus(IcqUser *pUser, int iStatus); - + + enum PM { + CreateRead = 1, + LocalTime = 2, + FetchFiles = 4 + }; + void ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNode &msg, int flags); + void OnLoggedIn(void); void OnLoggedOut(void); diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index 0d44af1811..62f009cc83 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -457,7 +457,7 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact, boo return hContact; } -void CIcqProto::ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNode &it, bool bCreateRead, bool bLocalTime) +void CIcqProto::ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNode &it, int flags) { CMStringA szMsgId(it["msgId"].as_mstring()), szSender, szReply; __int64 msgId = _atoi64(szMsgId); @@ -465,6 +465,7 @@ void CIcqProto::ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNo lastMsgId = msgId; MEVENT hOldEvent = db_event_getById(m_szModuleName, szMsgId); + bool bLocalTime = (flags & PM::LocalTime) != 0; int iMsgTime = (bLocalTime) ? time(0) : it["time"].as_int(); if (auto &node = it["chat"]["sender"]) @@ -592,6 +593,7 @@ void CIcqProto::ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNo } // process our own messages + bool bCreateRead = (flags & PM::CreateRead) != 0; CMStringA reqId(it["reqId"].as_mstring()); if (CheckOwnMessage(reqId, szMsgId, true)) { debugLogA("Skipping our own message %s", szMsgId.c_str()); @@ -627,7 +629,38 @@ void CIcqProto::ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNo blob.write(dbei); db_event_edit(hOldEvent, &dbei, true); } - else ProtoChainRecvFile(hContact, blob, dbei); + else { + CMStringA szUrl(pFileInfo->szUrl); + MEVENT hEvent = ProtoChainRecvFile(hContact, blob, dbei); + + if (flags & PM::FetchFiles) { + if (!blob.isCompleted()) { + wchar_t wszReceiveFolder[MAX_PATH]; + File::GetReceivedFolder(hContact, wszReceiveFolder, _countof(wszReceiveFolder), true); + CMStringW wszFileName(FORMAT, L"%s%s", wszReceiveFolder, blob.getName()); + + MHttpRequest nlhr(REQUEST_GET); + nlhr.flags = NLHRF_REDIRECT; + nlhr.m_szUrl = szUrl; + nlhr.AddHeader("Sec-Fetch-User", "?1"); + nlhr.AddHeader("Sec-Fetch-Site", "cross-site"); + nlhr.AddHeader("Sec-Fetch-Mode", "navigate"); + nlhr.AddHeader("Accept-Encoding", "gzip"); + + debugLogW(L"Saving to [%s]", wszFileName.c_str()); + NLHR_PTR reply(Netlib_DownloadFile(m_hNetlibUser, &nlhr, wszFileName.c_str(), 0, 0)); + if (reply && reply->resultCode == 200) { + struct _stat st; + _wstat(wszFileName, &st); + + DBVARIANT dbv = { DBVT_DWORD }; + dbv.dVal = st.st_size; + db_event_setJson(hEvent, "ft", &dbv); + } + } + } + } + return; } @@ -844,7 +877,7 @@ void CIcqProto::OnGetPatches(MHttpResponse *pReply, AsyncHttpRequest *pReq) if (_wtoi64(msg["msgId"].as_mstring()) == it.first) { bFound = true; __int64 lastMsgId; - ParseMessage(pReq->hContact, lastMsgId, msg, true, false); + ParseMessage(pReq->hContact, lastMsgId, msg, PM::LocalTime); } if (!bFound) @@ -902,17 +935,21 @@ void CIcqProto::OnGetUserHistory(MHttpResponse *pReply, AsyncHttpRequest *pReq) __int64 lastMsgId = getId(pReq->hContact, DB_KEY_LASTMSGID); - int count = 0; + wchar_t wszReceiveFolder[MAX_PATH]; + File::GetReceivedFolder(pReq->hContact, wszReceiveFolder, _countof(wszReceiveFolder), true); + CreateDirectoryTreeW(wszReceiveFolder); + + int count = 0, flags = PM::FetchFiles + (pReq->pUserInfo ? PM::LocalTime : 0); auto &results = root.results(); for (auto &it : results["messages"]) { - ParseMessage(pReq->hContact, lastMsgId, it, pReq->pUserInfo != nullptr, false); + ParseMessage(pReq->hContact, lastMsgId, it, flags); count++; } setId(pReq->hContact, DB_KEY_LASTMSGID, lastMsgId); if (count >= 999) - RetrieveUserHistory(pReq->hContact, lastMsgId, pReq->pUserInfo != nullptr); + RetrieveUserHistory(pReq->hContact, lastMsgId, flags); } void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId, bool bCreateRead) diff --git a/protocols/ICQ-WIM/src/stdafx.h b/protocols/ICQ-WIM/src/stdafx.h index e8a50d16ab..e8c1452cb7 100644 --- a/protocols/ICQ-WIM/src/stdafx.h +++ b/protocols/ICQ-WIM/src/stdafx.h @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3