Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions include.pri
Original file line number Diff line number Diff line change
@@ -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/

7 changes: 4 additions & 3 deletions modules/httpserver/httpserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/jsonhelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions src/telegrambot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down