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-13 12:03:39 +01:00
parent af04c93e1a
commit 87ccee3938
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/web_ui/rssguard.html
View File

@ -13,7 +13,7 @@
}
.entry {
max-width: 720px;
max-width: 90%;
xborder: 1px solid red;
padding: 20px;
margin: 3px auto;

6
src/librssguard/core/message.cpp
View File

@ -105,7 +105,8 @@ QString Enclosures::encodeEnclosuresToString(const QList<Enclosure>& enclosures)
}
Message::Message() {
m_title = m_url = m_author = m_contents = m_rawContents = m_feedId = m_customId = m_customHash = QL1S("");
m_title = m_url = m_author = m_contents = m_rawContents = m_feedId = m_feedTitle = m_customId = m_customHash =
QL1S("");
m_enclosures = QList<Enclosure>();
m_categories = QList<MessageCategory>();
m_accountId = m_id = 0;
@ -182,6 +183,8 @@ QJsonObject Message::toJson() const {
obj.insert(QSL("custom_id"), m_customId);
obj.insert(QSL("custom_hash"), m_customHash);
obj.insert(QSL("feed_custom_id"), m_feedId);
obj.insert(QSL("feed_title"), m_feedTitle);
obj.insert(QSL("is_rtl"), m_isRtl);
obj.insert(QSL("enclosures"), Enclosures::encodeEnclosuresToJson(m_enclosures));
return obj;
@ -203,6 +206,7 @@ Message Message::fromSqlRecord(const QSqlRecord& record, bool* result) {
message.m_isImportant = record.value(MSG_DB_IMPORTANT_INDEX).toBool();
message.m_isDeleted = record.value(MSG_DB_DELETED_INDEX).toBool();
message.m_feedId = record.value(MSG_DB_FEED_CUSTOM_ID_INDEX).toString();
message.m_feedTitle = record.value(MSG_DB_FEED_TITLE_INDEX).toString();
message.m_title = record.value(MSG_DB_TITLE_INDEX).toString();
message.m_url = record.value(MSG_DB_URL_INDEX).toString();
message.m_author = record.value(MSG_DB_AUTHOR_INDEX).toString();

1
src/librssguard/core/message.h
View File

@ -75,6 +75,7 @@ class RSSGUARD_DLLSPEC Message {
// to localtime when needed.
QDateTime m_created;
QString m_feedId;
QString m_feedTitle;
int m_accountId;
int m_id;
QString m_customId;

19
src/librssguard/database/databasequeries.cpp
View File

@ -1184,31 +1184,32 @@ QList<Message> DatabaseQueries::getArticlesSlice(const QSqlDatabase& db,
int row_limit) {
QList<Message> messages;
QSqlQuery q(db);
QString feed_clause = !feed_custom_id.isEmpty() ? QSL("feed = :feed AND") : QString();
QString feed_clause = !feed_custom_id.isEmpty() ? QSL("Messages.feed = :feed AND") : QString();
QString date_created_clause;
if (start_after_article_date > 0) {
if (newest_first) {
date_created_clause = QSL("date_created < :date_created AND ");
date_created_clause = QSL("Messages.date_created < :date_created AND ");
}
else {
date_created_clause = QSL("date_created > :date_created AND ");
date_created_clause = QSL("Messages.date_created > :date_created AND ");
}
}
q.setForwardOnly(true);
q.prepare(QSL("SELECT %1 "
"FROM Messages "
"WHERE is_deleted = 0 AND "
" is_pdeleted = 0 AND "
" is_read = :is_read AND "
"FROM Messages LEFT JOIN Feeds ON Messages.feed = Feeds.custom_id AND "
" Messages.account_id = Feeds.account_id "
"WHERE Messages.is_deleted = 0 AND "
" Messages.is_pdeleted = 0 AND "
" Messages.is_read = :is_read AND "
//" date_created > :date_created AND "
" %3 "
" %4 "
" account_id = :account_id "
" Messages.account_id = :account_id "
"ORDER BY Messages.date_created %2 "
"LIMIT :row_limit OFFSET :row_offset;")
.arg(messageTableAttributes(true, db.driverName() == QSL(APP_DB_SQLITE_DRIVER)).values().join(QSL(", ")),
.arg(messageTableAttributes(false, db.driverName() == QSL(APP_DB_SQLITE_DRIVER)).values().join(QSL(", ")),
newest_first ? QSL("DESC") : QSL("ASC"),
feed_clause,
date_created_clause));