Revert "Use the Date to find a next page in RSM, not the id"

This reverts commit 5ef7ba08028065b03d51d1dc70bb35aeb41ae19d.

1 files changed, 6 insertions, 8 deletions

diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 9bcfa8a..95b38f0 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -716,7 +716,7 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
           }
         const XmlNode* set = query->get_child("set", RSM_NS);
         int limit = -1;
-        std::string reference_uuid{};
+        Id::real_type reference_record_id{Id::unset_value};
         Database::Paging paging_order{Database::Paging::first};
         if (set)
           {
@@ -726,10 +726,9 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
             const XmlNode* after = set->get_child("after", RSM_NS);
             if (after)
               {
-                // Will throw if the uuid does not exist, that’s all.
-                Database::get_muc_log(from.bare(), iid.get_local(), iid.get_server(),
+                auto after_record = Database::get_muc_log(from.bare(), iid.get_local(), iid.get_server(),
                                                           after->get_inner(), start, end);
-                reference_uuid = after->get_inner();
+                reference_record_id = after_record.col<Id>();
               }
             const XmlNode* before = set->get_child("before", RSM_NS);
             if (before)
@@ -737,9 +736,8 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
                 paging_order = Database::Paging::last;
                 if (!before->get_inner().empty())
                   {
-                    // Will throw if the uuid does not exist
-                    Database::get_muc_log(from.bare(), iid.get_local(), iid.get_server(), before->get_inner(), start, end);
-                    reference_uuid = before->get_inner();
+                    auto before_record = Database::get_muc_log(from.bare(), iid.get_local(), iid.get_server(), before->get_inner(), start, end);
+                    reference_record_id = before_record.col<Id>();
                   }
               }
           }
@@ -751,7 +749,7 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
         if ((limit == -1 && start.empty() && end.empty())
             || limit > 100)
           limit = 101;
-        auto lines = Database::get_muc_logs(from.bare(), iid.get_local(), iid.get_server(), limit, start, end, reference_uuid, paging_order);
+        auto lines = Database::get_muc_logs(from.bare(), iid.get_local(), iid.get_server(), limit, start, end, reference_record_id, paging_order);
         bool complete = true;
         if (lines.size() > 100)
           {