From c2432a24aa12c41ee21a416a6038ec1516ef0a93 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Thu, 14 Dec 2023 07:33:04 +0100
Subject: [PATCH] api work

---
 src/librssguard/core/message.cpp              |  1 +
 src/librssguard/database/databasequeries.cpp  | 25 ++++++++-----------
 .../gui/mediaplayer/libmpv/libmpvbackend.cpp  | 10 ++++++++
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/librssguard/core/message.cpp b/src/librssguard/core/message.cpp
index c973f63bc..d68994ea2 100644
--- a/src/librssguard/core/message.cpp
+++ b/src/librssguard/core/message.cpp
@@ -181,6 +181,7 @@ QJsonObject Message::toJson() const {
   obj.insert(QSL("url"), m_url);
   obj.insert(QSL("id"), m_id);
   obj.insert(QSL("custom_id"), m_customId);
+  obj.insert(QSL("account_id"), m_accountId);
   obj.insert(QSL("custom_hash"), m_customHash);
   obj.insert(QSL("feed_custom_id"), m_feedId);
   obj.insert(QSL("feed_title"), m_feedTitle);
diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp
index 9221c67d1..515bd5716 100644
--- a/src/librssguard/database/databasequeries.cpp
+++ b/src/librssguard/database/databasequeries.cpp
@@ -1185,6 +1185,8 @@ QList<Message> DatabaseQueries::getArticlesSlice(const QSqlDatabase& db,
   QList<Message> messages;
   QSqlQuery q(db);
   QString feed_clause = !feed_custom_id.isEmpty() ? QSL("Messages.feed = :feed AND") : QString();
+  QString is_read_clause = unread_only ? QSL("Messages.is_read = :is_read AND ") : QString();
+  QString account_id_clause = account_id > 0 ? QSL("Messages.account_id = :account_id AND ") : QString();
   QString date_created_clause;
 
   if (start_after_article_date > 0) {
@@ -1200,32 +1202,27 @@ QList<Message> DatabaseQueries::getArticlesSlice(const QSqlDatabase& db,
   q.prepare(QSL("SELECT %1 "
                 "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 "
+                "WHERE %3 "
                 "      %4 "
-                "      Messages.account_id = :account_id "
+                "      %5 "
+                "      %6 "
+                "      Messages.is_deleted = 0 AND "
+                "      Messages.is_pdeleted = 0 "
                 "ORDER BY Messages.date_created %2 "
                 "LIMIT :row_limit OFFSET :row_offset;")
               .arg(messageTableAttributes(false, db.driverName() == QSL(APP_DB_SQLITE_DRIVER)).values().join(QSL(", ")),
                    newest_first ? QSL("DESC") : QSL("ASC"),
                    feed_clause,
-                   date_created_clause));
+                   date_created_clause,
+                   account_id_clause,
+                   is_read_clause));
   q.bindValue(QSL(":account_id"), account_id);
   q.bindValue(QSL(":row_limit"), row_limit);
   q.bindValue(QSL(":row_offset"), row_offset);
   q.bindValue(QSL(":feed"), feed_custom_id);
+  q.bindValue(QSL(":is_read"), 0);
   q.bindValue(QSL(":date_created"), start_after_article_date);
 
-  if (unread_only) {
-    q.bindValue(QSL(":is_read"), 0);
-  }
-  else {
-    q.bindValue(QSL(":is_read"), QSL("is_read"));
-  }
-
   if (q.exec()) {
     while (q.next()) {
       bool decoded;
diff --git a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
index 4226b2426..a9f0b7818 100644
--- a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
+++ b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
@@ -464,6 +464,16 @@ bool LibMpvBackend::eventFilter(QObject* watched, QEvent* event) {
       return true;
     }
 
+    if (event->type() == QEvent::Type::MouseButtonDblClick && watched == this) {
+      qDebugNN << LOGSEC_MPV << "Mouse double-click.";
+
+      const char* args[] = {"keypress", "MOUSE_BTN0_DBL", nullptr};
+
+      mpv_command_async(m_mpvHandle, 0, args);
+      event->accept();
+      return true;
+    }
+
     if (event->type() == QEvent::Type::MouseMove && watched == this) {
       auto* mouse_event = dynamic_cast<QMouseEvent*>(event);
       auto position = mouse_event->pos();