FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api work

Browse Source
This commit is contained in:
Martin Rotter 2023-12-20 10:27:11 +01:00
parent 07028dc506
commit e4e064da33
2 changed files with 10 additions and 61 deletions
src/librssguard
database
databasequeries.cpp
network-web
apiserver.cpp

9
src/librssguard/database/databasequeries.cpp

@ -444,10 +444,11 @@ void DatabaseQueries::markMessagesReadUnreadImportant(const QSqlDatabase& db,
q.setForwardOnly(true); q.setForwardOnly(true);
if (!q.prepare(QSL("UPDATE Messages SET %2 " QString statement = QSL("UPDATE Messages SET %1 "
" WHERE account_id = :account_id AND " " WHERE account_id = :account_id AND custom_id in (%2);")
" custom_id in (%1);") .arg(setters.join(", "), textual_ids.join(", "));
.arg(textual_ids.join(", "), setters.join(" AND ")))) {
if (!q.prepare(statement)) {
throw ApplicationException(q.lastError().text()); throw ApplicationException(q.lastError().text());
} }

62
src/librssguard/network-web/apiserver.cpp

@ -127,6 +127,9 @@ ApiResponse ApiServer::processRequest(const ApiRequest& req) const {
case ApiRequest::Method::ArticlesFromFeed: case ApiRequest::Method::ArticlesFromFeed:
return processArticlesFromFeed(req.m_parameters); return processArticlesFromFeed(req.m_parameters);
case ApiRequest::Method::MarkArticles:
return processMarkArticles(req.m_parameters);
case ApiRequest::Method::Unknown: case ApiRequest::Method::Unknown:
default: default:
return processUnknown(); return processUnknown();
@ -178,68 +181,14 @@ ApiResponse ApiServer::processMarkArticles(const QJsonValue& req) const {
int account_id = nxt.key(); int account_id = nxt.key();
QStringList custom_ids = nxt.value(); QStringList custom_ids = nxt.value();
ServiceRoot* acc = linq_accts.firstOrDefault([=](ServiceRoot* acc) { ServiceRoot* acc = linq_accts.firstOrDefault([=](ServiceRoot* acc) {
return acc->id() == account_id; return acc->accountId() == account_id;
}); });
if (acc == nullptr) { if (acc == nullptr) {
return ApiResponse(ApiResponse::Result::Error, throw ApplicationException(tr("account with ID %1 not found").arg(account_id));
ApiRequest::Method::MarkArticles,
tr("account with ID %1 not found").arg(account_id));
} }
/*
QList<Message> read_msgs;
QList<ImportanceChange> imp_msgs;
if (target_read != RootItem::ReadStatus::Unknown) {
read_msgs.reserve(custom_ids.size());
auto std_msgs = boolinq::from(custom_ids)
.select([](const QString& custom_id) {
Message msg;
msg.m_customId = custom_id;
return msg;
})
.toStdList();
read_msgs = FROM_STD_LIST(QList<Message>, std_msgs);
acc->onBeforeSetMessagesRead(acc, read_msgs, target_read);
}
if (target_important != RootItem::Importance::Unknown) {
imp_msgs.reserve(custom_ids.size());
auto std_msgs = boolinq::from(custom_ids)
.select([=](const QString& custom_id) {
ImportanceChange ch;
Message msg;
msg.m_customId = custom_id;
ch.first = msg;
ch.second = target_important;
return ch;
})
.toStdList();
imp_msgs = FROM_STD_LIST(QList<ImportanceChange>, std_msgs);
acc->onBeforeSwitchMessageImportance(acc, imp_msgs);
}
*/
DatabaseQueries::markMessagesReadUnreadImportant(database, account_id, custom_ids, target_read, target_important); DatabaseQueries::markMessagesReadUnreadImportant(database, account_id, custom_ids, target_read, target_important);
/*
if (target_read != RootItem::ReadStatus::Unknown) {
acc->onAfterSetMessagesRead(acc, read_msgs, target_read);
}
if (target_important != RootItem::Importance::Unknown) {
acc->onAfterSwitchMessageImportance(acc, imp_msgs);
}
*/
} }
// All updates are done, recalculate. // All updates are done, recalculate.
@ -247,7 +196,6 @@ ApiResponse ApiServer::processMarkArticles(const QJsonValue& req) const {
qApp->mainForm()->tabWidget()->feedMessageViewer()->messagesView()->reloadSelections(); qApp->mainForm()->tabWidget()->feedMessageViewer()->messagesView()->reloadSelections();
ApiResponse resp(ApiResponse::Result::Success, ApiRequest::Method::MarkArticles); ApiResponse resp(ApiResponse::Result::Success, ApiRequest::Method::MarkArticles);
return resp; return resp;
} }