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

fix problems with feedly messing up messages and also improve mergin algorithm a bit

Browse Source
This commit is contained in:
Martin Rotter 2021-09-08 10:49:42 +02:00
parent ceb88b3c27
commit e19ea3f59e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1265,7 +1265,7 @@ QPair<int, int> DatabaseQueries::updateMessages(QSqlDatabase db,
//
// Now, we update it if at least one of next conditions is true:
// 1) FOR SYNCHRONIZED SERVICES: Message has custom ID AND (its date OR read status OR starred status are changed
// or message was moved from one feed to another - this can particularly happen in Gmail feeds).
// or message was moved from other feed to current feed - this can particularly happen in Gmail feeds).
//
// 2) FOR NON-SYNCHRONIZED SERVICES (RSS/ATOM/JSON): Message has custom ID/GUID and its title or contents are changed.
//
@ -1279,7 +1279,7 @@ QPair<int, int> DatabaseQueries::updateMessages(QSqlDatabase db,
(message.m_created.toMSecsSinceEpoch() != date_existing_message ||
message.m_isRead != is_read_existing_message ||
message.m_isImportant != is_important_existing_message ||
message.m_feedId != feed_id_existing_message ||
(message.m_feedId != feed_id_existing_message && message.m_feedId == feed_custom_id) ||
message.m_title != title_existing_message ||
(!ignore_contents_changes && message.m_contents != contents_existing_message));
bool cond_2 = !message.m_customId.isEmpty() && !feed->getParentServiceRoot()->isSyncable() &&

1
src/librssguard/services/feedly/feedlynetwork.cpp
View File

@ -238,6 +238,7 @@ QList<Message> FeedlyNetwork::decodeStreamContents(const QByteArray& stream_cont
const QJsonObject& entry_obj = entry.toObject();
Message message;
message.m_feedId = entry_obj["origin"].toObject()["streamId"].toString();
message.m_title = entry_obj["title"].toString();
message.m_author = entry_obj["author"].toString();
message.m_contents = entry_obj["content"].toObject()["content"].toString();