Skip to content

Commit e19ea3f

Browse files
author
Martin Rotter
committed
fix problems with feedly messing up messages and also improve mergin algorithm a bit
1 parent ceb88b3 commit e19ea3f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/librssguard/database/databasequeries.cpp

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

src/librssguard/services/feedly/feedlynetwork.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ QList<Message> FeedlyNetwork::decodeStreamContents(const QByteArray& stream_cont
238238
const QJsonObject& entry_obj = entry.toObject();
239239
Message message;
240240

241+
message.m_feedId = entry_obj["origin"].toObject()["streamId"].toString();
241242
message.m_title = entry_obj["title"].toString();
242243
message.m_author = entry_obj["author"].toString();
243244
message.m_contents = entry_obj["content"].toObject()["content"].toString();

0 commit comments

Comments
 (0)