fix: check time for get num messages for friend (fix #5714)

qTox · Jun 25, 2019 · b0f3237 · b0f3237
1 parent 033f28e
commit b0f3237
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/persistence/history.cpp b/src/persistence/history.cpp
@@ -523,21 +523,22 @@ void History::setFileFinished(const QString& fileId, bool success, const QString
 
 size_t History::getNumMessagesForFriend(const ToxPk& friendPk)
 {
-    return getNumMessagesForFriendBeforeDate(friendPk,
-                                             // Maximum possible time
-                                             QDateTime::fromMSecsSinceEpoch(
-                                                 std::numeric_limits<int64_t>::max()));
+    return getNumMessagesForFriendBeforeDate(friendPk, QDateTime());
 }
 
 size_t History::getNumMessagesForFriendBeforeDate(const ToxPk& friendPk, const QDateTime& date)
 {
     QString queryText = QString("SELECT COUNT(history.id) "
                                 "FROM history "
                                 "JOIN peers chat ON chat_id = chat.id "
-                                "WHERE chat.public_key='%1'"
-                                "AND timestamp < %2;")
-                            .arg(friendPk.toString())
-                            .arg(date.toMSecsSinceEpoch());
+                                "WHERE chat.public_key='%1'")
+                            .arg(friendPk.toString());
+
+    if (date.isNull()) {
+        queryText += ";";
+    } else {
+        queryText += QString(" AND timestamp < %1;").arg(date.toMSecsSinceEpoch());
+    }
 
     size_t numMessages = 0;
     auto rowCallback = [&numMessages](const QVector<QVariant>& row) {
@@ -798,4 +799,4 @@ void History::markAsSent(RowId messageId)
     }
 
     db->execLater(QString("DELETE FROM faux_offline_pending WHERE id=%1;").arg(messageId.get()));
-}
+}