QuasarApp/qTbot
4
1
Fork 0
mirror of https://github.com/QuasarApp/qTbot.git synced 2025-04-26 13:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

itelegrambot fixes
Some checks failed
buildbot/DocsGenerator Build finished.
Details
buildbot/AndroidBuilder_v8Qt6 Build finished.
Details
buildbot/LinuxCMakeBuilderQt6 Build finished.
Details

Browse Source
This commit is contained in:
Andrei Yankovich 2024-12-10 15:51:28 +01:00
parent 55ad2e9629
commit 40d4a47a00
4 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qTbot/src/public/qTbot/ibot.cpp
View File

@ -133,15 +133,16 @@ IBot::sendRequest(const QSharedPointer<iRequest> &rquest) {
QFuture<QByteArray> IBot::sendRequest(const QSharedPointer<iRequest> &rquest, const QString &pathToResult) {
auto&& file = QSharedPointer<QFile>::create();
file->open(QIODevice::WriteOnly | QIODevice::Truncate);
if (!file->open(QIODevice::WriteOnly | QIODevice::Truncate)) {
qCritical() << "Fail to wrote data into " << pathToResult;
return {};
}
QNetworkReply* networkReplay = sendRquestImpl(rquest);
if (!networkReplay) {
return {};
}
auto&& promise = QSharedPointer<QPromise<QByteArray>>::create();
networkReplay->connect(networkReplay, &QNetworkReply::finished, [promise, pathToResult](){
@ -150,8 +151,8 @@ QFuture<QByteArray> IBot::sendRequest(const QSharedPointer<iRequest> &rquest, co
promise->finish();
});
networkReplay->connect(networkReplay, &QNetworkReply::readyRead, [networkReplay, promise, pathToResult](){
promise->addResult(networkReplay->readAll());
networkReplay->connect(networkReplay, &QNetworkReply::readyRead, [networkReplay, promise, pathToResult, file](){
file->write(networkReplay->readAll());
});
networkReplay->connect(networkReplay, &QNetworkReply::errorOccurred, [networkReplay, promise](QNetworkReply::NetworkError ){

2
src/qTbot/src/public/qTbot/ifile.cpp
View File

@ -106,6 +106,8 @@ void iFile::setDownloadRequest(const QFuture<QByteArray> &replay) {
QFutureWatcher<QByteArray> *watcher = new QFutureWatcher<QByteArray>();
watcher->setFuture(replay);
// connect(replay.get(), &QNetworkReply::finished,
// this, &iFile::handleFinished, Qt::DirectConnection);

103
src/qTbot/src/public/qTbot/itelegrambot.cpp
View File

@ -349,21 +349,26 @@ QSharedPointer<iFile> ITelegramBot::getFile(const QString &fileId, iFile::Type f
result = QSharedPointer<File>::create(localFilePath);
}
auto&& metaReploay = getFileMeta(fileId, result.toWeakRef());
auto&& future = getFileMeta(fileId, result.toWeakRef());
if (!future.isValid()) {
return nullptr;
}
return result;
}
QSharedPointer<QNetworkReply> ITelegramBot::getFileMeta(const QString &fileId, const QWeakPointer<iFile>& receiver) {
QFuture<QByteArray> ITelegramBot::getFileMeta(const QString &fileId, const QWeakPointer<iFile>& receiver) {
auto msg = QSharedPointer<TelegramGetFile>::create(fileId);
auto && future = sendRequest(msg);
if (future.isValid()) {
future.then([this, receiver](const QByteArray&data){
handleFileHeader(data, receiver);
});
if (auto&& ptr = sendRequest(msg)) {
connect(ptr.get(), &QNetworkReply::finished,
this, std::bind(&ITelegramBot::handleFileHeader, this, ptr.toWeakRef(), receiver));
return ptr;
return future;
}
return nullptr;
return {};
}
bool ITelegramBot::sendFile(const QFileInfo &file, const QVariant &chatId) {
@ -479,9 +484,9 @@ bool ITelegramBot::sendContact(const TelegramArgs &args,
return false;
return sendMessageRequest(QSharedPointer<TelegramSendContact>::create(args,
firstName,
phone,
secondName));
firstName,
phone,
secondName));
}
int ITelegramBot::getFileSizeByUniqueId(const QString &id) const {
@ -520,38 +525,37 @@ void ITelegramBot::handleIncomeNewUpdate(const QSharedPointer<iUpdate> & update)
bool ITelegramBot::sendMessageRequest(const QSharedPointer<iRequest> &rquest,
const std::function<void (int)> &msgIdCB) {
auto&& reply = IBot::sendRequest(rquest);
if (reply) {
connect(reply.get(), &QNetworkReply::finished, this,
[ reply, msgIdCB, this]() {
auto&& future = IBot::sendRequest(rquest);
if (future.isValid()) {
future.then(this, [this, msgIdCB](const QByteArray& responseData){
if (reply->error() == QNetworkReply::NoError) {
QByteArray&& responseData = reply->readAll();
QJsonDocument json = QJsonDocument::fromJson(responseData);
QJsonDocument json = QJsonDocument::fromJson(responseData);
const QJsonObject&& obj = json.object();
if (obj.contains("result")) {
unsigned long long chatId = obj["result"]["chat"]["id"].toInteger();
int messageID = obj["result"]["message_id"].toInt();
if (msgIdCB) {
msgIdCB(messageID);
}
const QJsonObject&& obj = json.object();
if (obj.contains("result")) {
unsigned long long chatId = obj["result"]["chat"]["id"].toInteger();
int messageID = obj["result"]["message_id"].toInt();
if (msgIdCB) {
msgIdCB(messageID);
}
if (chatId) {
_lastMessageId[chatId] = messageID;
}
if (chatId) {
_lastMessageId[chatId] = messageID;
}
return;
}
}
return;
}
}).onFailed([msgIdCB](){
if (msgIdCB) {
msgIdCB(-1);
}
});
if (msgIdCB) {
msgIdCB(-1);
}
});
return true;
}
return bool(reply);
return false;
}
void ITelegramBot::handleLogin(const QByteArray&ansver) {
@ -573,29 +577,26 @@ void ITelegramBot::handleLogin(const QByteArray&ansver) {
void ITelegramBot::handleLoginErr(QNetworkReply::NetworkError err) {
if (err) {
qDebug() << "Network error occured. code: " << err;
qCritical() << "Network error occured. code: " << err;
}
_loginReplay.reset();
}
void ITelegramBot::handleFileHeader(const QWeakPointer<QNetworkReply> &sender,
void ITelegramBot::handleFileHeader(const QByteArray& header,
const QWeakPointer<iFile>& receiver) {
if (auto&& sharedPtr = sender.lock()) {
auto&& ansver = makeMesasge<TelegramUpdateAnswer>(sharedPtr->readAll());
auto&& ansver = makeMesasge<TelegramUpdateAnswer>(header);
if (!ansver->isValid()) {
onRequestError(ansver);
return;
}
if (!ansver->isValid()) {
onRequestError(ansver);
return;
}
auto &&fileMetaInfo = makeMesasge<TelegramFile>(ansver->result().toObject());
auto &&fileMetaInfo = makeMesasge<TelegramFile>(ansver->result().toObject());
_filesMetaInfo.insert(fileMetaInfo->fileId(), fileMetaInfo);
_filesMetaInfo.insert(fileMetaInfo->fileId(), fileMetaInfo);
if (auto&& sharedPtr = receiver.lock()) {
auto&& downloadRequest = QSharedPointer<TelegrammDownloadFile>::create(fileMetaInfo->takePath());
sharedPtr->setDownloadRequest(sendRequest(downloadRequest));
}
if (auto&& sharedPtr = receiver.lock()) {
auto&& downloadRequest = QSharedPointer<TelegrammDownloadFile>::create(fileMetaInfo->takePath());
sharedPtr->setDownloadRequest(sendRequest(downloadRequest));
}
}

7
src/qTbot/src/public/qTbot/itelegrambot.h
View File

@ -194,9 +194,10 @@ public:
* @brief getFileMeta This method receive meta information of the file.
* @param fileId This is id of the file.
* @param receiver this is wrapper of the file. Set to nullptr if you no need to wait a physical file.
* @return true if the reqests sents successful.
* @return future objectl with result.
*/
QSharedPointer<QNetworkReply> getFileMeta(const QString& fileId,
QFuture<QByteArray> getFileMeta(const QString& fileId,
const QWeakPointer<iFile> &receiver = {nullptr});
bool sendFile( const QFileInfo& file, const QVariant& chatId) override;
@ -391,7 +392,7 @@ protected:
private slots:
void handleLogin(const QByteArray &ansver);
void handleLoginErr(QNetworkReply::NetworkError err);
void handleFileHeader(const QWeakPointer<QNetworkReply>& sender,
void handleFileHeader(const QByteArray &header,
const QWeakPointer<iFile> &receiver);
private: