From 84a70acefa63c74f30e49d25134fb537f32a6412 Mon Sep 17 00:00:00 2001 From: light Date: Sun, 12 Dec 2021 14:31:23 +0500 Subject: [PATCH 1/2] added include file for lib --- include.pri | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 include.pri diff --git a/include.pri b/include.pri new file mode 100644 index 0000000..e5f2f1d --- /dev/null +++ b/include.pri @@ -0,0 +1,11 @@ + +HEADERS += \ + $$PWD/src/telegrambot.h \ + $$PWD/modules/httpserver/httpserver.h \ + $$PWD/vendor/qdelegate/include/qdelegate.h + +INCLUDEPATH += $$PWD/src/ +INCLUDEPATH += $$PWD/modules/sslserver/ +INCLUDEPATH += $$PWD/modules/httpserver/ +INCLUDEPATH += $$PWD/vendor/qdelegate/include/ + From 9ea8722b01fda7bacb906d76fd05cebecff36ea4 Mon Sep 17 00:00:00 2001 From: light Date: Wed, 5 Jan 2022 21:33:45 +0500 Subject: [PATCH 2/2] fix build Qt 5.15+ --- modules/httpserver/httpserver.cpp | 7 ++++--- src/jsonhelper.cpp | 2 +- src/telegrambot.cpp | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/httpserver/httpserver.cpp b/modules/httpserver/httpserver.cpp index 82978e3..9a64913 100644 --- a/modules/httpserver/httpserver.cpp +++ b/modules/httpserver/httpserver.cpp @@ -46,14 +46,15 @@ void HttpServer::handleNewData() // build response QByteArray responseContent; - responseContent += (response->version.isEmpty() ? "HTTP/1.1" : response->version) + " "; // Version - responseContent += QByteArray::number((qint32)response->status) + " " + response->StatusNames.value((qint32)response->status, "") + "\r\n"; // Status + responseContent += (response->version.isEmpty() ? "HTTP/1.1" : response->version.toUtf8()) + " "; // Version + responseContent += QByteArray::number((qint32)response->status) + " " + + response->StatusNames.value((qint32)response->status, "").toUtf8() + "\r\n"; // Status // add headers qint64 contentLength = 0; for(auto itr = response->headers.begin(); itr != response->headers.end(); itr++) { if(itr.key().toLower() == "content-length") contentLength = itr.value().toLongLong(); - responseContent += itr.key() + ": " + itr.value() + "\r\n"; + responseContent += itr.key().toUtf8() + ": " + itr.value().toUtf8() + "\r\n"; } // add content length if not available diff --git a/src/jsonhelper.cpp b/src/jsonhelper.cpp index c8352b0..643d7a8 100644 --- a/src/jsonhelper.cpp +++ b/src/jsonhelper.cpp @@ -3,7 +3,7 @@ QVariant JsonHelper::jsonPathGetImpl(QJsonValue data, QString path, bool showWarnings) { // json parse - QStringList splittedPath = path.split('.', QString::SkipEmptyParts); + QStringList splittedPath = path.split('.'); QStringList processed; while(!splittedPath.isEmpty()) { QString pathElement = splittedPath.takeFirst(); diff --git a/src/telegrambot.cpp b/src/telegrambot.cpp index a5df7a1..40ec79c 100644 --- a/src/telegrambot.cpp +++ b/src/telegrambot.cpp @@ -754,8 +754,6 @@ QNetworkReply* TelegramBot::callApi(QString method, QUrlQuery params, bool delet QUrl url(QString("https://api.telegram.org/bot%1/%2").arg(this->apiKey, method)); url.setQuery(params); - qDebug() << url; - // execute QNetworkRequest request(url); QNetworkReply* reply = multiPart ? this->aManager.post(request, multiPart) : this->aManager.get(request);