summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-01-02 22:38:36 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-01-02 22:38:36 +0300
commite1726cda932b74e73675094172896d27d33ffa79 (patch)
treecc9673968de133462efb8fde20a724de8600fe71
parent26d7cc8c81533ca32ec795f1035b01a23c71a06d (diff)
minor code cleaning
-rw-r--r--protocols/Facebook/src/server.cpp21
1 files changed, 6 insertions, 15 deletions
diff --git a/protocols/Facebook/src/server.cpp b/protocols/Facebook/src/server.cpp
index 004633fc12..1e74ff154c 100644
--- a/protocols/Facebook/src/server.cpp
+++ b/protocols/Facebook/src/server.cpp
@@ -468,7 +468,7 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root)
CreateDirectoryTreeW(wszPath);
bool bSuccess = false;
- CMStringW wszFileName(FORMAT, L"%s\\%S.png", wszPath.c_str(), stickerId.c_str());
+ CMStringW wszFileName(FORMAT, L"%s\\STK{%S}.png", wszPath.c_str(), stickerId.c_str());
if (GetFileAttributesW(wszFileName) == INVALID_FILE_ATTRIBUTES) {
auto *pReq = CreateRequestGQL(FB_API_QUERY_STICKER);
pReq << CHAR_PARAM("query_params", CMStringA(FORMAT, "{\"0\":[\"%s\"]}", stickerId.c_str()));
@@ -488,19 +488,10 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root)
NETLIBHTTPREQUEST *pReply = Netlib_HttpTransaction(m_hNetlibUser, &req);
if (pReply != nullptr && pReply->resultCode == 200 && pReply->pData && pReply->dataLength) {
- int iImageFormat = PA_FORMAT_UNKNOWN;
- for (int i = 0; i < pReply->headersCount; i++)
- if (!mir_strcmp(pReply->headers[i].szName, "Content-Type")) {
- iImageFormat = ProtoGetAvatarFormatByMimeType(pReply->headers[i].szValue);
- break;
- }
-
- if (iImageFormat != PA_FORMAT_UNKNOWN) {
- bSuccess = true;
- FILE *out = _wfopen(wszFileName, L"wb");
- fwrite(pReply->pData, 1, pReply->dataLength, out);
- fclose(out);
- }
+ bSuccess = true;
+ FILE *out = _wfopen(wszFileName, L"wb");
+ fwrite(pReply->pData, 1, pReply->dataLength, out);
+ fclose(out);
}
}
}
@@ -511,7 +502,7 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root)
if (bSuccess) {
if (!szBody.empty())
szBody += "\r\n";
- szBody += stickerId.c_str();
+ szBody += "STK{" + std::string(stickerId.c_str()) + "}";
SMADD_CONT cont;
cont.cbSize = sizeof(SMADD_CONT);