From 1236b8a03bee403fcaa59d882d8e7fb9058b2280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 24 Apr 2018 20:24:58 +0200 Subject: Only use the ID to order archives fix #3343 --- CHANGELOG.rst | 5 +++++ src/database/database.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 432248b..889321c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,11 @@ Version 8.0 =========== - Add a complete='true' in MAM’s iq result when appropriate +- The archive ordering now only relies on the value of the ID, not the + date. This means that if you manually import archives in your database (or + mess with it somehow), biboumi will not work properly anymore, if you + don’t make sure the ID of everything in the muclogline table is + consistent. - The “virtual” channel with an empty name (for example %irc.freenode.net@biboumi) has been entirely removed. - Add an “Address” field in the servers’ configure form. This lets diff --git a/src/database/database.cpp b/src/database/database.cpp index a09dfe3..3b3e890 100644 --- a/src/database/database.cpp +++ b/src/database/database.cpp @@ -224,9 +224,9 @@ std::vector Database::get_muc_logs(const std::string& owne } if (paging == Database::Paging::first) - request.order_by() << Database::Date{} << " ASC, " << Id{} << " ASC "; + request.order_by() << Id{} << " ASC "; else - request.order_by() << Database::Date{} << " DESC, " << Id{} << " DESC "; + request.order_by() << Id{} << " DESC "; if (limit >= 0) request.limit() << limit; -- cgit v1.2.3