summaryrefslogtreecommitdiff
path: root/src/database
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-04-29 22:18:26 +0200
committerlouiz’ <louiz@louiz.org>2018-04-29 22:18:26 +0200
commitb0168fd45b3683c2d6f61ccae67dcd5b918a363d (patch)
tree6b3e035f6edfef0b9a8aac1813259b9c95ebcf35 /src/database
parent0887be6eef24929fd594239e9569fc5cee54aba0 (diff)
downloadbiboumi-b0168fd45b3683c2d6f61ccae67dcd5b918a363d.tar.gz
biboumi-b0168fd45b3683c2d6f61ccae67dcd5b918a363d.tar.bz2
biboumi-b0168fd45b3683c2d6f61ccae67dcd5b918a363d.tar.xz
biboumi-b0168fd45b3683c2d6f61ccae67dcd5b918a363d.zip
mam: Send “fin complete” only when appropriate
Also simplify how we did the whole “limit + 1” And fix one bad interpretation of the XEP for the case where the query has no after or before restriction. fix #3349
Diffstat (limited to 'src/database')
-rw-r--r--src/database/database.cpp26
-rw-r--r--src/database/database.hpp4
2 files changed, 19 insertions, 11 deletions
diff --git a/src/database/database.cpp b/src/database/database.cpp
index 3b3e890..6e08ee1 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -190,12 +190,9 @@ std::string Database::store_muc_message(const std::string& owner, const std::str
return uuid;
}
-std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
- int limit, const std::string& start, const std::string& end, const Id::real_type reference_record_id, Database::Paging paging)
+std::tuple<bool, std::vector<Database::MucLogLine>> Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
+ std::size_t limit, const std::string& start, const std::string& end, const Id::real_type reference_record_id, Database::Paging paging)
{
- if (limit == 0)
- return {};
-
auto request = select(Database::muc_log_lines);
request.where() << Database::Owner{} << "=" << owner << \
" and " << Database::IrcChanName{} << "=" << chan_name << \
@@ -228,15 +225,26 @@ std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owne
else
request.order_by() << Id{} << " DESC ";
- if (limit >= 0)
- request.limit() << limit;
+ // Just a simple trick: to know whether we got the totality of the
+ // possible results matching this query (except for the limit), we just
+ // ask one more element. If we get that additional element, this means
+ // we don’t have everything. And then we just discard it. If we don’t
+ // have more, this means we have everything.
+ request.limit() << limit + 1;
auto result = request.execute(*Database::db);
+ bool complete = true;
+
+ if (result.size() == limit + 1)
+ {
+ complete = false;
+ result.erase(std::prev(result.end()));
+ }
if (paging == Database::Paging::first)
- return result;
+ return {complete, result};
else
- return {result.crbegin(), result.crend()};
+ return {complete, {result.crbegin(), result.crend()}};
}
Database::MucLogLine Database::get_muc_log(const std::string& owner, const std::string& chan_name, const std::string& server,
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 30ffcb4..3e25b30 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -131,8 +131,8 @@ class Database
* Get all the lines between (optional) start and end dates, with a (optional) limit.
* If after_id is set, only the records after it will be returned.
*/
- static std::vector<MucLogLine> get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
- int limit=-1, const std::string& start="", const std::string& end="",
+ static std::tuple<bool, std::vector<MucLogLine>> get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
+ std::size_t limit, const std::string& start="", const std::string& end="",
const Id::real_type reference_record_id=Id::unset_value, Paging=Paging::first);
/**